caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'origin/dev' into combo

Browse source 
* origin/dev:
  recategorize cp icons
  removed unnecessary text colour and fixed indentation
  layout indentation
  Moving some buttons to the right categories
  removed empty ghost files
  remove duplicate IDs and indentation fix
  Picture renaming (#311)
This commit is contained in:
Johannes Mockenhaupt 2017-07-24 02:25:28 +02:00
parent 6a0273046d b53753b4db
commit e6eee42081
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
5 changed files with 239 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java → app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/Events/EventSmsCommunicatorUpdateGui.java
View file

24
app/src/main/res/layout/actions_fragment.xml
View file

@ -23,8 +23,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/careportal_profileswitch"
android:textColor="@color/colorProfileSwitchButton" />
android:drawableTop="@drawable/icon_actions_profileswitch"
android:text="@string/careportal_profileswitch" />
<Button
android:id="@+id/actions_temptarget"
@ -36,8 +36,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/careportal_temporarytarget"
android:textColor="@color/colorCalculatorButton" />
android:drawableTop="@drawable/icon_actions_temptarget"
android:text="@string/careportal_temporarytarget" />
<Button
android:id="@+id/actions_settempbasal"
@ -49,8 +49,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_tempbasal_button"
android:textColor="@color/colorSetTempButton" />
android:drawableTop="@drawable/icon_actions_starttempbasal"
android:text="@string/overview_tempbasal_button" />
<Button
android:id="@+id/actions_extendedbolus"
@ -62,8 +62,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_extendedbolus_button"
android:textColor="@color/colorSetExtendedButton" />
android:drawableTop="@drawable/icon_actions_startextbolus"
android:text="@string/overview_extendedbolus_button" />
<Button
android:id="@+id/actions_extendedbolus_cancel"
@ -75,8 +75,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/overview_extendedbolus_cancel_button"
android:textColor="@color/colorSetExtendedButton" />
android:drawableTop="@drawable/icon_actions_cancelextbolus"
android:text="@string/overview_extendedbolus_cancel_button" />
<Button
android:id="@+id/actions_fill"
@ -88,8 +88,8 @@
android:layout_marginRight="10dp"
android:layout_marginTop="3dp"
android:layout_weight="0.5"
android:text="@string/primefill"
android:textColor="@color/colorTreatmentButton" />
android:drawableTop="@drawable/icon_actions_refill"
android:text="@string/primefill" />
</LinearLayout>

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

@ -21,6 +21,12 @@
android:layout_width="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:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -31,9 +37,13 @@
<Button
android:id="@+id/careportal_bgcheck"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:layout_width="0px"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_bgcheck"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_bgcheck"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
@ -43,7 +53,10 @@
android:id="@+id/careportal_exercise"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="1"
app:layout_columnWeight="1"
@ -51,21 +64,44 @@
app:layout_row="0" />
<Button
android:id="@+id/careportal_note"
android:id="@+id/careportal_temporarytarget"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:text="@string/careportal_note"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_target"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_temporarytarget"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_gravity="fill"
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
android:id="@+id/careportal_snackbolus"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="0"
app:layout_columnWeight="1"
@ -76,7 +112,10 @@
android:id="@+id/careportal_mealbolus"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="1"
app:layout_columnWeight="1"
@ -87,7 +126,10 @@
android:id="@+id/careportal_correctionbolus"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="2"
app:layout_columnWeight="1"
@ -98,7 +140,10 @@
android:id="@+id/careportal_carbscorrection"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="0"
app:layout_columnWeight="1"
@ -109,7 +154,10 @@
android:id="@+id/careportal_combobolus"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="1"
app:layout_columnWeight="1"
@ -120,7 +168,10 @@
android:id="@+id/careportal_tempbasalstart"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="2"
app:layout_columnWeight="1"
@ -131,119 +182,188 @@
android:id="@+id/careportal_tempbasalend"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="3" />
<Button
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" />
</android.support.v7.widget.GridLayout>
<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
android:id="@+id/careportal_pumpsitechange"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:text="@string/careportal_pumpsitechange"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="4" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="15dp"
android:text="@string/careportal_cgm_label" />
<Button
android:id="@+id/careportal_cgmsensorinsert"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:text="@string/careportal_cgmsensorinsert"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="4" />
<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_cgmsensorstart"
style="@style/ButtonSmallFontStyle"
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"
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_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="5" />
app:layout_row="1" />
<Button
android:id="@+id/careportal_profileswitch"
android:id="@+id/careportal_cgmsensorinsert"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:text="@string/careportal_profileswitch"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_cgm_insert"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_cgmsensorinsert"
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="5" />
app:layout_row="1" />
<Button
android:id="@+id/careportal_openapsoffline"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="2"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="5" />
app:layout_row="1" />
<Button
android:id="@+id/careportal_temporarytarget"
android:id="@+id/careportal_announcement"
style="@style/ButtonSmallFontStyle"
android:layout_width="0dp"
android:layout_height="70dp"
android:text="@string/careportal_temporarytarget"
android:layout_height="fill_parent"
android:drawableTop="@drawable/icon_cp_announcement"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:text="@string/careportal_announcement"
app:layout_column="0"
app:layout_columnWeight="1"
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
android:id="@+id/careportal_pumpbatterychange"
style="@style/ButtonSmallFontStyle"
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"
app:layout_column="1"
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="6" />

36
app/src/main/res/layout/careportal_stats_fragment.xml
View file

@ -18,11 +18,13 @@
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="end"
android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_sensor"
android:paddingRight="5dp"
android:paddingStart="15dp"
android:text="@string/careportal_sensorage_label"
android:textSize="14sp" />
@ -63,11 +65,13 @@
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="end"
android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_insulin"
android:paddingRight="5dp"
android:paddingStart="15dp"
android:text="@string/careportal_insulinage_label"
android:textSize="14sp" />
@ -108,11 +112,13 @@
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="end"
android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_canula"
android:paddingRight="5dp"
android:paddingStart="15dp"
android:text="@string/careportal_canulaage_label"
android:textSize="14sp" />
@ -128,8 +134,8 @@
<TextView
android:id="@+id/careportal_canulaage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
@ -153,11 +159,13 @@
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:gravity="end"
android:gravity="center_vertical"
android:drawableLeft="@drawable/icon_cp_age_battery"
android:paddingRight="5dp"
android:paddingStart="15dp"
android:text="@string/careportal_pbage_label"
android:textSize="14sp" />

9
app/src/main/res/values/strings.xml
View file

@ -1,4 +1,4 @@
<resources>
<resources>
<string name="treatmentssafety_title">Tratments safety</string>
<string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
<string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
@ -691,4 +691,9 @@
<string name="combopump_shortname">COMBO</string>
<string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
<string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
</resources>
<string name="careportal_activity_label">ACTIVITY &amp; FEEDBACK</string>
<string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
<string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
<string name="careportal_pump_label">PUMP</string>
</resources>