Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix material lifecycle issue #40

Merged
merged 5 commits into from
Jun 29, 2024
Merged

Fix material lifecycle issue #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72ae80d
Manually provide a lifecycle owner
yveskalume Jun 23, 2024
3fa2d89
update min compileSdk
yveskalume Jun 28, 2024
ec7aa94
update deps
yveskalume Jun 29, 2024
975bf45
fix java.lang.OutOfMemoryError
yveskalume Jun 29, 2024
316c2dc
fix not found LifecycleOwner
yveskalume Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down Expand Up @@ -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)
Expand All @@ -131,8 +132,6 @@ dependencies {

implementation(libs.lottie.compose)

implementation(libs.androidx.hilt.work)
kapt(libs.androidx.hilt.compiler)

implementation(libs.kotlinx.serialization.json)

Expand Down
Binary file modified app/release/app-release.aab
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions core/data-firebase/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,5 +56,5 @@ dependencies {
api(libs.firebase.crashlytics)

implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)
}
2 changes: 1 addition & 1 deletion core/data-preferences/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.data.preferences"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
2 changes: 1 addition & 1 deletion core/designsystem/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.designsystem"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
4 changes: 2 additions & 2 deletions ...nsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/components/LinkText.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
16 changes: 11 additions & 5 deletions core/designsystem/src/main/java/com/yveskalume/eventcademy/core/designsystem/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
// }
}
2 changes: 1 addition & 1 deletion core/domain/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.domain"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
2 changes: 1 addition & 1 deletion core/testing/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.testing"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
2 changes: 1 addition & 1 deletion core/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.ui"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
2 changes: 1 addition & 1 deletion core/util/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

android {
namespace = "com.yveskalume.eventcademy.core.util"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 24
Expand Down
6 changes: 3 additions & 3 deletions feature/auth/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
24 changes: 0 additions & 24 deletions ...h/src/androidTest/java/com/yveskalume/eventcademy/feature/auth/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions feature/bookmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
24 changes: 0 additions & 24 deletions ...c/androidTest/java/com/yveskalume/eventcademy/feature/bookmark/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions feature/createevent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -50,6 +50,6 @@ dependencies {
implementation(libs.material)

implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)
implementation(libs.hilt.navigation)
}
24 changes: 0 additions & 24 deletions ...ndroidTest/java/com/yveskalume/eventcademy/feature/createevent/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions feature/eventdetail/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
24 changes: 0 additions & 24 deletions ...ndroidTest/java/com/yveskalume/eventcademy/feature/eventdetail/ExampleInstrumentedTest.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions feature/home/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}
Loading
Loading