Merge pull request #59 from zouhir96/develop

release 2.0.0

Author: zouhir96

app/build.gradle.kts

@@ -4,6 +4,8 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.android.kotlin)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.crashlytics)
 }
 
 android {
@@ -34,6 +36,12 @@ android {
                 "proguard-rules.pro"
             )
         }
+
+        debug {
+            isMinifyEnabled = false
+            isShrinkResources = false
+            applicationIdSuffix = ".debug"
+        }
     }
 
     compileOptions {
@@ -58,21 +66,24 @@ android {
 dependencies {
     implementation(project(":shared"))
 
+    implementation(project(":core:domain"))
     implementation(project(":feature:home"))
     implementation(project(":feature:settings"))
-    implementation(project(":core:network"))
 
     // Activity
     implementation(libs.androidx.core.splashscreen)
     implementation(libs.androidx.activity)
 
     implementation(libs.androidx.compose.materialWindow)
 
+    implementation(project.dependencies.platform(libs.koin.bom))
     implementation(libs.koin.core)
 
-    implementation(platform(libs.com.google.firebase.bom))
-    implementation(libs.com.google.firebase.analytics)
-    implementation(libs.com.google.firebase.crashlytics)
+    implementation(platform(libs.firebase.bom))
+    implementation(libs.firebase.analytics)
+    implementation(libs.firebase.crashlytics)
+
+    implementation(libs.napier)
 }
 
 tasks.withType<Test> {

app/google-services.json

@@ -23,6 +23,25 @@
           "other_platform_oauth_client": []
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:249160525821:android:c3b3d66c5e8efc1a42db94",
+        "android_client_info": {
+          "package_name": "com.zrcoding.hackertab.debug"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBPyndiwOCpTcfo9ErZTWxyKVQoe3eJ58E"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
     }
   ],
   "configuration_version": "1"

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">HT.debug</string>
+</resources>

app/src/main/kotlin/com/zrcoding/hackertab/Hackertab.kt

@@ -2,8 +2,11 @@ package com.zrcoding.hackertab
 
 import android.app.Application
 import android.content.Context
-import com.zrcoding.hackertab.settings.presentation.common.AppConfig
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.zrcoding.hackertab.domain.common.AppConfig
 import com.zrcoding.hackertab.shared.di.initKoin
+import io.github.aakira.napier.DebugAntilog
+import io.github.aakira.napier.Napier
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.bind
 import org.koin.dsl.module
@@ -18,10 +21,15 @@ class Hackertab : Application() {
                 singleOf(::AppConfigImpl) bind AppConfig::class
             },
         )
+        Napier.base(DebugAntilog())
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG)
     }
 }
 
 class AppConfigImpl: AppConfig {
     override val versionName: String
         get() = BuildConfig.VERSION_NAME
+
+    override val isDebug: Boolean
+        get() = BuildConfig.DEBUG
 }

app/src/main/kotlin/com/zrcoding/hackertab/MainActivity.kt

@@ -1,26 +1,32 @@
 package com.zrcoding.hackertab
 
+import android.app.Activity
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.activity.enableEdgeToEdge
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
 import com.zrcoding.hackertab.shared.HackertabKmpApp
+import org.koin.core.context.loadKoinModules
+import org.koin.dsl.module
 
 class MainActivity : ComponentActivity() {
 
-    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
-        WindowCompat.setDecorFitsSystemWindows(window, false)
+
+        loadKoinModules(
+            module {
+                // We add Activity to DI because there are places
+                // where we need to show AlertDialogs in androidMain like [AndroidAccountMasterScreenIntentsTrigger]
+                single<Activity> { this@MainActivity }
+            }
+        )
 
         setContent {
-            val widthSizeClass = calculateWindowSizeClass(this).widthSizeClass
-            HackertabKmpApp(widthSizeClass == WindowWidthSizeClass.Expanded)
+            HackertabKmpApp()
         }
     }
 }

build-logic/convention/build.gradle.kts

@@ -1,3 +1,4 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -12,8 +13,8 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 

build-logic/convention/src/main/kotlin/ComposeMultiplatformConventionPlugin.kt

@@ -25,8 +25,11 @@ class ComposeMultiplatformConventionPlugin : Plugin<Project> {
                 implementation(composeDeps.materialIconsExtended)
 
                 implementation(versionCatalog().findLibrary("kamel-image").get())
-                implementation(versionCatalog().findLibrary("moko-mvvm-core").get())
-                implementation(versionCatalog().findLibrary("moko-mvvm-compose").get())
+                implementation(versionCatalog().findLibrary("kamel-animated").get())
+                implementation(versionCatalog().findLibrary("kamel-bitmap").get())
+                implementation(versionCatalog().findLibrary("androidx-viewmodel").get())
+                implementation(versionCatalog().findLibrary("androidx-navigation").get())
+                implementation(versionCatalog().findLibrary("kotlinx.collections.immutable").get())
             }
         }
     }

build-logic/convention/src/main/kotlin/KotlinMultiplatformFeatureConventionPlugin.kt

@@ -15,10 +15,11 @@ class KotlinMultiplatformFeatureConventionPlugin : Plugin<Project> {
                 sourceSets.commonMain.dependencies {
                     implementation(project(":core:design"))
                     implementation(project(":core:domain"))
-                    implementation(project(":core:network"))
-                    implementation(project(":core:di"))
+                    implementation(project(":core:analytics"))
 
+                    implementation(project.dependencies.platform(versionCatalog().findLibrary("koin.bom").get()))
                     implementation(versionCatalog().findLibrary("koin.compose").get())
+                    implementation(versionCatalog().findLibrary("koin.compose.viewmodel").get())
                 }
             }
         }

build-logic/convention/src/main/kotlin/KotlinMultiplatformLibraryConventionPlugin.kt

@@ -12,6 +12,7 @@ class KotlinMultiplatformLibraryConventionPlugin : Plugin<Project> {
             with(pluginManager) {
                 apply(versionCatalog().findPlugin("kotlin-multiplatform").get().get().pluginId)
                 apply(versionCatalog().findPlugin("android-library").get().get().pluginId)
+                apply(versionCatalog().findPlugin("jetbrains-kotlinx-serialization").get().get().pluginId)
             }
             extensions.configure(
                 KotlinMultiplatformExtension::class.java,

build-logic/convention/src/main/kotlin/com/zrcoding/convention/KmpExtensions.kt

@@ -15,6 +15,8 @@ fun KotlinMultiplatformExtension.setFrameworkBaseName(name: String) {
     ).forEach {
         it.binaries.framework {
             baseName = name
+            isStatic = true
+            binaryOption("bundleId", "com.zrcoding.$name")
         }
     }
 }