Merge remote-tracking branch 'origin/dev' into fmegen/3.3.0.0

nightscout · Mar 2, 2025 · 2ca7d24 · 2ca7d24
2 parents d0aaa69 + 598ed9f
commit 2ca7d24
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 20 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -28,7 +28,7 @@ fun generateGitBuild(): String {
         }
         val commitObject = stdout.toString().trim()
         stringBuilder.append(commitObject)
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         stringBuilder.append("NoGitSystemAvailable")
     }
     return stringBuilder.toString()
@@ -44,7 +44,7 @@ fun generateGitRemote(): String {
         }
         val commitObject: String = stdout.toString().trim()
         stringBuilder.append(commitObject)
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         stringBuilder.append("NoGitSystemAvailable")
     }
     return stringBuilder.toString()
@@ -69,7 +69,7 @@ fun gitAvailable(): Boolean {
         }
         val commitObject = stdout.toString().trim()
         stringBuilder.append(commitObject)
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         return false // NoGitSystemAvailable
     }
     return stringBuilder.toString().isNotEmpty()
@@ -89,7 +89,7 @@ fun allCommitted(): Boolean {
             // ignore all files added to project dir but not staged/known to GIT
             .replace(Regex("""(?m)^\s*(\?\?)\s*.*?\s*$"""), "")
         stringBuilder.append(cleanedList.trim())
-    } catch (ignored: Exception) {
+    } catch (_: Exception) {
         return false // NoGitSystemAvailable
     }
     return stringBuilder.toString().isEmpty()

diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt
@@ -100,7 +100,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
     @Inject lateinit var iconsProvider: IconsProvider
     @Inject lateinit var constraintChecker: ConstraintsChecker
     @Inject lateinit var signatureVerifierPlugin: SignatureVerifierPlugin
-    @Inject lateinit var maitenancePlugin: MaintenancePlugin
+    @Inject lateinit var maintenancePlugin: MaintenancePlugin
     @Inject lateinit var uel: UserEntryLogger
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var fileListProvider: FileListProvider
@@ -332,7 +332,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
                 text = rh.gs(app.aaps.core.ui.R.string.aaps_directory_not_selected),
                 level = Notification.IMPORTANCE_HIGH,
                 buttonText = R.string.select,
-                action = { maitenancePlugin.selectAapsDirectory(this) },
+                action = { maintenancePlugin.selectAapsDirectory(this) },
                 validityCheck = { preferences.getIfExists(StringKey.AapsDirectoryUri).isNullOrEmpty() }
             )
     }
@@ -506,7 +506,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() {
         FirebaseCrashlytics.getInstance().setCustomKey("BuildType", config.BUILD_TYPE)
         FirebaseCrashlytics.getInstance().setCustomKey("BuildFlavor", config.FLAVOR)
         FirebaseCrashlytics.getInstance().setCustomKey("Remote", remote)
-        FirebaseCrashlytics.getInstance().setCustomKey("Committed", BuildConfig.COMMITTED)
+        FirebaseCrashlytics.getInstance().setCustomKey("Committed", config.COMMITTED)
         FirebaseCrashlytics.getInstance().setCustomKey("Hash", hashes[0])
         FirebaseCrashlytics.getInstance().setCustomKey("Email", preferences.get(StringKey.MaintenanceIdentification))
     }

diff --git a/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt b/app/src/main/kotlin/app/aaps/implementations/ConfigImpl.kt
@@ -23,6 +23,8 @@ class ConfigImpl @Inject constructor(
     override val PUMPDRIVERS = BuildConfig.FLAVOR == "full" || BuildConfig.FLAVOR == "pumpcontrol"
     override val FLAVOR = BuildConfig.FLAVOR
     override val VERSION_NAME = BuildConfig.VERSION_NAME
+    override val HEAD = BuildConfig.HEAD
+    override val COMMITTED = BuildConfig.COMMITTED.toBoolean()
     override val BUILD_VERSION = BuildConfig.BUILDVERSION
     override val REMOTE: String = BuildConfig.REMOTE
     override val BUILD_TYPE: String = BuildConfig.BUILD_TYPE

diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/configuration/Config.kt
@@ -12,6 +12,8 @@ interface Config {
     val PUMPDRIVERS: Boolean
     val FLAVOR: String
     val VERSION_NAME: String
+    val HEAD: String
+    val COMMITTED: Boolean
     val BUILD_VERSION: String
     val REMOTE: String
     val BUILD_TYPE: String

diff --git a/core/objects/src/main/kotlin/app/aaps/core/objects/wizard/BolusWizard.kt b/core/objects/src/main/kotlin/app/aaps/core/objects/wizard/BolusWizard.kt
@@ -355,7 +355,7 @@ class BolusWizard @Inject constructor(
             actions.add(
                 rh.gs(app.aaps.core.ui.R.string.cobvsiob) + ": " + rh.gs(
                     app.aaps.core.ui.R.string.formatsignedinsulinunits,
-                    insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG
+                    -insulinFromBolusIOB - insulinFromBasalIOB + insulinFromCOB + insulinFromBG
                 ).formatColor(
                     context, rh, app.aaps.core.ui.R.attr
                         .cobAlertColor
@@ -470,7 +470,7 @@ class BolusWizard @Inject constructor(
         }
         if (useCob) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_cob, cob, insulinFromCOB)
         if (useBg) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_bg, insulinFromBG)
-        if (includeBolusIOB) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_iob, insulinFromBolusIOB + insulinFromBasalIOB)
+        if (includeBolusIOB) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_iob, -insulinFromBolusIOB - insulinFromBasalIOB)
         if (useTrend) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_trend, insulinFromTrend)
         if (useSuperBolus) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_superbolus, insulinFromSuperBolus)
         if (percentageCorrection != 100) {

diff --git a/core/ui/src/main/res/values-night/styles.xml b/core/ui/src/main/res/values-night/styles.xml
@@ -439,6 +439,7 @@
 
     <style name="Widget.App.CheckBox" parent="Widget.MaterialComponents.CompoundButton.CheckBox">
         <item name="buttonTint">@color/button_tint</item>
+        <item name="android:minWidth">0dp</item>
     </style>
 
 </resources>
diff --git a/core/ui/src/main/res/values/styles.xml b/core/ui/src/main/res/values/styles.xml
@@ -450,6 +450,7 @@
 
     <style name="Widget.App.CheckBox" parent="Widget.MaterialComponents.CompoundButton.CheckBox">
         <item name="buttonTint">@color/button_tint</item>
+        <item name="android:minWidth">0dp</item>
     </style>
 
 </resources>
diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt
@@ -182,7 +182,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
             _binding = it
         }.root
 
