Merge pull request #7 from shinhyo/feature/multi-module

Feature/multiModule

Author: shinhyo

.github/workflows/Build.yaml

@@ -39,17 +39,17 @@ jobs:
       - name: Check lint
         run: ./gradlew lintDebug --stacktrace
 
-      - name: Build all build type and flavor permutations
-        run: ./gradlew assemble --stacktrace
+      #      - name: Build all build type and flavor permutations
+      #        run: ./gradlew assemble --stacktrace
 
       #      - name: Run local tests
       #        run: ./gradlew testDebug testProdDebug --stacktrace
 
-      - name: Upload build outputs (APKs)
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-outputs
-          path: app/build/outputs
+      #      - name: Upload build outputs (APKs)
+      #        uses: actions/upload-artifact@v3
+      #        with:
+      #          name: build-outputs
+      #          path: app/build/outputs
 
       - name: Upload build reports
         if: always()

README.md

@@ -1,7 +1,8 @@
 # Breaking Bad - Jetpack Compose
 <a href='https://developer.android.com'><img src='http://img.shields.io/badge/platform-android-green.svg'/></a>
-<a href = "https://developer.android.com/jetpack/androidx/versions/all-channel#march_24_2021"> <img src = "https://img.shields.io/badge/Jetpack%20Compose-1.2.1-brightgreen" /> </a>
-<a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"/></a>
+<a href="https://kotlinlang.org/docs/whatsnew1720.html"><img src = "https://shields.io/badge/kotlin-1.7.20-blue" /></a>
+<a href="https://developer.android.com/jetpack/androidx/releases/compose#versions"><img src = "https://img.shields.io/badge/jetpack%20compose-1.2.1-brightgreen" /></a>
+<a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/license-Apache%202.0-blue.svg"/></a>
 [![ktlint](https://img.shields.io/badge/code%20style-%E2%9D%A4-FF4081.svg)](https://ktlint.github.io/)
 
 <p >
@@ -20,7 +21,7 @@
     - Room - Create, store, and manage persistent data backed by a SQLite database.
     - ViewModel - Store and manage UI-related data in a lifecycle conscious.
     - App Startup - initialize components at app startup.
-- Clean Architecture
+- Clean Architecture (nowinandroid)
 - MVVM pattern
 - Kotlin Coroutines & Flows
 - Material Design
@@ -32,7 +33,7 @@
 - [Coil-Compose](https://coil-kt.github.io/coil/compose)
 - [Timber](https://github.com/JakeWharton/timber)
 
-## Multi Module (Clean Architecture)
+## Multi Module ([nowinandroid](https://github.com/android/nowinandroid))
 ![](project.dot.png)
 
 ### If you think this reposittory is useful, please press the star button at the top. ⭐️

app/build.gradle.kts

@@ -26,18 +26,15 @@ android {
 
 dependencies {
 
-    implementation(project(":presentation"))
-    implementation(project(":domain"))
-    implementation(project(":data"))
+    implementation(project(":core:designsystem"))
 
-    implementation(libs.material)
+    implementation(project(":feature:main"))
+    implementation(project(":feature:detail"))
 
+    implementation(libs.material)
     implementation(libs.androidx.startup)
-
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
     implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.hilt.navigation.compose)
 
     implementation(libs.timber)
-
 }

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-        android:name=".app.BrBaApp"
+        android:name=".app.BrBaApplication"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.BrBaCompose">
         <activity
-            android:name=".app.ui.MainActivity"
+            android:name=".app.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.BrBaCompose.NoActionBar">
             <intent-filter>

app/src/main/java/io/github/shinhyo/brba/app/BrBaApp.kt renamed to app/src/main/java/io/github/shinhyo/brba/app/BrBaApplication.kt

@@ -19,4 +19,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class BrBaApp : Application()
+class BrBaApplication : Application()

app/src/main/java/io/github/shinhyo/brba/app/ui/MainActivity.kt renamed to app/src/main/java/io/github/shinhyo/brba/app/MainActivity.kt

@@ -13,34 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.shinhyo.brba.app.ui
+package io.github.shinhyo.brba.app
 
 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 dagger.hilt.android.AndroidEntryPoint
-import io.github.shinhyo.brba.presentation.theme.BrBaComposeTheme
-import io.github.shinhyo.brba.presentation.ui.NavGraph
+import io.github.shinhyo.brba.app.ui.BrbaApp
+import io.github.shinhyo.brba.core.designsystem.theme.BrBaComposeTheme
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
+
         setContent {
-            ComposeApp {
-                NavGraph()
+            BrBaComposeTheme {
+                BrbaApp()
             }
         }
     }
 }
-
-@Composable
-fun ComposeApp(content: @Composable () -> Unit) {
-    BrBaComposeTheme {
-        content()
-    }
-}

app/src/main/java/io/github/shinhyo/brba/app/di/CoroutinesModule.kt

@@ -16,32 +16,25 @@
 package io.github.shinhyo.brba.app.di
 
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import io.github.shinhyo.brba.domain.di.DefaultDispatcher
-import io.github.shinhyo.brba.domain.di.IoDispatcher
-import io.github.shinhyo.brba.domain.di.MainDispatcher
-import io.github.shinhyo.brba.domain.di.MainImmediateDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
 
 @InstallIn(SingletonComponent::class)
 @Module
 internal object CoroutinesModule {
-    @DefaultDispatcher
-    @Provides
-    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
-
-    @IoDispatcher
-    @Provides
-    fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
-
-    @MainDispatcher
-    @Provides
-    fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
-
-    @MainImmediateDispatcher
-    @Provides
-    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+//    @DefaultDispatcher
+//    @Provides
+//    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+//
+//    @IoDispatcher
+//    @Provides
+//    fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+//
+//    @MainDispatcher
+//    @Provides
+//    fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+//
+//    @MainImmediateDispatcher
+//    @Provides
+//    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
 }

app/src/main/java/io/github/shinhyo/brba/app/navigation/BrbaNavHost.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 shinhyo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.github.shinhyo.brba.app.navigation
+
+import androidx.compose.runtime.Composable
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.rememberNavController
+import io.github.shinhyo.brba.feature.detail.navigaion.detailScreen
+import io.github.shinhyo.brba.feature.detail.navigaion.navigateToDetail
+import io.github.shinhyo.brba.feature.main.navigation.mainRoute
+import io.github.shinhyo.brba.feature.main.navigation.mainScreen
+
+@Composable
+fun BrbaNavHost(startDestination: String = mainRoute) {
+    val navController = rememberNavController()
+
+    NavHost(
+        navController = navController,
+        startDestination = startDestination
+    ) {
+        mainScreen { id ->
+            navController.navigateToDetail(id)
+        }
+        detailScreen()
+    }
+}

presentation/src/main/java/io/github/shinhyo/brba/presentation/utils/Ext.kt renamed to app/src/main/java/io/github/shinhyo/brba/app/ui/BrbaApp.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 shinhyo
+ * Copyright 2022 shinhyo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.shinhyo.brba.presentation.utils
+package io.github.shinhyo.brba.app.ui
 
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.toList
+import androidx.compose.runtime.Composable
+import io.github.shinhyo.brba.app.navigation.BrbaNavHost
 
-fun <T> Flow<T>.toListSingle(): Flow<List<T>> = flow {
-    emit(toList(mutableListOf()))
+@Composable
+fun BrbaApp() {
+    BrbaNavHost()
 }

app/src/main/java/io/github/shinhyo/brba/app/ui/BrbaAppState.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 shinhyo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.github.shinhyo.brba.app.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import kotlinx.coroutines.CoroutineScope
+
+@Composable
+fun rememberAppState(
+    coroutineScope: CoroutineScope = rememberCoroutineScope(),
+    navController: NavHostController = rememberNavController()
+) = remember(navController, coroutineScope) {
+    BrbaAppState(navController, coroutineScope)
+}
+
+@Stable
+class BrbaAppState(
+    val navController: NavHostController,
+    val coroutineScope: CoroutineScope,
+) {
+
+    fun onBackClick() {
+        navController.popBackStack()
+    }
+}