Merge pull request #8 from stslex/dev

Dev

app/build.gradle.kts

@@ -4,9 +4,12 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":core:core"))
     implementation(project(":core:ui"))
+    implementation(project(":core:navigation"))
     implementation(project(":core:datastore"))
     implementation(project(":core:network"))
+    implementation(project(":core:user"))
     implementation(project(":feature:auth"))
     implementation(project(":feature:home"))
 }

app/src/main/java/com/stslex/aproselection/SelectApplication.kt

@@ -4,6 +4,7 @@ import android.app.Application
 import com.stslex.aproselection.controller.AuthController
 import com.stslex.aproselection.core.datastore.coreDataStoreModule
 import com.stslex.aproselection.core.network.di.ModuleCoreNetwork.moduleCoreNetwork
+import com.stslex.aproselection.core.user.di.moduleCoreUser
 import com.stslex.aproselection.di.appModule
 import com.stslex.aproselection.feature.auth.di.ModuleFeatureAuth.moduleFeatureAuth
 import com.stslex.aproselection.feature.home.di.moduleFeatureHome
@@ -33,6 +34,7 @@ class SelectApplication : Application() {
             modules(
                 appModule,
                 moduleCoreNetwork,
+                moduleCoreUser,
                 coreDataStoreModule,
                 moduleFeatureAuth,
                 moduleFeatureHome,

app/src/main/java/com/stslex/aproselection/controller/AuthControllerImpl.kt

@@ -2,7 +2,7 @@ package com.stslex.aproselection.controller
 
 import com.stslex.aproselection.core.datastore.AppDataStore
 import com.stslex.aproselection.core.network.client.NetworkClient
-import com.stslex.aproselection.core.ui.core.Logger
+import com.stslex.aproselection.core.core.Logger
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/stslex/aproselection/di/AppModule.kt

@@ -1,10 +1,7 @@
 package com.stslex.aproselection.di
 
-import androidx.navigation.NavHostController
 import com.stslex.aproselection.controller.AuthController
 import com.stslex.aproselection.controller.AuthControllerImpl
-import com.stslex.aproselection.core.ui.navigation.navigator.Navigator
-import com.stslex.aproselection.core.ui.navigation.navigator.NavigatorImpl
 import com.stslex.aproselection.ui.InitialAppViewModel
 import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.module.dsl.bind
@@ -15,9 +12,6 @@ val appModule = module {
     singleOf(::AuthControllerImpl) { bind<AuthController>() }
 }
 
-fun navigationModule(
-    navHostController: NavHostController
-) = module {
-    single<Navigator> { NavigatorImpl(navHostController) }
+val initialAppModule = module {
     viewModelOf(::InitialAppViewModel)
 }

app/src/main/java/com/stslex/aproselection/navigation/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.stslex.aproselection.core.ui.navigation.destination.AppDestination
+import com.stslex.aproselection.core.navigation.destination.AppDestination
 import com.stslex.aproselection.feature.auth.ui.navigation.authRouter
 import com.stslex.aproselection.feature.home.ui.navigation.homeRouter
 

app/src/main/java/com/stslex/aproselection/ui/InitialApp.kt

@@ -6,7 +6,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.navigation.NavHostController
-import com.stslex.aproselection.core.ui.navigation.destination.AppDestination
+import com.stslex.aproselection.core.navigation.destination.AppDestination
 import com.stslex.aproselection.navigation.NavigationHost
 import org.koin.androidx.compose.koinViewModel
 
@@ -23,7 +23,7 @@ fun InitialApp(
         viewModel.init()
     }
 
-    AppDestination
+    com.stslex.aproselection.core.navigation.destination.AppDestination
         .getStartDestination(isInitialAuth)
         ?.let { destination ->
             NavigationHost(

app/src/main/java/com/stslex/aproselection/ui/InitialAppViewModel.kt

@@ -2,9 +2,9 @@ package com.stslex.aproselection.ui
 
 import androidx.lifecycle.viewModelScope
 import com.stslex.aproselection.controller.AuthController
+import com.stslex.aproselection.core.navigation.destination.NavigationScreen
+import com.stslex.aproselection.core.navigation.navigator.Navigator
 import com.stslex.aproselection.core.ui.base.BaseViewModel
-import com.stslex.aproselection.core.ui.navigation.destination.NavigationScreen
-import com.stslex.aproselection.core.ui.navigation.navigator.Navigator
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow

app/src/main/java/com/stslex/aproselection/ui/MainActivity.kt

@@ -6,8 +6,9 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
+import com.stslex.aproselection.core.navigation.di.moduleCoreNavigation
 import com.stslex.aproselection.core.ui.theme.AppTheme
-import com.stslex.aproselection.di.navigationModule
+import com.stslex.aproselection.di.initialAppModule
 import org.koin.androidx.compose.getKoin
 
 class MainActivity : ComponentActivity() {
@@ -30,9 +31,11 @@ class MainActivity : ComponentActivity() {
     private fun SetupComposeDependencies(
         navController: NavHostController
     ) {
-        val navModule = navigationModule(navController)
         getKoin().loadModules(
-            listOf(navModule)
+            listOf(
+                moduleCoreNavigation(navController),
+                initialAppModule
+            )
         )
     }
 }

app/src/test/java/com/stslex/aproselection/DiKoinModuleTest.kt

@@ -3,7 +3,7 @@ package com.stslex.aproselection
 import android.content.Context
 import com.stslex.aproselection.core.datastore.coreDataStoreModule
 import com.stslex.aproselection.core.network.di.ModuleCoreNetwork.moduleCoreNetwork
-import com.stslex.aproselection.core.ui.navigation.destination.NavigationScreen
+import com.stslex.aproselection.core.navigation.destination.NavigationScreen
 import com.stslex.aproselection.di.appModule
 import com.stslex.aproselection.feature.auth.di.ModuleFeatureAuth.moduleFeatureAuth
 import com.stslex.aproselection.feature.home.di.moduleFeatureHome
@@ -19,7 +19,7 @@ class DiKoinModuleTest : KoinTest {
 
     @Test
     fun checkKoinModules() {
-        val navigator: (screen: NavigationScreen) -> Unit = {}
+        val navigator: (screen: com.stslex.aproselection.core.navigation.destination.NavigationScreen) -> Unit = {}
 
         koinApplication {
 

build-logic/dependencies/src/main/kotlin/com.stslex.aproselection/ComposeAndroid.kt

@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 

build-logic/dependencies/src/main/kotlin/com.stslex.aproselection/KotlinAndroid.kt

@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *>,
 ) {
     commonExtension.apply {
 
@@ -64,7 +64,7 @@ internal fun Project.configureKotlinAndroid(
     }
 }
 
-private fun CommonExtension<*, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+private fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }
 

core/core/.gitignore

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

core/core/build.gradle.kts

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

core/core/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/core/src/androidTest/java/com/stslex/aproselection/core/core/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.stslex.aproselection.core.core
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.stslex.aproselection.core.core.test", appContext.packageName)
+    }
+}

core/core/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

core/ui/src/main/java/com/stslex/aproselection/core/ui/core/Logger.kt → core/core/src/main/java/com/stslex/aproselection/core/core/Logger.kt

@@ -1,4 +1,4 @@
-package com.stslex.aproselection.core.ui.core
+package com.stslex.aproselection.core.core
 
 import android.util.Log
 
@@ -18,4 +18,12 @@ object Logger {
             throwable,
         )
     }
+
+    fun debug(
+        message: String,
+        tag: String? = null,
+    ) {
+        val currentTag = "$DEFAULT_TAG:${tag.orEmpty()}"
+        Log.d(currentTag, message)
+    }
 }

core/core/src/test/java/com/stslex/aproselection/core/core/ExampleUnitTest.kt

@@ -0,0 +1,17 @@
+package com.stslex.aproselection.core.core
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

core/datastore/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 android.namespace = "com.stslex.aproselection.core.datastore"
 
 dependencies {
+    implementation(project(":core:core"))
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.datastore)
 }

core/datastore/src/main/java/com/stslex/aproselection/core/datastore/AppDataStore.kt

@@ -10,4 +10,6 @@ interface AppDataStore {
     suspend fun setUuid(uuid: String)
 
     suspend fun setToken(token: String)
+
+    suspend fun clear()
 }

core/datastore/src/main/java/com/stslex/aproselection/core/datastore/AppDataStoreImpl.kt

@@ -50,4 +50,9 @@ class AppDataStoreImpl(
             }
         }
     }
+
+    override suspend fun clear() {
+        setUuid("")
+        setToken("")
+    }
 }

core/navigation/.gitignore

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

core/navigation/build.gradle.kts

@@ -0,0 +1,9 @@
+plugins {
+    id("aproselection.android.library")
+}
+
+android.namespace = "com.stslex.aproselection.core.navigation"
+
+dependencies {
+    implementation(project(":core:core"))
+}

core/navigation/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/navigation/src/androidTest/java/com/stslex/aproselection/core/navigation/ExampleInstrumentedTest.kt

@@ -0,0 +1,24 @@
+package com.stslex.aproselection.core.navigation
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.stslex.aproselection.core.navigation.test", appContext.packageName)
+    }
+}

core/navigation/src/main/AndroidManifest.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>

core/ui/src/main/java/com/stslex/aproselection/core/ui/navigation/destination/AppArguments.kt → core/navigation/src/main/java/com/stslex/aproselection/core/navigation/destination/AppArguments.kt

@@ -1,4 +1,4 @@
-package com.stslex.aproselection.core.ui.navigation.destination
+package com.stslex.aproselection.core.navigation.destination
 
 sealed class AppArguments {
 

core/ui/src/main/java/com/stslex/aproselection/core/ui/navigation/destination/AppDestination.kt → core/navigation/src/main/java/com/stslex/aproselection/core/navigation/destination/AppDestination.kt

@@ -1,4 +1,4 @@
-package com.stslex.aproselection.core.ui.navigation.destination
+package com.stslex.aproselection.core.navigation.destination
 
 enum class AppDestination(
     vararg val argsNames: String

core/ui/src/main/java/com/stslex/aproselection/core/ui/navigation/destination/NavigationScreen.kt → core/navigation/src/main/java/com/stslex/aproselection/core/navigation/destination/NavigationScreen.kt

@@ -1,4 +1,4 @@
-package com.stslex.aproselection.core.ui.navigation.destination
+package com.stslex.aproselection.core.navigation.destination
 
 sealed interface NavigationScreen {