From 181204a51eba66781db002ddcaf7bdc9cd6d7696 Mon Sep 17 00:00:00 2001 From: John O'Reilly Date: Sun, 15 Dec 2024 09:45:16 +0000 Subject: [PATCH] cleanup --- androidApp/build.gradle.kts | 4 ---- .../confetti/ui/SystemUiController.kt | 22 ------------------- .../java/dev/johnoreilly/confetti/ui/Theme.kt | 2 -- build-logic/build.gradle.kts | 1 - gradle/libs.versions.toml | 8 ------- wearApp/build.gradle.kts | 2 -- 6 files changed, 39 deletions(-) delete mode 100644 androidApp/src/main/java/dev/johnoreilly/confetti/ui/SystemUiController.kt diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 87d6b9b60..3ec9b7acc 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -174,8 +174,6 @@ dependencies { implementation(libs.material3.core) implementation(libs.splash.screen) - implementation(libs.accompanist.adaptive) - implementation(libs.accompanist.systemuicontroller) implementation(libs.koin.core) implementation(libs.koin.android) implementation(libs.koin.compose) @@ -184,8 +182,6 @@ dependencies { implementation(libs.horologist.datalayer) implementation(libs.horologist.datalayer.phone) - implementation(libs.kmm.viewmodel) - val excludeCrashlyticsConflicts = Action { // Crashlytics and PerfMon depend on datastore v1.0 but we're using v1.1 exclude(group = "androidx.datastore", module = "datastore-preferences") diff --git a/androidApp/src/main/java/dev/johnoreilly/confetti/ui/SystemUiController.kt b/androidApp/src/main/java/dev/johnoreilly/confetti/ui/SystemUiController.kt deleted file mode 100644 index 3f0b3fb69..000000000 --- a/androidApp/src/main/java/dev/johnoreilly/confetti/ui/SystemUiController.kt +++ /dev/null @@ -1,22 +0,0 @@ -package dev.johnoreilly.confetti.ui - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.DisposableEffect -import androidx.compose.ui.graphics.Color -import com.google.accompanist.systemuicontroller.SystemUiController -import com.google.accompanist.systemuicontroller.rememberSystemUiController - -@Composable -fun SystemBarsColorEffect( - systemUiController: SystemUiController = rememberSystemUiController(), - color: Color = Color.Transparent, - isSystemInDarkTheme: Boolean, -) { - DisposableEffect(systemUiController, color, isSystemInDarkTheme) { - systemUiController.setSystemBarsColor( - color = color, - darkIcons = !isSystemInDarkTheme, - ) - onDispose {} - } -} diff --git a/androidApp/src/main/java/dev/johnoreilly/confetti/ui/Theme.kt b/androidApp/src/main/java/dev/johnoreilly/confetti/ui/Theme.kt index 8d212ca41..903d638e7 100644 --- a/androidApp/src/main/java/dev/johnoreilly/confetti/ui/Theme.kt +++ b/androidApp/src/main/java/dev/johnoreilly/confetti/ui/Theme.kt @@ -168,8 +168,6 @@ fun ConfettiTheme( disableDynamicTheming: Boolean = false, content: @Composable () -> Unit ) { - SystemBarsColorEffect(isSystemInDarkTheme = darkTheme) - val (colorScheme, backgroundTheme) = mobileThemes(androidTheme, darkTheme, disableDynamicTheming) CompositionLocalProvider( diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index a42704e9c..1befcb45c 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { implementation(libs.plugin.apollo) implementation(libs.apollo.execution.gradle.plugin) implementation(libs.plugin.ksp) - implementation(libs.plugin.kmp.nativecoroutines) implementation(libs.plugin.kotlin.serialization) implementation(libs.plugin.kotlin.spring) implementation(libs.plugin.spring.boot) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a271f4881..b13507ad3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,6 @@ kotlinx-datetime = "0.6.1" apollo-kotlin-execution = "0.1.1-SNAPSHOT-3e89cc694ab96bae7b4c1b7b6394c211065551c1" agp = "8.7.3" -accompanist = "0.36.0" activity-compose = "1.9.3" androidx-lifecycle = "2.8.7" androidx-datastore = "1.1.1" @@ -27,8 +26,6 @@ horologist = "0.7.7-alpha" io-coil-kt = "2.7.0" io-coil3-kt = "3.0.4" kermit = "2.0.5" -kmp-nativecoroutines = "1.0.0-ALPHA-37" -kmm-viewmodel = "1.0.0-ALPHA-21" kmmbridge = "0.5.7" koin-android = "4.0.0" koin-android-compose = "4.0.0" @@ -54,9 +51,6 @@ screenshot = "0.0.1-alpha08" [libraries] -accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist-testharness = { module = "com.google.accompanist:accompanist-testharness", version.ref = "accompanist" } activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" } androidx-benchmarkmacro = "androidx.benchmark:benchmark-macro-junit4:1.3.3" androidx-complications-rendering = "androidx.wear.watchface:watchface-complications-rendering:1.2.1" @@ -157,7 +151,6 @@ koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin-core" } koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin-core" } koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin-core" } kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" } -kmm-viewmodel = { module = "com.rickclephas.kmm:kmm-viewmodel-core", version.ref = "kmm-viewmodel" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" } kotlinx-coroutines-play-services = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services", version.ref = "kotlinx-coroutines-play-services" } @@ -186,7 +179,6 @@ plugin-android-application = { module = "com.android.tools.build:gradle", versio plugin-apollo = { module = "com.apollographql.apollo:apollo-gradle-plugin", version.ref = "apollo" } plugin-firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-gradle", version = "2.9.9" } plugin-google-services = "com.google.gms:google-services:4.4.2" -plugin-kmp-nativecoroutines = { module = "com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin", version.ref = "kmp-nativecoroutines" } plugin-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } plugin-kotlin-spring = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" } plugin-ksp = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" } diff --git a/wearApp/build.gradle.kts b/wearApp/build.gradle.kts index 01ebd1d75..075935331 100644 --- a/wearApp/build.gradle.kts +++ b/wearApp/build.gradle.kts @@ -168,7 +168,6 @@ dependencies { implementation(libs.koin.compose) implementation(libs.koin.workmanager) - implementation(libs.kmm.viewmodel) implementation(libs.androidx.work.runtime.ktx) implementation(libs.koin.android) implementation(libs.androidx.lifecycle.livedata.ktx) @@ -234,7 +233,6 @@ dependencies { testImplementation(libs.compose.ui.test.junit4) testImplementation(libs.koin.test) testImplementation(libs.koin.test.junit4) - testImplementation(libs.accompanist.testharness) testImplementation(libs.androidx.work.testing) testImplementation(libs.androidx.complications.rendering) testImplementation(libs.horologist.compose.tools)