Merge pull request #312 from MilosKozak/icons-mergehelper
Add icons to CP (@PoweRGbgs work)
This commit is contained in:
commit
b53753b4db
5 changed files with 239 additions and 106 deletions
|
@ -23,8 +23,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/careportal_profileswitch"
|
android:drawableTop="@drawable/icon_actions_profileswitch"
|
||||||
android:textColor="@color/colorProfileSwitchButton" />
|
android:text="@string/careportal_profileswitch" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/actions_temptarget"
|
android:id="@+id/actions_temptarget"
|
||||||
|
@ -36,8 +36,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/careportal_temporarytarget"
|
android:drawableTop="@drawable/icon_actions_temptarget"
|
||||||
android:textColor="@color/colorCalculatorButton" />
|
android:text="@string/careportal_temporarytarget" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/actions_settempbasal"
|
android:id="@+id/actions_settempbasal"
|
||||||
|
@ -49,8 +49,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/overview_tempbasal_button"
|
android:drawableTop="@drawable/icon_actions_starttempbasal"
|
||||||
android:textColor="@color/colorSetTempButton" />
|
android:text="@string/overview_tempbasal_button" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/actions_extendedbolus"
|
android:id="@+id/actions_extendedbolus"
|
||||||
|
@ -62,8 +62,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/overview_extendedbolus_button"
|
android:drawableTop="@drawable/icon_actions_startextbolus"
|
||||||
android:textColor="@color/colorSetExtendedButton" />
|
android:text="@string/overview_extendedbolus_button" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/actions_extendedbolus_cancel"
|
android:id="@+id/actions_extendedbolus_cancel"
|
||||||
|
@ -75,8 +75,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/overview_extendedbolus_cancel_button"
|
android:drawableTop="@drawable/icon_actions_cancelextbolus"
|
||||||
android:textColor="@color/colorSetExtendedButton" />
|
android:text="@string/overview_extendedbolus_cancel_button" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/actions_fill"
|
android:id="@+id/actions_fill"
|
||||||
|
@ -88,8 +88,8 @@
|
||||||
android:layout_marginRight="10dp"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
android:layout_weight="0.5"
|
android:layout_weight="0.5"
|
||||||
android:text="@string/primefill"
|
android:drawableTop="@drawable/icon_actions_refill"
|
||||||
android:textColor="@color/colorTreatmentButton" />
|
android:text="@string/primefill" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,12 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="15dp"
|
||||||
|
android:text="@string/careportal_activity_label" />
|
||||||
|
|
||||||
<android.support.v7.widget.GridLayout
|
<android.support.v7.widget.GridLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -31,9 +37,13 @@
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_bgcheck"
|
android:id="@+id/careportal_bgcheck"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0px"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bgcheck"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_bgcheck"
|
android:text="@string/careportal_bgcheck"
|
||||||
|
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
|
@ -43,7 +53,10 @@
|
||||||
android:id="@+id/careportal_exercise"
|
android:id="@+id/careportal_exercise"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_exercise"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_exercise"
|
android:text="@string/careportal_exercise"
|
||||||
app:layout_column="1"
|
app:layout_column="1"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -51,21 +64,44 @@
|
||||||
app:layout_row="0" />
|
app:layout_row="0" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_note"
|
android:id="@+id/careportal_temporarytarget"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
android:text="@string/careportal_note"
|
android:drawableTop="@drawable/icon_cp_cgm_target"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_temporarytarget"
|
||||||
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="0" />
|
app:layout_row="0" />
|
||||||
|
|
||||||
|
|
||||||
|
</android.support.v7.widget.GridLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="15dp"
|
||||||
|
android:text="@string/careportal_carbsandbolus_label" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.GridLayout
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:padding="10dip"
|
||||||
|
app:columnCount="3">
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_snackbolus"
|
android:id="@+id/careportal_snackbolus"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bolus_snack"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_snackbolus"
|
android:text="@string/careportal_snackbolus"
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -76,7 +112,10 @@
|
||||||
android:id="@+id/careportal_mealbolus"
|
android:id="@+id/careportal_mealbolus"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bolus_meal"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_mealbolus"
|
android:text="@string/careportal_mealbolus"
|
||||||
app:layout_column="1"
|
app:layout_column="1"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -87,7 +126,10 @@
|
||||||
android:id="@+id/careportal_correctionbolus"
|
android:id="@+id/careportal_correctionbolus"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bolus_correction"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_correctionbolus"
|
android:text="@string/careportal_correctionbolus"
|
||||||
app:layout_column="2"
|
app:layout_column="2"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -98,7 +140,10 @@
|
||||||
android:id="@+id/careportal_carbscorrection"
|
android:id="@+id/careportal_carbscorrection"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bolus_carbs"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_carbscorrection"
|
android:text="@string/careportal_carbscorrection"
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -109,7 +154,10 @@
|
||||||
android:id="@+id/careportal_combobolus"
|
android:id="@+id/careportal_combobolus"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_bolus_correction"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_combobolus"
|
android:text="@string/careportal_combobolus"
|
||||||
app:layout_column="1"
|
app:layout_column="1"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -120,7 +168,10 @@
|
||||||
android:id="@+id/careportal_tempbasalstart"
|
android:id="@+id/careportal_tempbasalstart"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_basal_start"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_tempbasalstart"
|
android:text="@string/careportal_tempbasalstart"
|
||||||
app:layout_column="2"
|
app:layout_column="2"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
|
@ -131,119 +182,188 @@
|
||||||
android:id="@+id/careportal_tempbasalend"
|
android:id="@+id/careportal_tempbasalend"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_basal_end"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_tempbasalend"
|
android:text="@string/careportal_tempbasalend"
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
app:layout_row="3" />
|
app:layout_row="3" />
|
||||||
|
|
||||||
<Button
|
</android.support.v7.widget.GridLayout>
|
||||||
android:id="@+id/careportal_announcement"
|
|
||||||
style="@style/ButtonSmallFontStyle"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="70dp"
|
|
||||||
android:text="@string/careportal_announcement"
|
|
||||||
app:layout_column="1"
|
|
||||||
app:layout_columnWeight="1"
|
|
||||||
app:layout_gravity="fill"
|
|
||||||
app:layout_row="3" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/careportal_question"
|
|
||||||
style="@style/ButtonSmallFontStyle"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="70dp"
|
|
||||||
android:text="@string/careportal_question"
|
|
||||||
app:layout_column="2"
|
|
||||||
app:layout_columnWeight="1"
|
|
||||||
app:layout_gravity="fill"
|
|
||||||
app:layout_row="3" />
|
|
||||||
|
|
||||||
<Button
|
<TextView
|
||||||
android:id="@+id/careportal_pumpsitechange"
|
android:layout_width="match_parent"
|
||||||
style="@style/ButtonSmallFontStyle"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="0dp"
|
android:paddingStart="15dp"
|
||||||
android:layout_height="70dp"
|
android:text="@string/careportal_cgm_label" />
|
||||||
android:text="@string/careportal_pumpsitechange"
|
|
||||||
app:layout_column="0"
|
|
||||||
app:layout_columnWeight="1"
|
|
||||||
app:layout_gravity="fill"
|
|
||||||
app:layout_row="4" />
|
|
||||||
|
|
||||||
<Button
|
<android.support.v7.widget.GridLayout
|
||||||
android:id="@+id/careportal_cgmsensorinsert"
|
android:layout_width="fill_parent"
|
||||||
style="@style/ButtonSmallFontStyle"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="0dp"
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_height="70dp"
|
android:padding="10dip"
|
||||||
android:text="@string/careportal_cgmsensorinsert"
|
app:columnCount="3">
|
||||||
app:layout_column="1"
|
|
||||||
app:layout_columnWeight="1"
|
|
||||||
app:layout_gravity="fill"
|
|
||||||
app:layout_row="4" />
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_cgmsensorstart"
|
android:id="@+id/careportal_cgmsensorstart"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_cgm_start"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_cgmsensorstart"
|
android:text="@string/careportal_cgmsensorstart"
|
||||||
app:layout_column="2"
|
|
||||||
app:layout_columnWeight="1"
|
|
||||||
app:layout_gravity="fill"
|
|
||||||
app:layout_row="4" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/careportal_insulincartridgechange"
|
|
||||||
style="@style/ButtonSmallFontStyle"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="70dp"
|
|
||||||
android:text="@string/careportal_insulincartridgechange"
|
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
app:layout_row="5" />
|
app:layout_row="1" />
|
||||||
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_profileswitch"
|
android:id="@+id/careportal_cgmsensorinsert"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
android:text="@string/careportal_profileswitch"
|
android:drawableTop="@drawable/icon_cp_cgm_insert"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_cgmsensorinsert"
|
||||||
app:layout_column="1"
|
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="1" />
|
||||||
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_openapsoffline"
|
android:id="@+id/careportal_openapsoffline"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_aaps_offline"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_openapsoffline"
|
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="1" />
|
||||||
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_temporarytarget"
|
android:id="@+id/careportal_announcement"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
android:text="@string/careportal_temporarytarget"
|
android:drawableTop="@drawable/icon_cp_announcement"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_announcement"
|
||||||
app:layout_column="0"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
app:layout_row="6" />
|
app:layout_row="4" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/careportal_question"
|
||||||
|
style="@style/ButtonSmallFontStyle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_question"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_question"
|
||||||
|
app:layout_column="1"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="4" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/careportal_note"
|
||||||
|
style="@style/ButtonSmallFontStyle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_note"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_note"
|
||||||
|
app:layout_column="2"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="4" />
|
||||||
|
</android.support.v7.widget.GridLayout>
|
||||||
|
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingStart="15dp"
|
||||||
|
android:text="@string/careportal_pump_label" />
|
||||||
|
|
||||||
|
<android.support.v7.widget.GridLayout
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:padding="10dip"
|
||||||
|
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
|
||||||
|
android:id="@+id/careportal_insulincartridgechange"
|
||||||
|
style="@style/ButtonSmallFontStyle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_pump_cartridge"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_insulincartridgechange"
|
||||||
|
app:layout_column="1"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="0" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/careportal_profileswitch"
|
||||||
|
style="@style/ButtonSmallFontStyle"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_cgm_profile"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
|
android:text="@string/careportal_profileswitch"
|
||||||
|
app:layout_column="2"
|
||||||
|
app:layout_columnWeight="1"
|
||||||
|
app:layout_gravity="fill"
|
||||||
|
app:layout_row="0" />
|
||||||
|
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/careportal_pumpbatterychange"
|
android:id="@+id/careportal_pumpbatterychange"
|
||||||
style="@style/ButtonSmallFontStyle"
|
style="@style/ButtonSmallFontStyle"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="70dp"
|
android:layout_height="fill_parent"
|
||||||
|
android:drawableTop="@drawable/icon_cp_pump_battery"
|
||||||
|
android:paddingLeft="0dp"
|
||||||
|
android:paddingRight="0dp"
|
||||||
android:text="@string/careportal_pumpbatterychange"
|
android:text="@string/careportal_pumpbatterychange"
|
||||||
app:layout_column="1"
|
app:layout_column="0"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_gravity="fill"
|
app:layout_gravity="fill"
|
||||||
app:layout_row="6" />
|
app:layout_row="6" />
|
||||||
|
|
|
@ -18,11 +18,13 @@
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="end"
|
android:gravity="center_vertical"
|
||||||
|
android:drawableLeft="@drawable/icon_cp_age_sensor"
|
||||||
android:paddingRight="5dp"
|
android:paddingRight="5dp"
|
||||||
|
android:paddingStart="15dp"
|
||||||
android:text="@string/careportal_sensorage_label"
|
android:text="@string/careportal_sensorage_label"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
@ -63,11 +65,13 @@
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="end"
|
android:gravity="center_vertical"
|
||||||
|
android:drawableLeft="@drawable/icon_cp_age_insulin"
|
||||||
android:paddingRight="5dp"
|
android:paddingRight="5dp"
|
||||||
|
android:paddingStart="15dp"
|
||||||
android:text="@string/careportal_insulinage_label"
|
android:text="@string/careportal_insulinage_label"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
@ -108,11 +112,13 @@
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="end"
|
android:gravity="center_vertical"
|
||||||
|
android:drawableLeft="@drawable/icon_cp_age_canula"
|
||||||
android:paddingRight="5dp"
|
android:paddingRight="5dp"
|
||||||
|
android:paddingStart="15dp"
|
||||||
android:text="@string/careportal_canulaage_label"
|
android:text="@string/careportal_canulaage_label"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
@ -128,8 +134,8 @@
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/careportal_canulaage"
|
android:id="@+id/careportal_canulaage"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="start"
|
android:gravity="start"
|
||||||
android:paddingLeft="5dp"
|
android:paddingLeft="5dp"
|
||||||
|
@ -153,11 +159,13 @@
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="fill_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="end"
|
android:gravity="center_vertical"
|
||||||
|
android:drawableLeft="@drawable/icon_cp_age_battery"
|
||||||
android:paddingRight="5dp"
|
android:paddingRight="5dp"
|
||||||
|
android:paddingStart="15dp"
|
||||||
android:text="@string/careportal_pbage_label"
|
android:text="@string/careportal_pbage_label"
|
||||||
android:textSize="14sp" />
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<resources>
|
<resources>
|
||||||
<string name="treatmentssafety_title">Tratments safety</string>
|
<string name="treatmentssafety_title">Tratments safety</string>
|
||||||
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
|
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
|
||||||
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
|
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
|
||||||
|
@ -688,4 +688,9 @@
|
||||||
<string name="wear_overviewnotifications_summary">Pass the Overview Notifications through as wear confirmation messages.</string>
|
<string name="wear_overviewnotifications_summary">Pass the Overview Notifications through as wear confirmation messages.</string>
|
||||||
<string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
|
<string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
|
||||||
<string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
|
<string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
|
||||||
</resources>
|
<string name="careportal_activity_label">ACTIVITY & FEEDBACK</string>
|
||||||
|
<string name="careportal_carbsandbolus_label">CARBS & BOLUS</string>
|
||||||
|
<string name="careportal_cgm_label">CGM & OPENAPS</string>
|
||||||
|
<string name="careportal_pump_label">PUMP</string>
|
||||||
|
</resources>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue