changes because of updated design system library

dhis2 · Dec 18, 2024 · e342a1b · e342a1b
1 parent bbb2ccd
commit e342a1b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/src/main/java/org/dhis2/usescases/login/ui/LoginScreen.kt b/app/src/main/java/org/dhis2/usescases/login/ui/LoginScreen.kt
@@ -30,13 +30,14 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import org.dhis2.R
-import org.hisp.dhis.mobile.ui.designsystem.resource.provideFontResource
 import org.hisp.dhis.mobile.ui.designsystem.theme.DHIS2Theme
 import org.hisp.dhis.mobile.ui.designsystem.theme.SurfaceColor
 
@@ -118,7 +119,7 @@ fun LoginTopBar(
                                     style = TextStyle(
                                         fontSize = 16.sp,
                                         lineHeight = 24.sp,
-                                        fontFamily = provideFontResource("rubik_regular"),
+                                        fontFamily = FontFamily(Font(R.font.rubik_regular)),
                                         fontWeight = FontWeight.Normal,
                                         color = Color.Black,
                                         letterSpacing = 0.5.sp,
@@ -140,7 +141,7 @@ fun LoginTopBar(
             style = TextStyle(
                 fontSize = 12.sp,
                 lineHeight = 16.sp,
-                fontFamily = provideFontResource("rubik_regular"),
+                fontFamily = FontFamily(Font(R.font.rubik_regular)),
                 fontWeight = FontWeight.Normal,
                 color = SurfaceColor.ContainerHighest,
                 letterSpacing = 0.4.sp,

diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt
@@ -30,7 +30,7 @@ import androidx.compose.material.IconButton
 import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -198,7 +198,7 @@ fun SearchButtonWithQuery(
                 .clickable(
                     onClick = onClick,
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = rememberRipple(
+                    indication = ripple(
                         true,
                         color = SurfaceColor.Primary,
                     ),

diff --git a/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt b/dhis_android_analytics/src/main/java/dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -40,7 +40,7 @@ class IndicatorViewHolder(
                             if (programIndicatorModel.programIndicator?.description() != null) {
                                 Modifier.clickable(
                                     interactionSource = remember { MutableInteractionSource() },
-                                    indication = rememberRipple(),
+                                    indication = ripple(),
                                     onClick = { showDescription(programIndicatorModel.programIndicator) },
                                 )
                             } else {
@@ -60,7 +60,7 @@ class IndicatorViewHolder(
                             if (programIndicatorModel.programIndicator?.description() != null) {
                                 Modifier.clickable(
                                     interactionSource = remember { MutableInteractionSource() },
-                                    indication = rememberRipple(),
+                                    indication = ripple(),
                                     onClick = { showDescription(programIndicatorModel.programIndicator) },
                                 )
                             } else {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ minSdk = "21"
 vCode = "138"
 vName = "3.1.1"
 gradle = "8.7.2"
-kotlin = '2.0.20'
+kotlin = '2.0.21'
 hilt = '2.47'
 jacoco = '0.8.10'
 designSystem = "0.4.1-SNAPSHOT"