Skip to content

Dana and Diaconn Icons + Diaconn Image #4668

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 1, 2026
Merged

Dana and Diaconn Icons + Diaconn Image #4668

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
810 changes: 810 additions & 0 deletions core/ui/src/main/kotlin/app/aaps/core/ui/compose/icons/IcDiaconn.kt
View file
Open in desktop

Large diffs are not rendered by default.

454 changes: 454 additions & 0 deletions core/ui/src/main/kotlin/app/aaps/core/ui/compose/icons/IcPluginDana.kt
View file
Open in desktop

Large diffs are not rendered by default.

1,592 changes: 1,592 additions & 0 deletions core/ui/src/main/kotlin/app/aaps/core/ui/compose/icons/IcPluginDiaconn.kt
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 0 additions & 44 deletions core/ui/src/main/kotlin/app/aaps/core/ui/compose/icons/IcPluginOmnipod.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,50 +27,6 @@ val IcPluginOmnipod: ImageVector by lazy {
viewportWidth = 24f,
viewportHeight = 24f
).apply {
// Couche avec opacité 0.4
path(
fill = SolidColor(Color.Black),
fillAlpha = 0.0f,
stroke = null,
strokeAlpha = 1.0f,
strokeLineWidth = 1.0f,
strokeLineCap = StrokeCap.Butt,
strokeLineJoin = StrokeJoin.Miter,
strokeLineMiter = 1.0f
) {
// Tape
moveTo(14.081f, 3.615f)
horizontalLineTo(5.649f)
curveTo(3.212f, 3.608f, 1.207f, 5.582f, 1.2f, 8.019f)
verticalLineToRelative(7.939f)
curveToRelative(-0.007f, 2.437f, 1.967f, 4.422f, 4.404f, 4.427f)
horizontalLineToRelative(9.281f)
curveToRelative(4.408f, -0.311f, 7.826f, -4.193f, 7.913f, -8.34f)
curveTo(22.891f, 7.488f, 19.606f, 4.157f, 14.081f, 3.615f)
close()

moveTo(10.709f, 19.684f)
curveToRelative(-0.223f, -0.002f, -0.405f, -0.183f, -0.403f, -0.408f)
curveToRelative(0f, -0.225f, 0.182f, -0.407f, 0.405f, -0.407f)
curveToRelative(0.225f, 0.002f, 0.407f, 0.183f, 0.405f, 0.408f)
curveToRelative(0f, 0.225f, -0.182f, 0.406f, -0.407f, 0.406f)
close()

moveTo(10.747f, 5.255f)
curveToRelative(-0.223f, 0f, -0.405f, -0.183f, -0.405f, -0.408f)
curveToRelative(0.002f, -0.225f, 0.183f, -0.407f, 0.407f, -0.405f)
curveToRelative(0.225f, 0f, 0.405f, 0.183f, 0.405f, 0.408f)
curveToRelative(0f, 0.225f, -0.182f, 0.407f, -0.407f, 0.405f)
close()

moveTo(20.317f, 15.117f)
curveToRelative(-0.472f, -0.033f, -0.796f, -0.875f, -0.725f, -1.879f)
curveToRelative(0.073f, -1.005f, 0.512f, -1.792f, 0.984f, -1.758f)
lineToRelative(-0.163f, 1.763f)
lineToRelative(-0.096f, 1.874f)
close()
}

// Pod
path(
fill = SolidColor(Color.Black),
Expand Down
3 changes: 2 additions & 1 deletion pump/danar/src/main/kotlin/app/aaps/pump/danar/AbstractDanaRPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.interfaces.utils.Round.roundTo
import app.aaps.core.keys.interfaces.Preferences
import app.aaps.core.objects.constraints.ConstraintObject
import app.aaps.core.ui.compose.icons.IcPluginDana
import app.aaps.pump.dana.DanaPump
import app.aaps.pump.dana.comm.RecordTypes
import app.aaps.pump.dana.database.DanaHistoryDatabase
Expand Down Expand Up @@ -90,7 +91,7 @@ abstract class AbstractDanaRPlugin protected constructor(
danaPump = danaPump
)
}
.pluginIcon(app.aaps.core.ui.R.drawable.ic_danai_128)
.icon(IcPluginDana)
.pluginName(app.aaps.pump.dana.R.string.danarpump)
.shortName(app.aaps.pump.dana.R.string.danarpump_shortname)
.preferencesId(PluginDescription.PREFERENCE_SCREEN)
Expand Down
4 changes: 2 additions & 2 deletions pump/danars/src/main/kotlin/app/aaps/pump/danars/DanaRSPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.keys.interfaces.Preferences
import app.aaps.core.objects.constraints.ConstraintObject
import app.aaps.core.ui.compose.icons.IcPluginDana
import app.aaps.core.ui.compose.preference.PreferenceSubScreenDef
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.validators.preferences.AdaptiveListIntPreference
Expand Down Expand Up @@ -108,8 +109,7 @@ class DanaRSPlugin @Inject constructor(
blePreCheck = blePreCheck
)
}
.pluginIcon(app.aaps.core.ui.R.drawable.ic_danai_128)
.pluginIcon2(app.aaps.core.ui.R.drawable.ic_danars_128)
.icon(IcPluginDana)
.pluginName(app.aaps.pump.dana.R.string.danarspump)
.shortName(app.aaps.pump.dana.R.string.danarspump_shortname)
.preferencesId(PluginDescription.PREFERENCE_SCREEN)
Expand Down
3 changes: 2 additions & 1 deletion pump/diaconn/src/main/kotlin/app/aaps/pump/diaconn/DiaconnG8Plugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import app.aaps.core.interfaces.utils.Round
import app.aaps.core.interfaces.utils.fabric.FabricPrivacy
import app.aaps.core.keys.interfaces.Preferences
import app.aaps.core.objects.constraints.ConstraintObject
import app.aaps.core.ui.compose.icons.IcPluginDiaconn
import app.aaps.core.ui.compose.preference.PreferenceSubScreenDef
import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.validators.preferences.AdaptiveListIntPreference
Expand Down Expand Up @@ -104,7 +105,7 @@ class DiaconnG8Plugin @Inject constructor(
blePreCheck = blePreCheck
)
}
.pluginIcon(app.aaps.core.ui.R.drawable.ic_diaconn_g8)
.icon(IcPluginDiaconn)
.pluginName(R.string.diaconn_g8_pump)
.shortName(R.string.diaconn_g8_pump_shortname)
.preferencesId(PluginDescription.PREFERENCE_SCREEN)
Expand Down
12 changes: 4 additions & 8 deletions pump/diaconn/src/main/kotlin/app/aaps/pump/diaconn/compose/DiaconnOverviewScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ package app.aaps.pump.diaconn.compose

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import app.aaps.core.ui.compose.icons.IcDiaconn
import app.aaps.core.ui.compose.pump.PumpOverviewScreen

@Composable
Expand All @@ -22,12 +20,10 @@ fun DiaconnOverviewScreen(
state = uiState,
customContent = {
Image(
painter = painterResource(id = app.aaps.core.ui.R.drawable.ic_diaconn_g8),
imageVector = IcDiaconn,
contentDescription = null,
modifier = Modifier
.fillMaxWidth()
.height(128.dp),
contentScale = ContentScale.Fit
modifier = Modifier.fillMaxWidth(),
contentScale = ContentScale.FillWidth
)
}
)
Expand Down
Loading