diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 131e44d..254a1fc 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f561264..5a8630f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ if (useKeystoreProperties) { plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("org.jetbrains.kotlin.plugin.compose") version "2.2.0" + id("org.jetbrains.kotlin.plugin.compose") version "2.2.10" } android { @@ -95,7 +95,7 @@ android { } dependencies { - implementation("androidx.core:core-ktx:1.16.0") + implementation("androidx.core:core-ktx:1.17.0") implementation("androidx.activity:activity-compose:1.10.1") implementation("androidx.navigation:navigation-compose:2.9.3") implementation("androidx.datastore:datastore-preferences:1.1.7") @@ -103,7 +103,7 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-process:$lifecycleVersion") - implementation(platform("androidx.compose:compose-bom:2025.07.00")) + implementation(platform("androidx.compose:compose-bom:2025.08.00")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-text") implementation("androidx.compose.ui:ui-graphics") diff --git a/app/src/main/kotlin/app/grapheneos/info/ui/reusablecomposables/ClickableText.kt b/app/src/main/kotlin/app/grapheneos/info/ui/reusablecomposables/ClickableText.kt index e306727..01def46 100644 --- a/app/src/main/kotlin/app/grapheneos/info/ui/reusablecomposables/ClickableText.kt +++ b/app/src/main/kotlin/app/grapheneos/info/ui/reusablecomposables/ClickableText.kt @@ -1,5 +1,6 @@ package app.grapheneos.info.ui.reusablecomposables +import androidx.compose.foundation.clickable import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.text.InlineTextContent import androidx.compose.material3.LocalContentColor @@ -61,7 +62,9 @@ fun ClickableText( Text( text = text, - modifier = modifier.then(pressIndicator), + modifier = modifier + .clickable(onClick = { }) + .then(pressIndicator), style = style.merge( color = textColor, fontSize = fontSize, diff --git a/build.gradle.kts b/build.gradle.kts index 701e5f0..8051ad5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ plugins { id("com.android.application") version "8.12.0" apply false - id("org.jetbrains.kotlin.android") version "2.2.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.10" apply false } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 308759c..a04198d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -126,86 +126,86 @@ - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + @@ -240,20 +240,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -304,174 +304,190 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -487,20 +503,20 @@ - - - + + + - - + + - - - + + + - - + + @@ -917,6 +933,9 @@ + + + @@ -2813,36 +2832,36 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -2853,159 +2872,159 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + @@ -3032,14 +3051,6 @@ - - - - - - - - @@ -3048,44 +3059,52 @@ - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - + + + + + + + + + + @@ -3104,14 +3123,6 @@ - - - - - - - - @@ -3121,9 +3132,6 @@ - - - @@ -3131,6 +3139,17 @@ + + + + + + + + + + + @@ -3152,9 +3171,9 @@ - - - + + + @@ -3162,9 +3181,9 @@ - - - + + + @@ -3215,56 +3234,46 @@ - - + + - - - - - - - - - - + + - - - + + + - - + + - - - + + + - - + + - - - + + + - - - - + + - - - + + + - - - + + + @@ -3272,12 +3281,12 @@ - - - + + + - - + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 78cb6e1..3e781fb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionSha256Sum=8fad3d78296ca518113f3d29016617c7f9367dc005f932bd9d93bf45ba46072b +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a9..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.