Setup da Kotzilla + Atualizando Compose

build-logic/src/main/java/Config.kt

@@ -9,7 +9,7 @@ object Config {
     const val compileSdkVersion = 35
     const val minSdkVersion = 28
     const val targetSdkVersion = 35
-    const val versionName = "1.0"
+    const val versionName = "1.2"
     const val versionCode = 1
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

build.gradle.kts

@@ -15,6 +15,7 @@ plugins {
     id("popcorngp-setup-plugin")
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
+    alias(libs.plugins.kotzilla) apply false
 }
 
 tasks.register("clean", Delete::class) {

composeApp/build.gradle.kts

@@ -6,13 +6,18 @@ plugins {
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.kotzilla)
 }
+
+kotzilla {
+    versionName = Config.versionName
+}
+
 kotlin {
     sourceSets {
         androidMain.dependencies {
             implementation(libs.koin.android)
             implementation(libs.lottie)
-            implementation(compose.preview)
             implementation(project.dependencies.platform(libs.firebase.bom))
             implementation(libs.firebase.analytics)
             implementation(libs.firebase.crashlytics)
@@ -31,14 +36,12 @@ kotlin {
             implementation(projects.coreLocalStorage)
             implementation(projects.coreBackgroundWork)
 
-            implementation(libs.navigation.compose)
-
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
+            implementation(libs.bundles.compose)
 
             implementation(libs.koin.core)
             api(libs.kmpnotifier)
+
+            implementation(libs.kotzilla.sdk.compose)
         }
     }
 }

composeApp/kotzilla.json

@@ -0,0 +1,11 @@
+{
+  "sdkVersion": "1.4.2",
+  "keys": [
+    {
+      "appId": "019cca1a-c2ae-79d5-bf91-20316edd8f11",
+      "applicationPackageName": "com.codandotv.streamplayerapp",
+      "keyId": "019cca1b-46f0-7cb9-aa50-9ed092ed11fe",
+      "apiKey": "ktz-sdk-_sEL6C-eAYe1KiqBm1mOv1BoKAOtOFpeK40ADc49LaA"
+    }
+  ]
+}

composeApp/src/androidMain/kotlin/com.codandotv.streamplayerapp/presentation/CustomApplication.kt

@@ -6,17 +6,20 @@ import com.codandotv.streamplayerapp.core_background_work.worker.WorkScheduler
 import com.codandotv.streamplayerapp.di.AppModule
 import com.mmk.kmpnotifier.notification.NotifierManager
 import com.mmk.kmpnotifier.notification.configuration.NotificationPlatformConfiguration
+import io.kotzilla.generated.monitoring
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 
 class CustomApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-       startKoin{
+        startKoin {
             androidContext(this@CustomApplication.applicationContext)
             modules(AppModule.list)
-       }
+
+            monitoring()
+        }
         WorkScheduler.scheduleSync(this)
         initializeNotification()
     }

composeApp/src/iosMain/kotlin/com.codandotv.streamplayerapp/di/KoinIosHelper.kt

@@ -1,6 +1,7 @@
 package com.codandotv.streamplayerapp.di
 
 import com.codandotv.streamplayerapp.presentation.components.LottieViewProvider
+import io.kotzilla.generated.monitoring
 import org.koin.core.context.startKoin
 import org.koin.dsl.module
 
@@ -12,6 +13,12 @@ class KoinIosHelper {
                     lottieViewProvider
                 }
             })
+
+            monitoring(
+                onConfig = {
+                    onConfig { useIosCrashReport = false }
+                }
+            )
         }
     }
 }

core-background-work/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_background_work/di/SyncModule.kt

@@ -4,7 +4,7 @@ import com.codandotv.streamplayerapp.core_background_work.SyncManager
 import org.koin.dsl.module
 
 object SyncModule {
-    val module = module {
+    val module = module(createdAtStart = true) {
         single { SyncManager(get()) }
     }
 }

core-camera-gallery/build.gradle.kts

@@ -10,16 +10,13 @@ kotlin {
     sourceSets {
         sourceSets {
             androidMain.dependencies {
-                implementation(compose.preview)
                 implementation(libs.activity.compose)
                 implementation(libs.bundles.camera)
             }
             commonMain.dependencies {
                 implementation(projects.coreShared)
                 implementation(projects.coreSharedUi)
-                implementation(compose.material3)
-                implementation(compose.ui)
-                implementation(compose.components.resources)
+                implementation(libs.bundles.compose)
             }
         }
     }

core-navigation/build.gradle.kts

@@ -8,10 +8,7 @@ plugins {
 kotlin {
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.navigation.compose)
-
-            implementation(compose.material3)
-            implementation(compose.components.resources)
+            implementation(libs.bundles.compose)
         }
     }
 }

core-networking/build.gradle.kts

