Merge pull request #4670 from nightscout/medtronic

MDT: compose migration

Author: MilosKozak

PLAN.md

@@ -9,7 +9,6 @@ import app.aaps.core.keys.interfaces.IntentPreferenceKey
  * - XdripIntentKey in :plugins:sync
  * - SmsIntentKey in :plugins:main
  * - OverviewIntentKey in :plugins:main
- * - RileyLinkIntentPreferenceKey in :pump:rileylink
  *
  * This enum is kept for backwards compatibility but should remain empty.
  * New intent keys should be added to their respective module key enums.

core/keys/src/main/kotlin/app/aaps/core/keys/IntentKey.kt

@@ -3,6 +3,7 @@ package app.aaps.core.ui.compose.pump
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -86,11 +87,11 @@ private fun CommunicationStatusCard(banner: StatusBanner?, queueStatus: String?)
     if (banner == null && queueStatus == null) return
 
     val (bgColor, fgColor) = when (banner?.level) {
-        StatusLevel.CRITICAL    -> MaterialTheme.colorScheme.errorContainer to MaterialTheme.colorScheme.onErrorContainer
-        StatusLevel.WARNING     -> MaterialTheme.colorScheme.tertiaryContainer to MaterialTheme.colorScheme.onTertiaryContainer
-        StatusLevel.NORMAL      -> MaterialTheme.colorScheme.primaryContainer to MaterialTheme.colorScheme.onPrimaryContainer
+        StatusLevel.CRITICAL -> MaterialTheme.colorScheme.errorContainer to MaterialTheme.colorScheme.onErrorContainer
+        StatusLevel.WARNING  -> MaterialTheme.colorScheme.tertiaryContainer to MaterialTheme.colorScheme.onTertiaryContainer
+        StatusLevel.NORMAL   -> MaterialTheme.colorScheme.primaryContainer to MaterialTheme.colorScheme.onPrimaryContainer
         StatusLevel.UNSPECIFIED,
-        null                    -> MaterialTheme.colorScheme.surfaceContainerHigh to MaterialTheme.colorScheme.onSurface
+        null                 -> MaterialTheme.colorScheme.surfaceContainerHigh to MaterialTheme.colorScheme.onSurface
     }
 
     Surface(
@@ -181,7 +182,8 @@ private fun ActionButtons(actions: List<PumpAction>) {
                 FilledTonalButton(
                     onClick = action.onClick,
                     enabled = action.enabled,
-                    modifier = Modifier.weight(1f)
+                    modifier = Modifier.weight(1f),
+                    contentPadding = PaddingValues(horizontal = 12.dp, vertical = 8.dp)
                 ) {
                     if (action.icon != null) {
                         Icon(
@@ -197,8 +199,8 @@ private fun ActionButtons(actions: List<PumpAction>) {
                             modifier = Modifier.size(18.dp)
                         )
                     }
-                    Spacer(modifier = Modifier.size(8.dp))
-                    Text(text = action.label)
+                    Spacer(modifier = Modifier.size(4.dp))
+                    Text(text = action.label, maxLines = 1)
                 }
             }
             if (row.size == 1) {

core/ui/src/main/kotlin/app/aaps/core/ui/compose/pump/PumpOverviewScreen.kt

@@ -22,6 +22,8 @@ dependencies {
     implementation(project(":pump:common"))
     implementation(project(":pump:rileylink"))
 
+    implementation(libs.androidx.hilt.navigation.compose)
+
     testImplementation(project(":core:keys"))
     testImplementation(project(":shared:tests"))
 

pump/medtronic/build.gradle.kts

@@ -6,11 +6,6 @@
             android:enabled="true"
             android:exported="false" />
 
-        <activity
-            android:name=".dialog.MedtronicHistoryActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme" />
-
         <uses-library
             android:name="org.apache.http.legacy"
             android:required="false" />