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:41:22 +02:00
commit dedb20846c
8 changed files with 33 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt
View file

@ -42,13 +42,6 @@ class SkinLowRes @Inject constructor(private val config: Config) : SkinInterface
if (!config.NSCLIENT && isLandscape) moveButtonsLayout(binding.root) if (!config.NSCLIENT && isLandscape) moveButtonsLayout(binding.root)
binding.apply { binding.apply {
loopCard.elevation = 0F
loopCard.radius = 0F
val param = (loopCard.layoutParams as ViewGroup.MarginLayoutParams).apply {
setMargins(0,0,0,0)
}
loopCard.layoutParams = param
infoCard.elevation = 0F infoCard.elevation = 0F
infoCard.radius = 0F infoCard.radius = 0F
val paramInfo = (infoCard.layoutParams as ViewGroup.MarginLayoutParams).apply { val paramInfo = (infoCard.layoutParams as ViewGroup.MarginLayoutParams).apply {

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

@ -75,7 +75,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -91,7 +91,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -107,7 +107,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -123,7 +123,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -139,7 +139,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
@ -182,7 +182,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_resume" android:drawableTop="@drawable/ic_loop_resume"
android:paddingStart="10dp" android:paddingStart="10dp"
@ -204,7 +204,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -218,7 +218,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -232,7 +232,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -246,7 +246,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -289,7 +289,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_reconnect" android:drawableTop="@drawable/ic_loop_reconnect"
android:paddingStart="10dp" android:paddingStart="10dp"
@ -311,7 +311,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -325,7 +325,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -339,7 +339,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -353,7 +353,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"
@ -367,7 +367,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:paddingStart="5dp" android:paddingStart="5dp"
android:paddingEnd="5dp" android:paddingEnd="5dp"

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

@ -143,7 +143,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_target_cancel" android:drawableTop="@drawable/ic_target_cancel"
android:paddingStart="5dp" android:paddingStart="5dp"
@ -158,7 +158,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_target_eatingsoon" android:drawableTop="@drawable/ic_target_eatingsoon"
android:paddingStart="5dp" android:paddingStart="5dp"
@ -173,7 +173,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_target_activity" android:drawableTop="@drawable/ic_target_activity"
android:paddingStart="5dp" android:paddingStart="5dp"

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

@ -41,7 +41,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/icon_insulin_carbs" android:drawableTop="@drawable/icon_insulin_carbs"
android:text="@string/overview_treatment_label" android:text="@string/overview_treatment_label"
@ -55,7 +55,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_bolus" android:drawableTop="@drawable/ic_bolus"
android:text="@string/overview_insulin_label" android:text="@string/overview_insulin_label"
@ -68,7 +68,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
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"
@ -81,7 +81,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_calculator" android:drawableTop="@drawable/ic_calculator"
android:text="@string/overview_calculator_label" android:text="@string/overview_calculator_label"
@ -94,7 +94,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_calibration" android:drawableTop="@drawable/ic_calibration"
android:text="@string/overview_calibration" android:text="@string/overview_calibration"
@ -108,7 +108,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_xdrip" android:drawableTop="@drawable/ic_xdrip"
android:text="@string/overview_cgm" android:text="@string/overview_cgm"
@ -122,7 +122,7 @@
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_marginEnd="-4dp" android:layout_marginEnd="-2dp"
android:layout_weight="0.5" android:layout_weight="0.5"
android:drawableTop="@drawable/ic_quick_wizard" android:drawableTop="@drawable/ic_quick_wizard"
android:text="@string/quickwizard" android:text="@string/quickwizard"

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

@ -24,20 +24,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/loopCard"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<LinearLayout <LinearLayout
android:id="@+id/loop_layout" android:id="@+id/loop_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -75,8 +61,6 @@
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
android:id="@+id/infoCard" android:id="@+id/infoCard"
style="@style/Widget.MaterialComponents.CardView" style="@style/Widget.MaterialComponents.CardView"
@ -87,7 +71,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:contentPadding="2dp" app:contentPadding="2dp"
app:cardElevation="4dp" app:cardElevation="2dp"
app:cardUseCompatPadding="false" app:cardUseCompatPadding="false"
android:layout_gravity="center"> android:layout_gravity="center">
@ -107,7 +91,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:contentPadding="2dp" app:contentPadding="2dp"
app:cardElevation="4dp" app:cardElevation="2dp"
app:cardUseCompatPadding="false" app:cardUseCompatPadding="false"
android:layout_gravity="center"> android:layout_gravity="center">
@ -127,7 +111,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:contentPadding="2dp" app:contentPadding="2dp"
app:cardElevation="4dp" app:cardElevation="2dp"
app:cardUseCompatPadding="false" app:cardUseCompatPadding="false"
android:layout_gravity="center"> android:layout_gravity="center">
@ -188,7 +172,7 @@
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:contentPadding="2dp" app:contentPadding="2dp"
app:cardElevation="4dp" app:cardElevation="2dp"
app:cardUseCompatPadding="false" app:cardUseCompatPadding="false"
android:layout_gravity="center"> android:layout_gravity="center">

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

@ -242,7 +242,7 @@
<item name="materialCalendarStyle">@style/DatePicker</item> <item name="materialCalendarStyle">@style/DatePicker</item>
<item name="materialTimePickerStyle">@style/DatePicker</item> <item name="materialTimePickerStyle">@style/DatePicker</item>
<!---Nightscout client TitelColor --> <!---Nightscout client TitelColor -->
<item name="nsTitleColor">@color/defaulttext</item> <item name="nsTitleColor">@color/defaultText</item>
</style> </style>
<style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar"> <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">

2
core/src/main/res/values/colors.xml
View file

@ -60,7 +60,7 @@
<color name="errorAlertHeaderText">#FF000000</color> <color name="errorAlertHeaderText">#FF000000</color>
<color name="helperProfile">#C803A9F4</color> <color name="helperProfile">#C803A9F4</color>
<color name="examinedProfile">#FFFF5555</color> <color name="examinedProfile">#FFFF5555</color>
<color name="defaulttext">#666666</color> <color name="defaultText">#666666</color>
<!-- Datepicker--> <!-- Datepicker-->
<color name="dateTimePickerBackground">@color/white</color> <color name="dateTimePickerBackground">@color/white</color>

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

@ -243,7 +243,7 @@
<item name="isCompletedColor">@color/isCompleted</item> <item name="isCompletedColor">@color/isCompleted</item>
<item name="isNotCompletedColor">@color/isNotCompleted</item> <item name="isNotCompletedColor">@color/isNotCompleted</item>
<!---Nightscout client TitelColor --> <!---Nightscout client TitelColor -->
<item name="nsTitleColor">@color/defaulttext</item> <item name="nsTitleColor">@color/defaultText</item>
</style> </style>
<style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar"> <style name="Aaps_ActionBarStyle" parent="@style/Widget.AppCompat.ActionBar">