caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Combo: update button spacing to match overview.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-03-17 12:08:32 +01:00
parent 6a6359f1ee
commit de72fba92e
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/res/layout/combopump_fragment.xml
View file

@ -470,13 +470,6 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@color/listdelimiter" /> android:background="@color/listdelimiter" />
<TextView
android:id="@+id/combo_queue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:textAlignment="center" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
@ -495,47 +488,51 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <info.nightscout.utils.SingleClickButton
android:id="@+id/combo_refresh_button" android:id="@+id/combo_refresh_button"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0.5"
android:layout_marginRight="-4dp"
android:drawableTop="@drawable/icon_actions_refill" android:drawableTop="@drawable/icon_actions_refill"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/combo_refresh" /> android:text="@string/combo_refresh" />
<Button <info.nightscout.utils.SingleClickButton
android:id="@+id/combo_alerts_button" android:id="@+id/combo_alerts_button"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0.5"
android:layout_marginRight="-4dp"
android:drawableTop="@drawable/icon_cp_announcement" android:drawableTop="@drawable/icon_cp_announcement"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:visibility="gone" android:visibility="gone"
android:text="@string/combo_pump_alerts" /> android:text="@string/combo_pump_alerts" />
<Button <info.nightscout.utils.SingleClickButton
android:id="@+id/combo_tdds_button" android:id="@+id/combo_tdds_button"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0.5"
android:layout_marginRight="-4dp"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/icon_danarstats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:visibility="gone" android:visibility="gone"
android:text="@string/combo_tdds" /> android:text="@string/combo_tdds" />
<Button <info.nightscout.utils.SingleClickButton
android:id="@+id/combo_full_history_button" android:id="@+id/combo_full_history_button"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="0.5"
android:layout_marginRight="-4dp"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/icon_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"