From 1699681e56efd505f5831d053bd8c5faf2ead799 Mon Sep 17 00:00:00 2001 From: greenart7c3 Date: Wed, 14 Feb 2024 14:22:00 -0300 Subject: [PATCH] update dependencies, clear intents onDestroy --- app/build.gradle | 8 ++++---- .../main/java/com/greenart7c3/nostrsigner/MainActivity.kt | 5 +++++ .../com/greenart7c3/nostrsigner/ui/PermissionsScreen.kt | 5 ++--- build.gradle | 5 ++--- gradle.properties | 3 +-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2ca65632..69acecae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -88,18 +88,18 @@ dependencies { // Observe Live data as State implementation "androidx.compose.runtime:runtime-livedata:$compose_ui_version" - implementation "androidx.compose.material3:material3:1.1.2" + implementation "androidx.compose.material3:material3:1.2.0" implementation "androidx.compose.material:material-icons-extended:$compose_ui_version" implementation 'androidx.appcompat:appcompat:1.6.1' testImplementation 'junit:junit:4.13.2' testImplementation 'io.mockk:mockk:1.13.9' - androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha02' + androidTestImplementation 'androidx.test.ext:junit:1.2.0-alpha03' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_ui_version" debugImplementation "androidx.compose.ui:ui-tooling:$compose_ui_version" - debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_test_version" + debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version" implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06' @@ -109,7 +109,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" // For QR generation - implementation 'com.google.zxing:core:3.5.2' + implementation 'com.google.zxing:core:3.5.3' implementation 'com.journeyapps:zxing-android-embedded:4.3.0' // Json Serialization diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt b/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt index 1f11f1e6..a6381f23 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt @@ -81,4 +81,9 @@ class MainActivity : AppCompatActivity() { it }?.toMutableList() } + + override fun onDestroy() { + mainViewModel.intents.value?.clear() + super.onDestroy() + } } diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/PermissionsScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/PermissionsScreen.kt index 4f9682b2..51183cf1 100644 --- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/PermissionsScreen.kt +++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/PermissionsScreen.kt @@ -8,10 +8,9 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowForward -import androidx.compose.material.icons.filled.ArrowForward import androidx.compose.material.icons.filled.ClearAll import androidx.compose.material3.AlertDialog -import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -112,7 +111,7 @@ fun PermissionsScreen( ) } - Divider() + HorizontalDivider() if (applications.isEmpty()) { Column( diff --git a/build.gradle b/build.gradle index 12a7d780..6f94588f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { ext { lifecycle_version = '2.7.0' - compose_ui_version = '1.6.0' - compose_ui_test_version = '1.6.0' - nav_version = "2.7.6" + compose_ui_version = '1.6.1' + nav_version = "2.7.7" core_ktx_version = '1.12.0' } } diff --git a/gradle.properties b/gradle.properties index 25ed1204..96f15c5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,4 @@ kotlin.code.style=official # thereby reducing the size of the R class for that library android.nonTransitiveRClass=true android.enableR8.fullMode=true -android.nonFinalResIds=false -org.gradle.unsafe.configuration-cache=true \ No newline at end of file +android.nonFinalResIds=false \ No newline at end of file