-    //@SuppressLint("NewApi")
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -200,6 +200,14 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
         if (config.AAPSCLIENT2)
             binding.nsclientCard.setBackgroundColor(Color.argb(80, 0x0F, 0xBB, 0xE0))
 
+        //if (config.APS || config.PUMPCONTROL)
+            binding.graphsLayout.version.text = "${config.VERSION_NAME}(${config.HEAD.substring(0, 4)})"
+            binding.graphsLayout.version.setTextColor(
+                if (config.COMMITTED) rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)
+                else rh.gac(context, app.aaps.core.ui.R.attr.urgentColor)
+            )
+        binding.graphsLayout.version.alpha = 0.4f
+
         skinProvider.activeSkin().preProcessLandscapeOverviewLayout(binding, landscape, rh.gb(app.aaps.core.ui.R.bool.isTablet), smallHeight)
         binding.nsclientCard.visibility = config.AAPSCLIENT.toVisibility()
 

diff --git a/plugins/main/src/main/res/layout/overview_graphs_layout.xml b/plugins/main/src/main/res/layout/overview_graphs_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/graphs_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -21,13 +22,13 @@
             android:id="@+id/scale_button"
             android:layout_width="65dp"
             android:layout_height="35dp"
-            android:layout_marginStart="35dp"
-            android:textAllCaps="false"
-            android:layout_alignParentTop="true"
             android:layout_alignParentStart="true"
-            android:padding = "0dp"
-            android:drawableRight="@drawable/ic_arrow_drop_down_white_24dp"
-            android:contentDescription="@string/a11y_graph_scale" />
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="35dp"
+            android:contentDescription="@string/a11y_graph_scale"
+            android:drawableEnd="@drawable/ic_arrow_drop_down_white_24dp"
+            android:padding="0dp"
+            android:textAllCaps="false" />
 
         <ImageButton
             android:id="@+id/chart_menu_button"
@@ -36,10 +37,20 @@
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="5dp"
-            android:paddingTop="5dp"
             android:contentDescription="@string/chart_menu"
+            android:paddingTop="5dp"
             app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />
 
+        <TextView
+            android:id="@+id/version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginEnd="5dp"
+            android:layout_toStartOf="@+id/chart_menu_button"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            tools:ignore="RelativeOverlap" />
+
     </RelativeLayout>
 
     <LinearLayout

diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt
@@ -489,7 +489,7 @@ class WizardDialog : DaggerDialogFragment() {
             binding.carbs.text = rh.gs(R.string.format_carbs_ic, carbs.toDouble(), wizard.ic)
             binding.carbsInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromCarbs)
 
-            binding.iobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromBolusIOB + wizard.insulinFromBasalIOB)
+            binding.iobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, -wizard.insulinFromBolusIOB - wizard.insulinFromBasalIOB)
 
             binding.correctionInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromCorrection)
 

diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardInfoDialog.kt
@@ -72,10 +72,10 @@ class WizardInfoDialog : DaggerDialogFragment() {
         binding.cobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.cobInsulin)
         binding.cobCheckbox.isChecked = data.wasCOBUsed
         // Bolus IOB
-        binding.bolusIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.bolusIOB)
+        binding.bolusIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, -data.bolusIOB)
         binding.bolusIobCheckbox.isChecked = data.wasBolusIOBUsed
         // Basal IOB
-        binding.basalIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.basalIOB)
+        binding.basalIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, -data.basalIOB)
         binding.basalIobCheckbox.isChecked = data.wasBasalIOBUsed
         // Superbolus
         binding.sbInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.superbolusInsulin)