Settings moved to Scrobbles screen

Author: hotmule

feature-library/build.gradle.kts

@@ -8,10 +8,10 @@ kotlin {
         named("commonMain") {
             dependencies {
                 implementation(projects.featureTop)
+                implementation(projects.featureMain)
                 implementation(projects.featureProfile)
-                implementation(projects.featureScrobbles)
                 implementation(projects.featureNowPlaying)
             }
         }
     }
-}
+}

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/LibraryComponent.kt

@@ -3,16 +3,16 @@ package ru.hotmule.lastik.feature.library
 import com.arkivanov.decompose.router.stack.ChildStack
 import com.arkivanov.decompose.value.Value
 import ru.hotmule.lastik.feature.app.NowPlayingComponent
-import ru.hotmule.lastik.feature.profile.ProfileComponent
-import ru.hotmule.lastik.feature.scrobbles.ScrobblesComponent
+import ru.hotmule.lastik.feature.main.MainComponent
 import ru.hotmule.lastik.feature.top.TopComponent
+import ru.hotmule.lastik.feature.profile.ProfileComponent
 
 interface LibraryComponent {
 
     val nowPlayingComponent: NowPlayingComponent
 
     sealed class Child(val index: Int) {
-        data class Scrobbles(val component: ScrobblesComponent) : Child(0)
+        data class Scrobbles(val component: MainComponent) : Child(0)
         data class Artists(val component: TopComponent) : Child(1)
         data class Albums(val component: TopComponent) : Child(2)
         data class Tracks(val component: TopComponent) : Child(3)
@@ -24,4 +24,4 @@ interface LibraryComponent {
     val activeChildIndex: Value<Int>
 
     fun onShelfSelect(index: Int)
-}
+}

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/LibraryComponentImpl.kt

@@ -1,24 +1,30 @@
 package ru.hotmule.lastik.feature.library
 
-import com.arkivanov.decompose.*
-import com.arkivanov.decompose.router.stack.*
+import com.arkivanov.decompose.ComponentContext
+import com.arkivanov.decompose.router.stack.ChildStack
+import com.arkivanov.decompose.router.stack.StackNavigation
+import com.arkivanov.decompose.router.stack.bringToFront
+import com.arkivanov.decompose.router.stack.childStack
 import com.arkivanov.decompose.value.Value
 import com.arkivanov.decompose.value.operator.map
 import kotlinx.serialization.Serializable
-import org.kodein.di.*
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.factory
+import org.kodein.di.instance
 import ru.hotmule.lastik.feature.app.NowPlayingComponent
 import ru.hotmule.lastik.feature.library.LibraryComponent.Child
-import ru.hotmule.lastik.feature.profile.ProfileComponent
-import ru.hotmule.lastik.feature.scrobbles.ScrobblesComponent
+import ru.hotmule.lastik.feature.main.MainComponent
 import ru.hotmule.lastik.feature.top.TopComponent
 import ru.hotmule.lastik.feature.top.TopComponentParams
+import ru.hotmule.lastik.feature.profile.ProfileComponent
 
 internal class LibraryComponentImpl(
     override val di: DI,
     private val componentContext: ComponentContext
 ) : LibraryComponent, DIAware, ComponentContext by componentContext {
 
-    private val scrobbles by factory<ComponentContext, ScrobblesComponent>()
+    private val scrobbles by factory<ComponentContext, MainComponent>()
     private val profile by factory<ComponentContext, ProfileComponent>()
     private val top by factory<TopComponentParams, TopComponent>()
 
@@ -70,4 +76,4 @@ internal class LibraryComponentImpl(
         @Serializable
         data object Profile : Config()
     }
-}
+}

feature-library/src/commonMain/kotlin/ru/hotmule/lastik/feature/library/module.kt

@@ -4,18 +4,18 @@ import com.arkivanov.decompose.ComponentContext
 import org.kodein.di.DI
 import org.kodein.di.bindFactory
 import ru.hotmule.lastik.feature.app.nowPlayingComponentModule
-import ru.hotmule.lastik.feature.profile.profileComponentModule
-import ru.hotmule.lastik.feature.scrobbles.scrobblesComponentModule
+import ru.hotmule.lastik.feature.main.mainComponentModule
 import ru.hotmule.lastik.feature.top.topComponentModule
+import ru.hotmule.lastik.feature.profile.profileComponentModule
 
 val libraryComponentModule = DI.Module("libraryComponent") {
 
     import(nowPlayingComponentModule)
-    import(scrobblesComponentModule)
     import(profileComponentModule)
+    import(mainComponentModule)
     import(topComponentModule)
 
     bindFactory<ComponentContext, LibraryComponent> { componentContext ->
         LibraryComponentImpl(di, componentContext)
     }
-}
+}

