chore(catalog): create a separate catalog and plyalist feature modules

mcatta · Oct 14, 2023 · b346b51 · b346b51
1 parent 056ba3f
commit b346b51
Show file tree

Hide file tree

Showing 29 changed files with 238 additions and 70 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -52,6 +52,7 @@ dependencies {
 
     implementation(project(":domain"))
     implementation(project(":data"))
+    implementation(project(":features:catalog:presentation"))
     implementation(project(":features:player:presentation"))
     implementation(project(":core:design"))
     implementation(project(":core:di"))
@@ -60,11 +61,8 @@ dependencies {
 
     implementation libs.bundles.androidx
     implementation libs.bundles.compose
-    implementation libs.compose.accompanist.swipeToRefresh
-
     implementation libs.polpetta
 
-    implementation libs.arrow
     implementation libs.timber
 
     implementation libs.firebase.analytics
@@ -74,8 +72,6 @@ dependencies {
     implementation libs.hilt.android
 
     testImplementation project(":core:testing")
-    testImplementation libs.mockk.core
-    testImplementation libs.roboeletric
 
     androidTestImplementation libs.androidx.junit
     androidTestImplementation libs.compose.test.uiJunit4

diff --git a/app/src/main/java/dev/marcocattaneo/sleep/ui/SleepApp.kt b/app/src/main/java/dev/marcocattaneo/sleep/ui/SleepApp.kt
@@ -24,11 +24,11 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.rememberNavController
 import dev.marcocattaneo.core.design.theme.SleepTheme
-import dev.marcocattaneo.sleep.ui.screen.Routes
+import dev.marcocattaneo.sleep.catalog.presentation.Routes
 import dev.marcocattaneo.sleep.player.presentation.screen.PlayerAction
 import dev.marcocattaneo.sleep.player.presentation.screen.PlayerScreen
 import dev.marcocattaneo.sleep.player.presentation.screen.PlayerViewModel
-import dev.marcocattaneo.sleep.ui.screen.home.registerCatalogScreen
+import dev.marcocattaneo.sleep.catalog.presentation.screen.registerCatalogScreen
 
 @Composable
 fun SleepApp() {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -16,7 +16,4 @@
 
 <resources>
     <string name="app_name">Sleepify</string>
-    <string name="home_header">Sleep tracks</string>
-    <string name="home_header_claim">The sound of silence</string>
-    <string name="home_info_banner">Welcome, to start the listening tap on the track below. If you want you can set an auto-stop after a set of minutes.</string>
 </resources>
diff --git a/core/navigation/build.gradle b/core/navigation/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     alias libs.plugins.sleep.android.library
+    alias libs.plugins.sleep.android.compose
     alias libs.plugins.sleep.detekt
 }
 
@@ -10,4 +11,7 @@ android {
 dependencies {
     implementation(platform(libs.bom.compose))
     implementation libs.bundles.compose
+
+    api libs.compose.navigation
+    api libs.compose.navigationHilt
 }
diff --git a/core/navigation/src/main/java/dev/marcocattaneo/navigation/NavigationComponent.kt b/core/navigation/src/main/java/dev/marcocattaneo/navigation/NavigationComponent.kt
@@ -22,6 +22,7 @@ import androidx.lifecycle.ViewModel
 import androidx.navigation.*
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import dev.marcocattaneo.navigation.routing.ScreenRoute
 
 /**
  * Navigation Component used for the routing
@@ -30,7 +31,7 @@ import androidx.navigation.compose.composable
  */
 @Composable
 fun NavigationComponent(
-    startRoute: dev.marcocattaneo.navigation.routing.ScreenRoute,
+    startRoute: ScreenRoute,
     navHostController: NavHostController,
     builder: NavGraphBuilder.() -> Unit
 ) {
@@ -47,7 +48,7 @@ fun NavigationComponent(
  * @param content content associated to the route
  */
 inline fun <reified VM : ViewModel> NavGraphBuilder.composable(
-    route: dev.marcocattaneo.navigation.routing.ScreenRoute,
+    route: ScreenRoute,
     crossinline content: @Composable (NavBackStackEntry, VM) -> Unit
 ) {
     this.composable(

diff --git a/features/catalog/presentation/build.gradle b/features/catalog/presentation/build.gradle
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2022 Marco Cattaneo
+ *
+ * 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
+ *
+ *      http://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.
+ */
+
+plugins {
+    alias libs.plugins.sleep.android.library
+    alias libs.plugins.sleep.android.compose
+    alias libs.plugins.sleep.jacoco
+    alias libs.plugins.sleep.detekt
+}
+
+android {
+    namespace 'dev.marcocattaneo.sleep.catalog.presentation'
+}
+
+dependencies {
+    implementation platform(libs.bom.compose)
+
+    implementation project(":core:di")
+    implementation project(":core:design")
+    implementation project(":core:utils")
+    implementation(project(":core:navigation"))
+    implementation project(":data")
+    implementation project(":domain")
+    implementation project(":features:playlist:presentation")
+
+    implementation libs.bundles.androidx
+    implementation libs.bundles.compose
+    implementation libs.arrow
+    implementation libs.compose.constraintLayout
+    implementation libs.compose.accompanist.swipeToRefresh
+    implementation libs.kotlin.stdlib
+    implementation libs.polpetta
+    implementation libs.hilt.android
+
+    testImplementation project(":core:testing")
+
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.compose.test.uiJunit4
+
+    debugImplementation libs.bundles.compose.debug
+}
diff --git a/.../marcocattaneo/sleep/AbsComposableTest.kt → ...catalog/presentation/AbsComposableTest.kt b/.../marcocattaneo/sleep/AbsComposableTest.kt → ...catalog/presentation/AbsComposableTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Marco Cattaneo
+ * Copyright 2023 Marco Cattaneo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep
+package dev.marcocattaneo.sleep.catalog.presentation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.test.junit4.ComposeContentTestRule

diff --git a/...p/ui/composables/ComposableInfoBoxTest.kt → ...tion/composables/ComposableInfoBoxTest.kt b/...p/ui/composables/ComposableInfoBoxTest.kt → ...tion/composables/ComposableInfoBoxTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Marco Cattaneo
+ * Copyright 2023 Marco Cattaneo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.composables
+package dev.marcocattaneo.sleep.catalog.presentation.composables
 
 import androidx.compose.material.Text
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.onNodeWithText
-import dev.marcocattaneo.sleep.AbsComposableTest
+import dev.marcocattaneo.sleep.catalog.presentation.AbsComposableTest
 import org.junit.Test
 
 internal class ComposableInfoBoxTest : AbsComposableTest() {

diff --git a/...v/marcocattaneo/sleep/ui/screen/Routes.kt → ...aneo/sleep/catalog/presentation/Routes.kt b/...v/marcocattaneo/sleep/ui/screen/Routes.kt → ...aneo/sleep/catalog/presentation/Routes.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.screen
+package dev.marcocattaneo.sleep.catalog.presentation
 
 import dev.marcocattaneo.navigation.routing.ScreenRoute
 

diff --git a/...aneo/sleep/ui/composables/Illustration.kt → .../presentation/composables/Illustration.kt b/...aneo/sleep/ui/composables/Illustration.kt → .../presentation/composables/Illustration.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.composables
+package dev.marcocattaneo.sleep.catalog.presentation.composables
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image

diff --git a/...ocattaneo/sleep/ui/composables/InfoBox.kt → ...talog/presentation/composables/InfoBox.kt b/...ocattaneo/sleep/ui/composables/InfoBox.kt → ...talog/presentation/composables/InfoBox.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Marco Cattaneo
+ * Copyright 2023 Marco Cattaneo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.composables
+package dev.marcocattaneo.sleep.catalog.presentation.composables
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope

diff --git a/...ttaneo/sleep/ui/screen/home/HomeScreen.kt → ...alog/presentation/screen/CatalogScreen.kt b/...ttaneo/sleep/ui/screen/home/HomeScreen.kt → ...alog/presentation/screen/CatalogScreen.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Marco Cattaneo
+ * Copyright 2023 Marco Cattaneo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.screen.home
+package dev.marcocattaneo.sleep.catalog.presentation.screen
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.clickable
@@ -36,21 +36,25 @@ import dev.marcocattaneo.core.design.composables.*
 import dev.marcocattaneo.core.design.theme.Dimen
 import dev.marcocattaneo.core.design.theme.placeholder
 import dev.marcocattaneo.navigation.composable
-import dev.marcocattaneo.sleep.R
+import dev.marcocattaneo.sleep.catalog.presentation.Routes
+import dev.marcocattaneo.sleep.catalog.presentation.composables.Illustration
+import dev.marcocattaneo.sleep.catalog.presentation.composables.InfoBox
 import dev.marcocattaneo.sleep.domain.model.MediaFileEntity
-import dev.marcocattaneo.sleep.ui.composables.Illustration
-import dev.marcocattaneo.sleep.ui.composables.InfoBox
-import dev.marcocattaneo.sleep.ui.screen.Routes
+import dev.marcocattaneo.sleep.catalog.presentation.R
 
+/**
+ * Register the composable function into the NavGraphBuilder
+ * @param onClickMediaFile callback used when a media file is clicked
+ */
 fun NavGraphBuilder.registerCatalogScreen(onClickMediaFile: (MediaFileEntity) -> Unit) {
-    composable<HomeViewModel>(
+    composable<CatalogViewModel>(
         route = Routes.Dashboard
-    ) { _, vm -> HomeScreen(vm, onClickMediaFile = onClickMediaFile) }
+    ) { _, vm -> CatalogScreen(vm, onClickMediaFile = onClickMediaFile) }
 }
 
 @Composable
-fun HomeScreen(
-    homeViewModel: HomeViewModel,
+fun CatalogScreen(
+    homeViewModel: CatalogViewModel,
     onClickMediaFile: (MediaFileEntity) -> Unit
 ) {
     val uiState by homeViewModel.rememberState()

diff --git a/...eo/sleep/ui/screen/home/HomeStateStore.kt → .../presentation/screen/CatalogStateStore.kt b/...eo/sleep/ui/screen/home/HomeStateStore.kt → .../presentation/screen/CatalogStateStore.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package dev.marcocattaneo.sleep.ui.screen.home
+package dev.marcocattaneo.sleep.catalog.presentation.screen
 
 import dagger.hilt.android.scopes.ViewModelScoped
 import dev.marcocattaneo.sleep.core.di.scope.CoroutineContextScope