Merge pull request #40 from yveskalume/fix-material-lifecycle-issue

Fix material lifecycle issue
yveskalume · Jun 29, 2024 · 11a874d · 11a874d
2 parents 06c5d3a + 316c2dc
commit 11a874d
Show file tree

Hide file tree

Showing 26 changed files with 53 additions and 217 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,7 +4,6 @@ import java.util.Properties
 plugins {
     alias(libs.plugins.com.android.application)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
     alias(libs.plugins.com.google.devtools.ksp)
     alias(libs.plugins.com.google.dagger.hilt.android)
     alias(libs.plugins.com.google.gms.google.services)
@@ -25,8 +24,8 @@ android {
         applicationId = "com.yveskalume.eventcademy"
         minSdk = 24
         targetSdk = 34
-        versionCode = 11
-        versionName = "1.6"
+        versionCode = 12
+        versionName = "1.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -108,7 +107,9 @@ dependencies {
     implementation(libs.material.icon.exented)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
+    implementation(libs.androidx.hilt.work)
+    ksp(libs.androidx.hilt.compiler)
     implementation(libs.hilt.navigation)
 
     implementation(libs.google.playservices.auth)
@@ -131,8 +132,6 @@ dependencies {
 
     implementation(libs.lottie.compose)
 
-    implementation(libs.androidx.hilt.work)
-    kapt(libs.androidx.hilt.compiler)
 
     implementation(libs.kotlinx.serialization.json)
 

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/core/data-firebase/build.gradle.kts b/core/data-firebase/build.gradle.kts
@@ -2,14 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
     alias(libs.plugins.com.google.devtools.ksp)
     alias(libs.plugins.com.google.dagger.hilt.android)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.core.data.firebase"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -57,5 +56,5 @@ dependencies {
     api(libs.firebase.crashlytics)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
 }
diff --git a/core/data-preferences/build.gradle.kts b/core/data-preferences/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.data.preferences"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.designsystem"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/...nsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/components/LinkText.kt b/...nsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/components/LinkText.kt
@@ -92,15 +92,15 @@ fun LinkedText(
                 layoutResult?.getOffsetForPosition(pos)?.let { offset ->
                     annotations.firstOrNull { it.start <= offset && it.end >= offset }
                         ?.item
-                        ?.let { url -> onClick(url) }
+                        ?.let { url -> onClick(url.toString()) }
                 }
             }
         )
     }
     val actionSemantics = Modifier.semantics {
         onClickLink { index ->
             annotations.getOrNull(index)?.let {
-                onClick(it.item)
+                onClick(it.item.toString())
             }
             true
         }

diff --git a/core/designsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/theme/Theme.kt
@@ -9,6 +9,7 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
@@ -62,9 +63,14 @@ fun EventCademyTheme(
         }
     }
 
-    MaterialTheme(
-        colorScheme = colorScheme,
-        typography = Typography,
-        content = content
-    )
+
+//    CompositionLocalProvider(
+//        androidx.lifecycle.compose.LocalLifecycleOwner provides androidx.compose.ui.platform.LocalLifecycleOwner.current,
+//    ) {
+        MaterialTheme(
+            colorScheme = colorScheme,
+            typography = Typography,
+            content = content
+        )
+//    }
 }
diff --git a/core/domain/build.gradle.kts b/core/domain/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.domain"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/core/testing/build.gradle.kts b/core/testing/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.testing"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.ui"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/core/util/build.gradle.kts b/core/util/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "com.yveskalume.eventcademy.core.util"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24

diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts
@@ -2,13 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
+    alias(libs.plugins.com.google.devtools.ksp)
     alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.feature.auth"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -49,7 +49,7 @@ dependencies {
     androidTestImplementation(libs.espresso.core)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation)
 
     implementation(libs.firebase.auth)

diff --git a/...h/src/androidTest/java/com/yveskalume/eventcademy/feature/auth/ExampleInstrumentedTest.kt b/...h/src/androidTest/java/com/yveskalume/eventcademy/feature/auth/ExampleInstrumentedTest.kt
diff --git a/feature/bookmark/build.gradle.kts b/feature/bookmark/build.gradle.kts
@@ -2,13 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.com.google.devtools.ksp)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.feature.bookmark"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -48,6 +48,6 @@ dependencies {
     implementation(libs.core.ktx)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation)
 }
diff --git a/...c/androidTest/java/com/yveskalume/eventcademy/feature/bookmark/ExampleInstrumentedTest.kt b/...c/androidTest/java/com/yveskalume/eventcademy/feature/bookmark/ExampleInstrumentedTest.kt
diff --git a/feature/createevent/build.gradle.kts b/feature/createevent/build.gradle.kts
@@ -2,13 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
+    alias(libs.plugins.com.google.devtools.ksp)
     alias(libs.plugins.compose.compiler)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.feature.createevent"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -50,6 +50,6 @@ dependencies {
     implementation(libs.material)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation)
 }
diff --git a/...ndroidTest/java/com/yveskalume/eventcademy/feature/createevent/ExampleInstrumentedTest.kt b/...ndroidTest/java/com/yveskalume/eventcademy/feature/createevent/ExampleInstrumentedTest.kt
diff --git a/feature/eventdetail/build.gradle.kts b/feature/eventdetail/build.gradle.kts
@@ -2,13 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.com.google.devtools.ksp)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.feature.eventdetail"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -53,6 +53,6 @@ dependencies {
     androidTestImplementation(libs.espresso.core)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation)
 }
diff --git a/...ndroidTest/java/com/yveskalume/eventcademy/feature/eventdetail/ExampleInstrumentedTest.kt b/...ndroidTest/java/com/yveskalume/eventcademy/feature/eventdetail/ExampleInstrumentedTest.kt
diff --git a/feature/home/build.gradle.kts b/feature/home/build.gradle.kts
@@ -2,13 +2,13 @@
 plugins {
     alias(libs.plugins.com.android.library)
     alias(libs.plugins.org.jetbrains.kotlin.android)
-    kotlin("kapt")
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.com.google.devtools.ksp)
 }
 
 android {
     namespace = "com.yveskalume.eventcademy.feature.home"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 24
@@ -53,6 +53,6 @@ dependencies {
     androidTestImplementation(libs.espresso.core)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    ksp(libs.hilt.compiler)
     implementation(libs.hilt.navigation)
 }