Skip to content

MDT: compose migration #4670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MilosKozak merged 1 commit into from
Apr 2, 2026
Merged

MDT: compose migration #4670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions PLAN.md
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/keys/src/main/kotlin/app/aaps/core/keys/IntentKey.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 9 additions & 7 deletions core/ui/src/main/kotlin/app/aaps/core/ui/compose/pump/PumpOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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) {
Expand Down
2 changes: 2 additions & 0 deletions pump/medtronic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down
5 changes: 0 additions & 5 deletions pump/medtronic/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading
Loading