From 6917bf8f64f452f30a6c30bb4077b75a30ce3150 Mon Sep 17 00:00:00 2001 From: FerdyRod Date: Wed, 18 Dec 2024 16:44:53 +0100 Subject: [PATCH 1/5] changes because of updated design system library --- .../main/java/org/dhis2/usescases/login/ui/LoginScreen.kt | 7 ++++--- .../org/dhis2/usescases/searchTrackEntity/ui/SearchTEUi.kt | 4 ++-- .../dhis2/org/analytics/charts/ui/IndicatorViewHolder.kt | 6 +++--- gradle/libs.versions.toml | 2 +- 4 files changed, 10 insertions(+), 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 index 0e0bf01898..904e9be665 100644 --- 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 index 174ca0bd22..4128321665 100644 --- 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 index 272e71ee5b..37e0c997ba 100644 --- 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 index 9eebbb0159..511a35eef9 100644 --- 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-20241212.083942-7" From d2b8b4559477ce181d11ce9717d79358dc283a54 Mon Sep 17 00:00:00 2001 From: FerdyRod Date: Thu, 19 Dec 2024 09:12:04 +0100 Subject: [PATCH 2/5] changes because of updated design system library --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 511a35eef9..c9f5b2eee7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -sdk = "34" +sdk = "35" minSdk = "21" vCode = "138" vName = "3.1.1" @@ -7,7 +7,7 @@ gradle = "8.7.2" kotlin = '2.0.21' hilt = '2.47' jacoco = '0.8.10' -designSystem = "0.4.1-20241212.083942-7" +designSystem = "0.4.1-SNAPSHOT" dhis2sdk = "1.11.1-SNAPSHOT" ruleEngine = "3.0.0" expressionParser = "1.1.0" From f4ccc58d1cb3b48ba734e5d741ff4fc2cc6827b4 Mon Sep 17 00:00:00 2001 From: FerdyRod Date: Thu, 19 Dec 2024 13:24:49 +0100 Subject: [PATCH 3/5] fix override params of onRequestPermissionResult --- .../main/java/org/dhis2/android/rtsm/ui/base/BaseActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/base/BaseActivity.kt b/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/base/BaseActivity.kt index a278d1ec97..be03eec03e 100644 --- a/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/base/BaseActivity.kt +++ b/stock-usecase/src/main/java/org/dhis2/android/rtsm/ui/base/BaseActivity.kt @@ -180,7 +180,7 @@ abstract class BaseActivity : AppCompatActivity() { override fun onRequestPermissionsResult( requestCode: Int, - permissions: Array, + permissions: Array, grantResults: IntArray, ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) From ce1d927cc5e9082e23a861bcfc6bb54faf841bed Mon Sep 17 00:00:00 2001 From: FerdyRod Date: Thu, 19 Dec 2024 14:37:14 +0100 Subject: [PATCH 4/5] fix override params of onRequestPermissionResult --- .../java/org/dhis2/usescases/general/SessionManagerActivity.kt | 2 +- app/src/main/java/org/dhis2/usescases/qrScanner/ScanActivity.kt | 2 +- .../main/java/org/dhis2/utils/granularsync/SMSSenderHelper.kt | 2 +- .../src/main/java/org/dhis2/commons/ActivityResultObserver.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/dhis2/usescases/general/SessionManagerActivity.kt b/app/src/main/java/org/dhis2/usescases/general/SessionManagerActivity.kt index fecc90d4d5..567a04ff98 100644 --- a/app/src/main/java/org/dhis2/usescases/general/SessionManagerActivity.kt +++ b/app/src/main/java/org/dhis2/usescases/general/SessionManagerActivity.kt @@ -131,7 +131,7 @@ abstract class SessionManagerActivity : AppCompatActivity(), ActivityResultObser override fun onRequestPermissionsResult( requestCode: Int, - permissions: Array, + permissions: Array, grantResults: IntArray, ) { if (activityResultObserver != null) { diff --git a/app/src/main/java/org/dhis2/usescases/qrScanner/ScanActivity.kt b/app/src/main/java/org/dhis2/usescases/qrScanner/ScanActivity.kt index e78cbbc67f..a42c5517d5 100644 --- a/app/src/main/java/org/dhis2/usescases/qrScanner/ScanActivity.kt +++ b/app/src/main/java/org/dhis2/usescases/qrScanner/ScanActivity.kt @@ -93,7 +93,7 @@ class ScanActivity : ActivityGlobalAbstract() { override fun onRequestPermissionsResult( requestCode: Int, - permissions: Array, + permissions: Array, grantResults: IntArray, ) { super.onRequestPermissionsResult(requestCode, permissions, grantResults) diff --git a/app/src/main/java/org/dhis2/utils/granularsync/SMSSenderHelper.kt b/app/src/main/java/org/dhis2/utils/granularsync/SMSSenderHelper.kt index a59b8e4f9e..317bc82715 100644 --- a/app/src/main/java/org/dhis2/utils/granularsync/SMSSenderHelper.kt +++ b/app/src/main/java/org/dhis2/utils/granularsync/SMSSenderHelper.kt @@ -82,7 +82,7 @@ class SMSSenderHelper( .show(fragmentManager, BottomSheetDialogUiModel::class.java.simpleName) } - private fun createSMSIntent(message: String, smsToNumber: String): Intent? { + private fun createSMSIntent(message: String, smsToNumber: String): Intent { val uri = Uri.parse("smsto:$smsToNumber") val intent = Intent(Intent.ACTION_SENDTO).apply { data = uri diff --git a/commons/src/main/java/org/dhis2/commons/ActivityResultObserver.kt b/commons/src/main/java/org/dhis2/commons/ActivityResultObserver.kt index c9aa3fb309..6b78ef370a 100644 --- a/commons/src/main/java/org/dhis2/commons/ActivityResultObserver.kt +++ b/commons/src/main/java/org/dhis2/commons/ActivityResultObserver.kt @@ -6,7 +6,7 @@ interface ActivityResultObserver { fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) fun onRequestPermissionsResult( requestCode: Int, - permissions: Array, + permissions: Array, grantResults: IntArray, ) } From b5fbb551ce32095f2fa0dca66ebfe2981183dbaa Mon Sep 17 00:00:00 2001 From: FerdyRod Date: Thu, 19 Dec 2024 15:42:37 +0100 Subject: [PATCH 5/5] fix override params of onRequestPermissionResult --- form/src/main/java/org/dhis2/form/ui/FormView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/form/src/main/java/org/dhis2/form/ui/FormView.kt b/form/src/main/java/org/dhis2/form/ui/FormView.kt index 168992af15..9f216bb0c2 100644 --- a/form/src/main/java/org/dhis2/form/ui/FormView.kt +++ b/form/src/main/java/org/dhis2/form/ui/FormView.kt @@ -147,7 +147,7 @@ class FormView : Fragment() { override fun onRequestPermissionsResult( requestCode: Int, - permissions: Array, + permissions: Array, grantResults: IntArray, ) { if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {