Merge pull request #44 from stslex/dev

Dev

README.MD

@@ -1,5 +1,7 @@
 
-[![Android CI/CD](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml/badge.svg)](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml)
+[![Android CI/CD](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml/badge.svg)](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml) \
+[![Deploy beta Store](https://github.com/stslex/Notes/actions/workflows/android_deploy_beta.yml/badge.svg)](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml) \
+[![Deploy prod Store](https://github.com/stslex/Notes/actions/workflows/android_deploy_prod.yml/badge.svg)](https://github.com/stslex/Notes/actions/workflows/android_jobs.yml)
 
 https://stslex.github.io/Notes/
 

app/build.gradle.kts

@@ -1,19 +1,16 @@
-import java.io.FileInputStream
-import java.io.InputStreamReader
-import java.util.Properties
-
 plugins {
     id("notes.android.application")
     id("notes.android.application.compose")
 }
 
-android.namespace = "com.stslex93.notes"
-
 dependencies {
+    implementation(project(":core:core"))
     implementation(project(":core:ui"))
     implementation(project(":core:database"))
     implementation(project(":core:notes"))
     implementation(project(":core:navigation"))
     implementation(project(":feature:home"))
     implementation(project(":feature:edit"))
 }
+
+android.namespace = "com.stslex93.notes"

app/src/main/java/com/stslex93/notes/NoteApplication.kt

@@ -1,31 +1,25 @@
 package com.stslex93.notes
 
 import android.app.Application
-import com.stslex93.notes.core.database.coreDatabaseModule
-import com.stslex93.notes.core.notes.di.coreNotesModule
-import com.stslex93.notes.feature.edit.di.featureEditModule
-import com.stslex93.notes.feature.home.di.featureHomeModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
+import com.stslex93.notes.core.core.AppApi
+import com.stslex93.notes.core.core.ApplicationApi
+import com.stslex93.notes.di.app.AppComponent
+import com.stslex93.notes.di.app.DaggerAppComponent
 
-class NoteApplication : Application() {
+class NoteApplication : Application(), ApplicationApi {
 
-    override fun onCreate() {
-        setUpKoin()
-        super.onCreate()
+    private val appComponent: AppComponent by lazy {
+        DaggerAppComponent
+            .builder()
+            .context(this)
+            .build()
     }
 
-    private fun setUpKoin() {
-        startKoin {
-            androidLogger()
-            androidContext(this@NoteApplication)
-            modules(
-                coreDatabaseModule,
-                coreNotesModule,
-                featureEditModule,
-                featureHomeModule,
-            )
-        }
+    override val appApi: AppApi
+        get() = appComponent
+
+    override fun onCreate() {
+        appComponent.inject(this)
+        super.onCreate()
     }
 }

app/src/main/java/com/stslex93/notes/di/app/AppComponent.kt

@@ -0,0 +1,24 @@
+package com.stslex93.notes.di.app
+
+import android.content.Context
+import com.stslex93.notes.NoteApplication
+import com.stslex93.notes.core.core.AppApi
+import dagger.BindsInstance
+import dagger.Component
+import javax.inject.Singleton
+
+@Singleton
+@Component
+interface AppComponent : AppApi {
+
+    @Component.Builder
+    interface Builder {
+
+        @BindsInstance
+        fun context(context: Context): Builder
+
+        fun build(): AppComponent
+    }
+
+    fun inject(application: NoteApplication)
+}

app/src/main/java/com/stslex93/notes/di/main/MainComponent.kt

@@ -0,0 +1,27 @@
+package com.stslex93.notes.di.main
+
+import com.stslex93.notes.core.core.AppApi
+import com.stslex93.notes.core.ui.di.NavigationApi
+import dagger.Component
+
+@Component(dependencies = [MainDependencies::class])
+interface MainComponent {
+
+    @Component.Factory
+    interface Factory {
+        fun create(dependencies: MainDependencies): MainComponent
+    }
+
+    @Component(dependencies = [AppApi::class, NavigationApi::class])
+    interface MainDependenciesComponent : MainDependencies {
+
+        @Component.Factory
+        interface Factory {
+            fun create(
+                appApi: AppApi,
+                navigationApi: NavigationApi
+            ): MainDependenciesComponent
+        }
+    }
+}
+

app/src/main/java/com/stslex93/notes/di/main/MainComponentBuilder.kt

@@ -0,0 +1,32 @@
+package com.stslex93.notes.di.main
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import com.stslex93.notes.core.core.AppApi
+import com.stslex93.notes.core.core.appApi
+import com.stslex93.notes.core.ui.di.NavigationApi
+
+object MainComponentBuilder {
+
+    fun build(
+        appApi: AppApi,
+        navigationApi: NavigationApi
+    ): MainComponent = DaggerMainComponent
+        .factory()
+        .create(
+            DaggerMainComponent_MainDependenciesComponent.factory()
+                .create(
+                    appApi = appApi,
+                    navigationApi = navigationApi
+                )
+        )
+
+    @Composable
+    fun Build(navigationApi: NavigationApi) {
+        val context = LocalContext.current
+        build(
+            appApi = context.appApi,
+            navigationApi = navigationApi
+        )
+    }
+}

app/src/main/java/com/stslex93/notes/di/main/MainDependencies.kt

@@ -0,0 +1,8 @@
+package com.stslex93.notes.di.main
+
+import com.stslex93.notes.core.ui.di.Navigator
+
+interface MainDependencies {
+
+    val navigator: Navigator
+}

app/src/main/java/com/stslex93/notes/ui/AppInit.kt

@@ -19,7 +19,7 @@ fun AppInit(
 ) {
     val systemUiController = rememberSystemUiController()
     val isDarkTheme = isSystemInDarkTheme()
-    
+
     DisposableEffect(systemUiController, isDarkTheme) {
         systemUiController.setSystemBarsColor(
             color = Color.Transparent,

app/src/main/java/com/stslex93/notes/ui/MainActivity.kt

@@ -3,34 +3,34 @@ package com.stslex93.notes.ui
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.runtime.Composable
 import androidx.core.view.WindowCompat
-import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.stslex93.notes.core.navigation.di.moduleCoreNavigation
-import org.koin.androidx.compose.getKoin
+import com.stslex93.notes.core.navigation.di.NavigationComponentBuilder
+import com.stslex93.notes.core.ui.di.MainUiApi
+import com.stslex93.notes.core.ui.di.NavigationApi
+import com.stslex93.notes.core.ui.theme.AppTheme
+import com.stslex93.notes.di.main.MainComponentBuilder
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), MainUiApi {
+
+    private var _navigationApi: NavigationApi? = null
+    override val navigationApi: NavigationApi
+        get() = requireNotNull(_navigationApi)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
+            val navController = rememberNavController()
+            _navigationApi = NavigationComponentBuilder
+                .build(navController)
+                .also { api ->
+                    MainComponentBuilder.Build(api)
+                }
+
             AppTheme {
-                val navController = rememberNavController()
-                SetupComposeDependencies(navController)
                 AppInit(navController)
             }
         }
     }
-
-    @Composable
-    private fun SetupComposeDependencies(
-        navController: NavHostController
-    ) {
-        getKoin().loadModules(
-            listOf(moduleCoreNavigation(navController))
-        )
-    }
-}
+}

app/src/main/java/com/stslex93/notes/ui/NavigationHost.kt

@@ -4,7 +4,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
-import com.stslex93.notes.core.navigation.AppDestination
+import com.stslex93.notes.core.navigation.model.AppDestination
 import com.stslex93.notes.feature.edit.ui.init.editGraph
 import com.stslex93.notes.feature.home.ui.init.homeGraph
 

build-logic/dependencies/src/main/kotlin/AppVersion.kt

@@ -1,4 +1,4 @@
 object AppVersion {
-    const val VERSION_CODE = 12
-    const val VERSION_NAME = "1.12"
+    const val VERSION_CODE = 16
+    const val VERSION_NAME = "1.16"
 }

build-logic/dependencies/src/main/kotlin/com.stslex93.notes/AndroidCompose.kt

@@ -49,6 +49,9 @@ internal fun Project.configureAndroidCompose(
 
             val material = libs.findLibrary("material").get()
             add("implementation", material)
+
+            val lifecycle = libs.findBundle("lifecycle").get()
+            add("implementation", lifecycle)
         }
     }
 

build-logic/dependencies/src/main/kotlin/com.stslex93.notes/KotlinAndroid.kt

@@ -53,9 +53,11 @@ internal fun Project.configureKotlinAndroid(
         val immutableCollection = libs.findLibrary("kotlinx-collections-immutable").get()
         add("implementation", immutableCollection)
 
-        // TODO вынести
-        val koin = libs.findBundle("koin").get()
-        add("implementation", koin)
+        val dagger = libs.findLibrary("dagger-core").get()
+        add("implementation", dagger)
+
+        val daggerCompiler = libs.findLibrary("dagger-compiler").get()
+        add("ksp", daggerCompiler)
     }
 }
 

core/core/.gitignore

@@ -0,0 +1 @@
+/build

core/core/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+    id("notes.android.library")
+}
+
+android.namespace = "com.stslex93.notes.core.core"