caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Moving some buttons to the right categories

Browse source
This commit is contained in:
Roumen Georgiev 2017-07-22 15:16:03 +03:00 committed by AdrianLxM
parent baaa83a850
commit 54697df358
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/res/layout/careportal_fragment.xml
View file

@ -189,7 +189,7 @@
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="3" /> app:layout_row="3" />
</android.support.v7.widget.GridLayout> </android.support.v7.widget.GridLayout>
<TextView <TextView
@ -230,21 +230,22 @@
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="1" /> app:layout_row="1" />
<Button
<Button android:id="@+id/careportal_openapsoffline"
android:id="@+id/careportal_pumpsitechange"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_canula" android:drawableTop="@drawable/icon_cp_aaps_offline"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_pumpsitechange" android:text="@string/careportal_openapsoffline"
app:layout_column="2" app:layout_column="2"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="1" /> app:layout_row="1" />
<Button <Button
android:id="@+id/careportal_cgmsensorinsert" android:id="@+id/careportal_cgmsensorinsert"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
@ -287,6 +288,19 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:padding="10dip" android:padding="10dip"
app:columnCount="3"> app:columnCount="3">
<Button
android:id="@+id/careportal_pumpsitechange"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_pump_canula"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_pumpsitechange"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="0" />
<Button <Button
android:id="@+id/careportal_insulincartridgechange" android:id="@+id/careportal_insulincartridgechange"
@ -297,10 +311,10 @@
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_insulincartridgechange" android:text="@string/careportal_insulincartridgechange"
app:layout_column="0" app:layout_column="1"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="5" /> app:layout_row="0" />
<Button <Button
android:id="@+id/careportal_profileswitch" android:id="@+id/careportal_profileswitch"
@ -311,24 +325,12 @@
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/careportal_profileswitch" android:text="@string/careportal_profileswitch"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="5" />
<Button
android:id="@+id/careportal_openapsoffline"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_aaps_offline"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_openapsoffline"
app:layout_column="2" app:layout_column="2"
app:layout_columnWeight="1" app:layout_columnWeight="1"
app:layout_gravity="fill" app:layout_gravity="fill"
app:layout_row="5" /> app:layout_row="0" />
<Button <Button
android:id="@+id/careportal_temporarytarget" android:id="@+id/careportal_temporarytarget"