feature-menu/.gitignore renamed to feature-main/.gitignore

@@ -0,0 +1,15 @@
+plugins {
+    id("lastik.component")
+    id("kotlinx-serialization")
+}
+
+kotlin {
+    sourceSets {
+        named("commonMain") {
+            dependencies {
+                implementation(projects.featureScrobbles)
+                implementation(projects.featureSettings)
+            }
+        }
+    }
+}

feature-main/build.gradle.kts

@@ -0,0 +1,16 @@
+package ru.hotmule.lastik.feature.main
+
+import com.arkivanov.decompose.router.stack.ChildStack
+import com.arkivanov.decompose.value.Value
+import ru.hotmule.lastik.feature.scrobbles.ScrobblesComponent
+import ru.hotmule.lastik.feature.settings.SettingsComponent
+
+interface MainComponent {
+
+    sealed class Child {
+        data class Scrobbles(val component: ScrobblesComponent) : Child()
+        data class Settings(val component: SettingsComponent) : Child()
+    }
+
+    val stack: Value<ChildStack<*, Child>>
+}

feature-main/src/commonMain/kotlin/ru/hotmule/lastik/feature/main/MainComponent.kt

@@ -0,0 +1,64 @@
+package ru.hotmule.lastik.feature.main
+
+import com.arkivanov.decompose.ComponentContext
+import com.arkivanov.decompose.router.stack.ChildStack
+import com.arkivanov.decompose.router.stack.StackNavigation
+import com.arkivanov.decompose.router.stack.childStack
+import com.arkivanov.decompose.router.stack.pop
+import com.arkivanov.decompose.router.stack.push
+import com.arkivanov.decompose.value.Value
+import kotlinx.serialization.Serializable
+import org.kodein.di.DI
+import org.kodein.di.DIAware
+import org.kodein.di.factory
+import ru.hotmule.lastik.feature.main.MainComponent.Child
+import ru.hotmule.lastik.feature.scrobbles.ScrobblesComponent
+import ru.hotmule.lastik.feature.scrobbles.ScrobblesComponentParams
+import ru.hotmule.lastik.feature.settings.SettingsComponent
+import ru.hotmule.lastik.feature.settings.SettingsComponentParams
+
+internal class MainComponentImpl(
+    override val di: DI,
+    private val componentContext: ComponentContext
+) : MainComponent, DIAware, ComponentContext by componentContext {
+
+    private val scrobbles by factory<ScrobblesComponentParams, ScrobblesComponent>()
+    private val settings by factory<SettingsComponentParams, SettingsComponent>()
+
+    private val navigation = StackNavigation<Config>()
+    private val _stack = childStack(
+        source = navigation,
+        serializer = Config.serializer(),
+        initialConfiguration = Config.Scrobbles,
+        handleBackButton = true,
+    ) { configuration, componentContext ->
+        when (configuration) {
+            is Config.Scrobbles -> Child.Scrobbles(scrobbles(ScrobblesComponentParams(
+                componentContext = componentContext,
+                onSettingsOpen = ::goToSettings
+            )))
+            Config.Settings -> Child.Settings(settings(SettingsComponentParams(
+                componentContext = componentContext,
+                onBack = ::goBack
+            )))
+        }
+    }
+
+    private fun goToSettings() {
+        navigation.push(Config.Settings)
+    }
+
+    private fun goBack() {
+        navigation.pop()
+    }
+
+    override val stack: Value<ChildStack<*, Child>> = _stack
+
+    @Serializable
+    private sealed class Config {
+        @Serializable
+        data object Scrobbles : Config()
+        @Serializable
+        data object Settings : Config()
+    }
+}

feature-main/src/commonMain/kotlin/ru/hotmule/lastik/feature/main/MainComponentImpl.kt

@@ -0,0 +1,17 @@
+package ru.hotmule.lastik.feature.main
+
+import com.arkivanov.decompose.ComponentContext
+import org.kodein.di.DI
+import org.kodein.di.bindFactory
+import ru.hotmule.lastik.feature.scrobbles.scrobblesComponentModule
+import ru.hotmule.lastik.feature.settings.settingsComponentModule
+
+val mainComponentModule = DI.Module("mainComponent") {
+
+    import(scrobblesComponentModule)
+    import(settingsComponentModule)
+
+    bindFactory<ComponentContext, MainComponent> { componentContext ->
+        MainComponentImpl(di, componentContext)
+    }
+}