@@ -34,9 +34,7 @@ kotlin {
             implementation(libs.ktor.client.content.negotiation)
             implementation(libs.ktor.client.logger)
             implementation(libs.ktor.client.auth)
-
-            implementation(compose.components.resources)
-            implementation(compose.runtime)
+            implementation(libs.bundles.compose)
         }
 
         androidMain.dependencies {

core-permission/build.gradle.kts

@@ -9,17 +9,12 @@ plugins {
 kotlin {
     sourceSets {
         sourceSets {
-            androidMain.dependencies {
-                implementation(compose.preview)
-            }
             commonMain.dependencies {
-                implementation(compose.material3)
-                implementation(compose.ui)
+                implementation(libs.bundles.compose)
                 implementation(libs.moko.permissions.core)
                 api(libs.moko.permissions.compose)
                 implementation(libs.moko.permissions.camera)
                 implementation(libs.moko.permissions.gallery)
-                implementation(compose.components.resources)
                 implementation(libs.koin.core)
             }
         }

core-shared-ui/build.gradle.kts

@@ -8,14 +8,10 @@ plugins {
 kotlin {
     sourceSets {
         androidMain.dependencies {
-            implementation(compose.preview)
             implementation(libs.ktor.client.okhttp)
         }
         commonMain.dependencies {
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-            implementation(libs.navigation.compose)
+            implementation(libs.bundles.compose)
             implementation(libs.coil)
             implementation(libs.coil.network.ktor3)
             implementation(libs.paging.compose)

core-shared-ui/src/commonMain/kotlin/com/codandotv/streamplayerapp/core_shared_ui/widget/YoutubePlayerComponentPlatform.kt

@@ -17,4 +17,4 @@ internal fun String.videoIdToEmbedHTML(): String {
     """.trimIndent()
 }
 
-internal const val CODANDOTV_DOMAIN = "https://www.youtube.com/@CodandoTV"
+internal const val CODANDOTV_DOMAIN = "https://com.codandotv.com/codandotv"

feature-detail/build.gradle.kts

@@ -8,9 +8,6 @@ plugins {
 
 kotlin {
     sourceSets {
-        androidMain.dependencies {
-            implementation(compose.preview)
-        }
         commonMain.dependencies {
             implementation(libs.koin.core)
             implementation(libs.koin.compose)
@@ -22,11 +19,7 @@ kotlin {
             implementation(projects.coreSharedUi)
             implementation(projects.coreLocalStorage)
 
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
-
-            implementation(libs.navigation.compose)
+            implementation(libs.bundles.compose)
 
             implementation(libs.ktor.client.content.serialization.json)
             implementation(libs.ktor.client.content.negotiation)

feature-detail/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_detail/presentation/navigation/DetailStreamNavigation.kt

@@ -24,7 +24,7 @@ fun NavGraphBuilder.detailStreamNavGraph(navController: NavHostController) {
         }
         DetailStreamScreen(
             viewModel = koinViewModel {
-                parametersOf(nav.arguments?.getString(ID) ?: DEFAULT_ID)
+                parametersOf(nav.savedStateHandle.get<String>(ID)?: DEFAULT_ID)
             },
             navController = navController,
             sharedHandlerPlatform = getKoin().get(),

feature-list-streams/build.gradle.kts

@@ -8,25 +8,16 @@ plugins {
 
 kotlin {
     sourceSets {
-        androidMain.dependencies {
-            implementation(compose.preview)
-        }
-
         commonMain.dependencies {
             implementation(projects.coreNetworking)
             implementation(projects.coreNavigation)
             implementation(projects.coreShared)
             implementation(projects.coreSharedUi)
             implementation(projects.coreLocalStorage)
 
-            implementation(compose.components.resources)
-            implementation(compose.material3)
-            implementation(compose.ui)
-
+            implementation(libs.bundles.compose)
             implementation(libs.paging.compose)
 
-            implementation(libs.navigation.compose)
-
             implementation(libs.ktor.client.content.serialization.json)
             implementation(libs.ktor.client.content.negotiation)
 

feature-list-streams/src/commonMain/kotlin/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/navigation/ListStreamsNavigation.kt

@@ -33,7 +33,7 @@ fun NavGraphBuilder.listStreamsNavGraph(navController: NavHostController) {
             onNavigateSearchScreen = {
                 navController.navigate(Routes.SEARCH)
             },
-            profilePicture = nav.arguments?.getString(PROFILE_ID) ?: DEFAULT_ID
+            profilePicture = nav.savedStateHandle.get<String>(PROFILE_ID) ?: DEFAULT_ID
         )
     }
 }

feature-news/build.gradle.kts

@@ -8,9 +8,6 @@ plugins {
 
 kotlin {
     sourceSets {
-        androidMain.dependencies {
-            implementation(compose.preview)
-        }
         commonMain.dependencies {
             implementation(libs.koin.core)
             implementation(libs.koin.compose)
@@ -22,12 +19,9 @@ kotlin {
             implementation(projects.coreCameraGallery)
             implementation(projects.coreSharedUi)
             implementation(projects.corePermission)
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
+            implementation(libs.bundles.compose)
 
             implementation(libs.kotlinx.coroutines.core)
-            implementation(libs.navigation.compose)
         }
         androidUnitTest.dependencies {
             implementation(libs.bundles.test)

feature-profile/build.gradle.kts

@@ -14,11 +14,7 @@ kotlin {
             implementation(projects.coreShared)
             implementation(projects.coreSharedUi)
 
-            implementation(libs.navigation.compose)
-
-            implementation(compose.material3)
-            implementation(compose.ui)
-            implementation(compose.components.resources)
+            implementation(libs.bundles.compose)
 
             implementation(libs.ktor.client.content.serialization.json)
             implementation(libs.ktor.client.content.negotiation)

feature-search/build.gradle.kts

@@ -8,10 +8,6 @@ plugins {
 
 kotlin {
     sourceSets {
-        androidMain.dependencies {
-            implementation(compose.preview)
-        }
-
         commonMain.dependencies {
             implementation(libs.paging.compose)
 
@@ -21,12 +17,7 @@ kotlin {
             implementation(projects.coreSharedUi)
             implementation(projects.coreLocalStorage)
 
-            implementation(compose.components.resources)
-            implementation(compose.material3)
-            implementation(compose.ui)
-
-
-            implementation(libs.navigation.compose)
+            implementation(libs.bundles.compose)
 
             implementation(libs.ktor.client.content.serialization.json)
             implementation(libs.ktor.client.content.negotiation)

gradle/libs.versions.toml

@@ -1,13 +1,22 @@
 [versions]
 kotlin = "2.3.10"
 android_gradle_plugin = "8.7.3"
-koin = "4.0.1"
+koin = "4.1.1"
 ksp = "2.3.5"
+kotzilla = "2.0.8"
+lifecycle-viewmodel-compose-version = "2.9.6"
 
 dokka = "1.9.10"
 detekt = "1.23.6"
-compose_plugin_multiplataform = "1.7.3"
-navigation-compose-version = "2.7.0-alpha07"
+compose_plugin_multiplataform = "1.10.0"
+compose_material3 = "1.9.0"
+compose_animation = "1.10.0"
+compose_resources = "1.10.0"
+compose_foundation = "1.10.0"
+compose_material_icons_extended = "1.7.3"
+compose_ui = "1.10.0"
+
+navigation-compose-version = "2.9.2"
 paging-compose = "3.3.0-alpha02-0.5.1"
 buildkonfig = "0.15.2"
 cameraCore = "1.4.2"
@@ -47,6 +56,7 @@ firebase-bom = "33.14.0"
 firebase-crashlytics = "3.0.3"
 
 [libraries]
+kotzilla-sdk-compose = { group = "io.kotzilla", name = "kotzilla-sdk-compose", version.ref = "kotzilla" }
 kotlin_gradle_plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 android_gradle_plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "android_gradle_plugin" }
 detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
@@ -129,6 +139,16 @@ popcorn_guineapig = { group = "io.github.codandotv", name = "popcornguineapig",
 work-runtime = { module = "androidx.work:work-runtime-ktx", version.ref = "work-runtime" }
 kmpnotifier = { module = "io.github.mirzemehdi:kmpnotifier", version.ref = "kmpnotifier" }
 
+# Compose
+compose_animation = { module = "org.jetbrains.compose.animation:animation", version.ref = "compose_animation" }
+compose_resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose_resources" }
+compose_foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose_foundation" }
+lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle-viewmodel-compose-version" }
+material-icons-extended = { module = "org.jetbrains.compose.material:material-icons-extended", version.ref = "compose_material_icons_extended" }
+material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose_material3" }
+compose_ui_tooling-preview = { module = "org.jetbrains.compose.ui:ui-tooling-preview", version.ref = "compose_ui" }
+compose_ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose_ui" }
+compose_ui-util = { module = "org.jetbrains.compose.ui:ui-util", version.ref = "compose_ui" }
 
 [bundles]
 test = ["junit", "mockk", "mockk_android", "viewmodel_test", "koin_test", "coroutines_test"]
@@ -139,8 +159,10 @@ camera = [
     "androidx-camera-lifecycle",
     "androidx-camera-view"
 ]
+compose = ["navigation-compose", "compose_animation", "compose_resources", "lifecycle-viewmodel-compose", "material-icons-extended", "compose_foundation", "material3", "compose_ui_tooling-preview", "compose_ui", "compose_ui-util"]
 
 [plugins]
+kotzilla = { id = "io.kotzilla.kotzilla-plugin", version.ref = "kotzilla" }
 android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
 android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }