Fix: Some warnings and deprecations (#81)

Author: Rolf-Smit

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/screens/AboutScreen.kt

@@ -31,7 +31,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -61,6 +60,7 @@ import androidx.compose.ui.graphics.drawscope.Fill
 import androidx.compose.ui.graphics.drawscope.translate
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontWeight
@@ -281,43 +281,38 @@ fun AboutScreen(
 
                 val annotatedString = buildAnnotatedString {
 
-                    pushStringAnnotation(tag = "url", annotation = "https://github.com/NeoTech-Software/Abysner")
+                    pushLink(LinkAnnotation.Url("https://github.com/NeoTech-Software/Abysner"))
                     withStyle(style = SpanStyle(fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline)) {
                         append("Open-source")
                     }
                     pop()
 
                     append(" & licensed under ")
 
-                    pushStringAnnotation(tag = "url", annotation = "https://www.gnu.org/licenses/agpl-3.0.txt")
+                    pushLink(LinkAnnotation.Url("https://www.gnu.org/licenses/agpl-3.0.txt"))
                     withStyle(style = SpanStyle(fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline)) {
                         append("GNU AGPLv3")
                     }
                     pop()
 
                     appendLine()
-                    pushStringAnnotation(tag = "terms", annotation = "https://google.com/terms")
+                    pushLink(LinkAnnotation.Clickable(tag = "terms_and_conditions") { link ->
+                        navController.navigate(Destinations.TERMS_AND_CONDITIONS_VIEW.destinationName)
+                    })
                     withStyle(style = SpanStyle(fontWeight = FontWeight.Bold, textDecoration = TextDecoration.Underline)) {
                         append("Terms & Conditions")
                     }
                     pop()
                 }
 
-                ClickableText(
+                Text(
                     modifier = Modifier.padding(insets.onlyBottom()).padding(bottom = 16.dp).align(Alignment.BottomCenter),
                     style = MaterialTheme.typography.labelMedium.copy(
                         textAlign = TextAlign.Center,
                         color = MaterialTheme.colorScheme.onPrimary
                     ),
-                    text = annotatedString
-                ) { offset ->
-                    annotatedString.getStringAnnotations(tag = "url", start = offset, end = offset).firstOrNull()?.let {
-                        uriHandler.openUri(it.item)
-                    }
-                    annotatedString.getStringAnnotations(tag = "terms", start = offset, end = offset).firstOrNull()?.let {
-                        navController.navigate(Destinations.TERMS_AND_CONDITIONS_VIEW.destinationName)
-                    }
-                }
+                    text = annotatedString,
+                )
             }
         }
     }

composeApp/src/commonMain/kotlin/org/neotech/app/abysner/presentation/screens/planner/segments/SegmentPickerBottomSheet.kt

@@ -243,7 +243,7 @@ fun SegmentPickerBottomSheet(
                         Text("Cancel")
                     }
                     Button(
-                        enabled = isTimeValid.value && isDepthValid.value && cylinder != null,
+                        enabled = isTimeValid.value && isDepthValid.value,
                         modifier = Modifier
                             .weight(0.5f)
                             .padding(top = 16.dp),
@@ -252,7 +252,7 @@ fun SegmentPickerBottomSheet(
                                 DiveProfileSection(
                                     duration = time,
                                     depth = depth,
-                                    cylinder = cylinder!!
+                                    cylinder = cylinder
                                 )
                             )
                             scope.launch {

data/build.gradle.kts

@@ -69,7 +69,7 @@ kotlin {
 }
 
 android {
-    namespace = "nl.neotech.app.abysner"
+    namespace = "nl.neotech.app.abysner.data"
     compileSdk = libs.versions.android.compileSdk.get().toInt()
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 agp = "8.11.1"
 android-compileSdk = "36"
 android-minSdk = "26"
-android-targetSdk = "35"
+android-targetSdk = "36"
 uiTooling = "1.8.3"
 startupRuntime = "1.2.0"
 androidx-activityCompose = "1.10.1"