diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 095b8ea6..0c0c3383 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,20 +3,7 @@ - - - - - - - - - - - - - - + diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 8d81632f..fe63bb67 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 b/app/build.gradle index d605ad5a..c3d79c70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.kotlin.android' id 'dagger.hilt.android.plugin' id 'com.google.devtools.ksp' - id "com.mikepenz.aboutlibraries.plugin" version "10.5.2" + id "com.mikepenz.aboutlibraries.plugin" version "11.1.3" } apply plugin: 'com.mikepenz.aboutlibraries.plugin' @@ -58,7 +58,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.5.10' + kotlinCompilerExtensionVersion '1.5.12' } packagingOptions { resources { @@ -75,15 +75,15 @@ aboutLibraries { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2024.04.00') + def composeBom = platform('androidx.compose:compose-bom:2024.04.01') implementation composeBom androidTestImplementation composeBom // Android core components. - implementation 'androidx.core:core-ktx:1.12.0' + implementation 'androidx.core:core-ktx:1.13.0' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' - implementation 'androidx.activity:activity-compose:1.8.2' + implementation 'androidx.activity:activity-compose:1.9.0' implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0" implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0" implementation "androidx.navigation:navigation-compose:2.7.7" @@ -101,7 +101,7 @@ dependencies { // Android 12+ splash API. implementation 'androidx.core:core-splashscreen:1.0.1' // Material icons. - implementation 'androidx.compose.material:material-icons-extended:1.6.4' + implementation 'androidx.compose.material:material-icons-extended:1.6.6' // Room database implementation "androidx.room:room-ktx:$room_version" ksp "androidx.room:room-compiler:$room_version" @@ -112,7 +112,7 @@ dependencies { ksp "com.google.dagger:hilt-android-compiler:$hilt_version" ksp "androidx.hilt:hilt-compiler:1.2.0" // DataStore Preferences. - implementation("androidx.datastore:datastore-preferences:1.0.0") + implementation("androidx.datastore:datastore-preferences:1.1.0") // Gson JSON parser. implementation 'com.google.code.gson:gson:2.10.1' // Coil Image loading library. @@ -124,12 +124,12 @@ dependencies { // Tap-target compose. implementation "com.pierfrancescosoffritti.taptargetcompose:core:1.1.1" // Lottie animations. - implementation "com.airbnb.android:lottie-compose:4.1.0" + implementation "com.airbnb.android:lottie-compose:6.4.0" // Bio-metric authentication. implementation "androidx.biometric:biometric:1.1.0" // Open Source Libraries Screen. - implementation "com.mikepenz:aboutlibraries-core:10.5.2" - implementation "com.mikepenz:aboutlibraries-compose:10.5.2" + implementation "com.mikepenz:aboutlibraries-core:11.1.3" + implementation "com.mikepenz:aboutlibraries-compose:11.1.3" // Crash Handler. implementation 'cat.ereza:customactivityoncrash:2.4.0' // Oreo back-ports for API 24 (N) diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt index 8ebda39a..5f2b3234 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/dwscreen/composables/DWScreen.kt @@ -176,7 +176,7 @@ fun DWScreen(goalId: String, transactionTypeName: String, navController: NavCont LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier .size(280.dp) .padding(top = 28.dp), @@ -345,7 +345,7 @@ private fun TransactionAddedAnimation(transactionType: TransactionType) { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(320.dp) ) diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt index afa0776e..d21a794d 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt @@ -374,7 +374,7 @@ private fun HomeScreenContent( LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(320.dp), enableMergePaths = true ) @@ -549,7 +549,7 @@ private fun NoGoalAnimation() { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(335.dp), enableMergePaths = true ) diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt index 5841e37c..afe6d001 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt @@ -222,7 +222,7 @@ fun GoalInfoScreen(goalId: String, navController: NavController) { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(320.dp), enableMergePaths = true ) diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt index 84bcb92d..e315541e 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt @@ -895,7 +895,7 @@ private fun GoalAddedOREditedAnimation(editGoalId: String?) { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(320.dp) ) val textStr = if (editGoalId == null) { diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/other/CongratsScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/other/CongratsScreen.kt index 3988dfdd..2c8aa3a4 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/other/CongratsScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/other/CongratsScreen.kt @@ -106,7 +106,7 @@ fun CongratsScreen(navController: NavController) { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(360.dp), enableMergePaths = true ) diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/AboutScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/AboutScreen.kt index 564ef6b9..921a73f8 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/AboutScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/AboutScreen.kt @@ -68,7 +68,7 @@ sealed class AboutLinks(val url: String) { data object GithubIssues : AboutLinks("https://github.com/Pool-Of-Tears/GreenStash/issues") data object Telegram : AboutLinks("https://t.me/PotApps") - data object Sponser : AboutLinks("https://github.com/sponsors/starry-shivam") + data object Sponsor : AboutLinks("https://github.com/sponsors/starry-shivam") } @@ -137,7 +137,7 @@ fun AboutScreen(navController: NavController) { SettingsItem(title = stringResource(id = R.string.about_support_title), description = stringResource(id = R.string.about_support_desc), icon = Icons.Filled.Favorite, - onClick = { openWebLink(context, AboutLinks.Sponser.url) } + onClick = { openWebLink(context, AboutLinks.Sponsor.url) } ) } item { diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt index b65fb4b8..38a4f6c5 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/welcome/composables/WelcomeScreen.kt @@ -108,7 +108,7 @@ fun WelcomeScreen(navController: NavController) { Box(modifier = Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) { LottieAnimation( composition = compositionResult.value, - progress = progressAnimation, + progress = { progressAnimation }, modifier = Modifier.size(320.dp), enableMergePaths = true ) diff --git a/build.gradle b/build.gradle index b0c9d2dc..aba91539 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { ext { - kotlin_version = '1.9.22' + kotlin_version = '1.9.23' gradle_version = '8.3.2' hilt_version = '2.49' room_version = '2.6.1' @@ -22,5 +22,5 @@ plugins { id 'com.android.application' version "$gradle_version" apply false id 'com.android.library' version "$gradle_version" apply false id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false - id 'com.google.devtools.ksp' version '1.9.22-1.0.17' apply false + id 'com.google.devtools.ksp' version '1.9.23-1.0.20' apply false } \ No newline at end of file