Merge pull request #254 from hieuwu/feature/gradle-lib-upgrade

Gradle & libraries upgrade
hieuwu · Aug 5, 2024 · 51c6cb6 · 51c6cb6
2 parents 8a14583 + 5074a11
commit 51c6cb6
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 777 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,6 @@ plugins {
     alias libs.plugins.spotless
     alias libs.plugins.navigation.safeargs
     id "org.jetbrains.kotlin.plugin.serialization" version "1.7.0"
-    id "io.gitlab.arturbosch.detekt" version "1.22.0"
 }
 
 android {
@@ -17,7 +16,7 @@ android {
 
     defaultConfig {
         applicationId "com.hieuwu.groceriesstore"
-        minSdkVersion 22
+        minSdkVersion 29
         targetSdkVersion 33
         versionCode 5
         versionName "1.0"
@@ -69,7 +68,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.5.2"
+        kotlinCompilerExtensionVersion "1.5.14"
     }
     namespace 'com.hieuwu.groceriesstore'
 }
@@ -117,6 +116,8 @@ dependencies {
     implementation("io.github.jan-tennert.supabase:postgrest-kt")
     implementation("io.github.jan-tennert.supabase:gotrue-kt")
     implementation("io.github.jan-tennert.supabase:storage-kt")
+    implementation("io.github.jan-tennert.supabase:compose-auth-ui")
+
 
     def composeBom = platform('androidx.compose:compose-bom:2023.09.02')
     implementation(composeBom)
@@ -140,8 +141,6 @@ dependencies {
     def nav_version = "2.5.3"
     implementation(libs.androidx.navigation.compose)
     implementation libs.androidx.material.icons.extended
-
-    implementation libs.caruilib
     testImplementation libs.mockito.kotlin
 
     testImplementation libs.junit
@@ -153,11 +152,6 @@ task wrapper(type: Wrapper) {
     gradleVersion = '7.5'
 }
 
-detekt {
-    config = files("${project.rootDir.absolutePath}/config/detekt/detekt.yml")
-    buildUponDefaultConfig = true
-}
-
 ktlint {
 //    android.set(true)
 //    reporters {

diff --git a/...wu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt b/...wu/groceriesstore/presentation/mealplanning/overview/composable/SwipeToDeleteContainer.kt
@@ -8,15 +8,14 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.DismissDirection
+import androidx.compose.material.DismissState
+import androidx.compose.material.DismissValue
+import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material3.DismissDirection
-import androidx.compose.material3.DismissState
-import androidx.compose.material3.DismissValue
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.rememberDismissState
 import androidx.compose.material3.Icon
-import androidx.compose.material3.SwipeToDismiss
-import androidx.compose.material3.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -30,7 +29,7 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
 
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun <T> SwipeToDeleteContainer(
     item: T,
@@ -42,7 +41,7 @@ fun <T> SwipeToDeleteContainer(
         mutableStateOf(false)
     }
     val state = rememberDismissState(
-        confirmValueChange = { value ->
+        confirmStateChange = { value ->
             if (value == DismissValue.DismissedToStart) {
                 isRemoved = true
                 true
@@ -66,7 +65,7 @@ fun <T> SwipeToDeleteContainer(
             shrinkTowards = Alignment.Top
         ) + fadeOut()
     ) {
-        SwipeToDismiss(
+        androidx.compose.material.SwipeToDismiss(
             state = state,
             background = {
                 DeleteBackground(swipeDismissState = state)
@@ -77,7 +76,7 @@ fun <T> SwipeToDeleteContainer(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun DeleteBackground(
     swipeDismissState: DismissState