caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2022-04-20 19:42:32 +02:00
parent dedb20846c e642516fd4
commit 4e0d9e25b7
5 changed files with 24 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/res/layout/dialog_loop.xml
View file

@ -82,7 +82,6 @@
android:drawableTop="@drawable/ic_loop_closed" android:drawableTop="@drawable/ic_loop_closed"
android:text="@string/closedloop" android:text="@string/closedloop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -97,8 +96,6 @@
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_lgs" android:drawableTop="@drawable/ic_loop_lgs"
android:text="@string/lowglucosesuspend" android:text="@string/lowglucosesuspend"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -113,8 +110,6 @@
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_open" android:drawableTop="@drawable/ic_loop_open"
android:text="@string/openloop" android:text="@string/openloop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -129,7 +124,6 @@
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_resume" android:drawableTop="@drawable/ic_loop_resume"
android:text="@string/enableloop" android:text="@string/enableloop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
@ -144,9 +138,7 @@
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_disabled" android:drawableTop="@drawable/ic_loop_disabled"
android:text="@string/disableloop" android:text="@string/disableloop" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
</LinearLayout> </LinearLayout>
@ -188,8 +180,6 @@
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="@string/resumeloop" android:text="@string/resumeloop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout
@ -209,9 +199,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused" android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration1h" android:text="@string/duration1h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_suspend_2h" android:id="@+id/overview_suspend_2h"
@ -223,9 +211,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused" android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration2h" android:text="@string/duration2h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_suspend_3h" android:id="@+id/overview_suspend_3h"
@ -237,9 +223,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused" android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration3h" android:text="@string/duration3h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_suspend_10h" android:id="@+id/overview_suspend_10h"
@ -251,9 +235,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused" android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration10h" android:text="@string/duration10h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
</LinearLayout> </LinearLayout>
@ -295,8 +277,6 @@
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="@string/reconnect" android:text="@string/reconnect"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp"
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout
@ -316,9 +296,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected" android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration15m" android:text="@string/duration15m" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_disconnect_30m" android:id="@+id/overview_disconnect_30m"
@ -330,9 +308,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected" android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration30m" android:text="@string/duration30m" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_disconnect_1h" android:id="@+id/overview_disconnect_1h"
@ -344,9 +320,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected" android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration1h" android:text="@string/duration1h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_disconnect_2h" android:id="@+id/overview_disconnect_2h"
@ -358,9 +332,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected" android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration2h" android:text="@string/duration2h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/overview_disconnect_3h" android:id="@+id/overview_disconnect_3h"
@ -372,9 +344,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected" android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration3h" android:text="@string/duration3h" />
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textSize="11sp" />
</LinearLayout> </LinearLayout>

16
app/src/main/res/layout/dialog_temptarget.xml
View file

@ -149,9 +149,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/cancel" android:text="@string/cancel"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="?attr/tempTargetConfirmation" />
android:textColor="?attr/tempTargetConfirmation"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/eating_soon" android:id="@+id/eating_soon"
@ -164,9 +162,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/eatingsoon" android:text="@string/eatingsoon"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="?attr/carbsColor" />
android:textColor="?attr/carbsColor"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/activity" android:id="@+id/activity"
@ -179,9 +175,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/activity" android:text="@string/activity"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="?attr/exerciseColor" />
android:textColor="?attr/exerciseColor"
android:textSize="11sp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/hypo" android:id="@+id/hypo"
@ -193,9 +187,7 @@
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
android:text="@string/hypo" android:text="@string/hypo"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" android:textColor="?attr/lowColor" />
android:textColor="?attr/lowColor"
android:textSize="11sp" />
</LinearLayout> </LinearLayout>

7
app/src/main/res/layout/overview_buttons_layout.xml
View file

@ -46,7 +46,6 @@
android:drawableTop="@drawable/icon_insulin_carbs" android:drawableTop="@drawable/icon_insulin_carbs"
android:text="@string/overview_treatment_label" android:text="@string/overview_treatment_label"
android:textColor="?attr/icTreatmentColor" android:textColor="?attr/icTreatmentColor"
android:textSize="10sp"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
@ -60,7 +59,6 @@
android:drawableTop="@drawable/ic_bolus" android:drawableTop="@drawable/ic_bolus"
android:text="@string/overview_insulin_label" android:text="@string/overview_insulin_label"
android:textColor="?attr/icBolusColor" android:textColor="?attr/icBolusColor"
android:textSize="10sp"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -73,7 +71,6 @@
android:drawableTop="@drawable/ic_cp_bolus_carbs" android:drawableTop="@drawable/ic_cp_bolus_carbs"
android:text="@string/treatments_wizard_carbs_label" android:text="@string/treatments_wizard_carbs_label"
android:textColor="?attr/icBolusCarbsColor" android:textColor="?attr/icBolusCarbsColor"
android:textSize="10sp"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -86,7 +83,6 @@
android:drawableTop="@drawable/ic_calculator" android:drawableTop="@drawable/ic_calculator"
android:text="@string/overview_calculator_label" android:text="@string/overview_calculator_label"
android:textColor="?attr/icCalculatorColor" android:textColor="?attr/icCalculatorColor"
android:textSize="10sp"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
<info.nightscout.androidaps.utils.ui.SingleClickButton <info.nightscout.androidaps.utils.ui.SingleClickButton
@ -99,7 +95,6 @@
android:drawableTop="@drawable/ic_calibration" android:drawableTop="@drawable/ic_calibration"
android:text="@string/overview_calibration" android:text="@string/overview_calibration"
android:textColor="?attr/icCalibrationColor" android:textColor="?attr/icCalibrationColor"
android:textSize="10sp"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
@ -113,7 +108,6 @@
android:drawableTop="@drawable/ic_xdrip" android:drawableTop="@drawable/ic_xdrip"
android:text="@string/overview_cgm" android:text="@string/overview_cgm"
android:textColor="?attr/icCalibrationColor" android:textColor="?attr/icCalibrationColor"
android:textSize="10sp"
android:visibility="gone" android:visibility="gone"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
@ -128,7 +122,6 @@
android:text="@string/quickwizard" android:text="@string/quickwizard"
android:hint="@string/quickwizard" android:hint="@string/quickwizard"
android:textColor="?attr/icQuickWizardColor" android:textColor="?attr/icQuickWizardColor"
android:textSize="10sp"
tools:ignore="SmallSp" /> tools:ignore="SmallSp" />
</LinearLayout> </LinearLayout>

6
core/src/main/res/values-night/styles.xml
View file

@ -330,7 +330,11 @@
</style> </style>
<style name="ButtonSmallFontStyle" parent="GrayButton"> <style name="ButtonSmallFontStyle" parent="GrayButton">
<item name="android:textSize">10sp</item> <item name="android:letterSpacing">0</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingStart">0dp</item>
<item name="android:paddingEnd">0dp</item>
<item name="android:textSize">11dp</item>
</style> </style>
<style name="ButtonMediumFontStyle" parent="GrayButton"> <style name="ButtonMediumFontStyle" parent="GrayButton">

6
core/src/main/res/values/styles.xml
View file

@ -345,7 +345,11 @@
</style> </style>
<style name="ButtonSmallFontStyle" parent="GrayButton"> <style name="ButtonSmallFontStyle" parent="GrayButton">
<item name="android:textSize">10sp</item> <item name="android:letterSpacing">0</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingStart">0dp</item>
<item name="android:paddingEnd">0dp</item>
<item name="android:textSize">11dp</item>
</style> </style>
<style name="ButtonMediumFontStyle" parent="GrayButton"> <style name="ButtonMediumFontStyle" parent="GrayButton">