remove feature dependencies from main module

Author: Razeeman

app/src/main/java/com/example/util/simpletimetracker/di/ScreenKey.kt

@@ -4,6 +4,6 @@ import com.example.util.simpletimetracker.navigation.params.screen.ScreenParams
 import dagger.MapKey
 import kotlin.reflect.KClass
 
-@Retention(AnnotationRetention.RUNTIME)
 @MapKey
+@Retention(AnnotationRetention.RUNTIME)
 annotation class ScreenKey(val value: KClass<out ScreenParams>)

core/src/main/java/com/example/util/simpletimetracker/core/model/NavigationTabKey.kt

@@ -0,0 +1,8 @@
+package com.example.util.simpletimetracker.core.model
+
+import dagger.MapKey
+import kotlin.reflect.KClass
+
+@MapKey
+@Retention(AnnotationRetention.RUNTIME)
+annotation class NavigationTabKey(val value: KClass<out NavigationTab>)

core/src/main/java/com/example/util/simpletimetracker/core/model/NavigationTabProvider.kt

@@ -0,0 +1,7 @@
+package com.example.util.simpletimetracker.core.model
+
+import androidx.fragment.app.Fragment
+
+fun interface NavigationTabProvider {
+    fun provide(): Fragment
+}

features/feature_goals/src/main/java/com/example/util/simpletimetracker/feature_goals/di/GoalsModule.kt

@@ -0,0 +1,23 @@
+package com.example.util.simpletimetracker.feature_goals.di
+
+import com.example.util.simpletimetracker.core.model.NavigationTab
+import com.example.util.simpletimetracker.core.model.NavigationTabKey
+import com.example.util.simpletimetracker.core.model.NavigationTabProvider
+import com.example.util.simpletimetracker.feature_goals.view.GoalsFragment
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.IntoMap
+
+@Module
+@InstallIn(SingletonComponent::class)
+class GoalsModule {
+
+    @Provides
+    @IntoMap
+    @NavigationTabKey(NavigationTab.Goals::class)
+    fun bindNavigationTab(): NavigationTabProvider {
+        return NavigationTabProvider { GoalsFragment.newInstance() }
+    }
+}

features/feature_main/build.gradle.kts

@@ -16,12 +16,6 @@ android {
 
 dependencies {
     implementation(project(":core"))
-    implementation(project(":feature_running_records")) // TODO remove feature dependency
-    implementation(project(":feature_records"))
-    implementation(project(":feature_statistics"))
-    implementation(project(":feature_settings"))
-    implementation(project(":feature_goals"))
-    implementation(project(":feature_dialogs:api")) // TODO remove?
     implementation(libs.google.dagger)
     ksp(libs.kapt.dagger)
 }

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/adapter/MainContentAdapter.kt

@@ -3,25 +3,18 @@ package com.example.util.simpletimetracker.feature_main.adapter
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.example.util.simpletimetracker.core.model.NavigationTab
-import com.example.util.simpletimetracker.feature_goals.view.GoalsFragment
-import com.example.util.simpletimetracker.feature_records.view.RecordsContainerFragment
-import com.example.util.simpletimetracker.feature_running_records.view.RunningRecordsFragment
-import com.example.util.simpletimetracker.feature_settings.view.SettingsFragment
-import com.example.util.simpletimetracker.feature_statistics.view.StatisticsContainerFragment
+import com.example.util.simpletimetracker.core.model.NavigationTabProvider
 
 class MainContentAdapter(
     fragment: Fragment,
     tabs: List<NavigationTab>,
+    providers: Map<Class<out NavigationTab>, NavigationTabProvider>,
 ) : FragmentStateAdapter(fragment) {
 
-    private val fragments = tabs.map {
-        when (it) {
-            is NavigationTab.RunningRecords -> lazy { RunningRecordsFragment.newInstance() }
-            is NavigationTab.Records -> lazy { RecordsContainerFragment.newInstance() }
-            is NavigationTab.Statistics -> lazy { StatisticsContainerFragment.newInstance() }
-            is NavigationTab.Settings -> lazy { SettingsFragment.newInstance() }
-            is NavigationTab.Goals -> lazy { GoalsFragment.newInstance() }
-        }
+    private val fragments = tabs.mapNotNull {
+        providers[it::class.java]
+    }.map {
+        lazy { it.provide() }
     }
 
     override fun getItemCount(): Int =

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/provider/MainTabsProvider.kt

@@ -2,6 +2,7 @@ package com.example.util.simpletimetracker.feature_main.provider
 
 import androidx.annotation.DrawableRes
 import com.example.util.simpletimetracker.core.model.NavigationTab
+import com.example.util.simpletimetracker.core.model.NavigationTabProvider
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.core.utils.SHORTCUT_NAVIGATION_RECORDS
 import com.example.util.simpletimetracker.core.utils.SHORTCUT_NAVIGATION_SETTINGS
@@ -13,6 +14,7 @@ import kotlinx.coroutines.runBlocking
 import javax.inject.Inject
 
 class MainTabsProvider @Inject constructor(
+    val tabProviders: Map<Class<out NavigationTab>, @JvmSuppressWildcards NavigationTabProvider>,
     private val resourceRepo: ResourceRepo,
     private val prefsInteractor: PrefsInteractor,
 ) {

features/feature_main/src/main/java/com/example/util/simpletimetracker/feature_main/view/MainFragment.kt

@@ -88,6 +88,7 @@ class MainFragment : BaseFragment<Binding>() {
             MainContentAdapter(
                 fragment = this@MainFragment,
                 tabs = mainTabsProvider.tabsList,
+                providers = mainTabsProvider.tabProviders,
             ),
         )
         mainPager.offscreenPageLimit = 3 // Same as number of pages to avoid recreating.

features/feature_records/src/main/java/com/example/util/simpletimetracker/feature_records/di/RecordsModule.kt

@@ -1,16 +1,31 @@
 package com.example.util.simpletimetracker.feature_records.di
 
+import com.example.util.simpletimetracker.core.model.NavigationTab
+import com.example.util.simpletimetracker.core.model.NavigationTabKey
+import com.example.util.simpletimetracker.core.model.NavigationTabProvider
 import com.example.util.simpletimetracker.feature_records.api.RecordsContainerOptionsListMapper
 import com.example.util.simpletimetracker.feature_records.mapper.RecordsContainerOptionsListMapperImpl
+import com.example.util.simpletimetracker.feature_records.view.RecordsContainerFragment
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.IntoMap
 
 @Module
 @InstallIn(SingletonComponent::class)
 interface RecordsModule {
 
     @Binds
     fun bindRecordsContainerOptionsListMapper(impl: RecordsContainerOptionsListMapperImpl): RecordsContainerOptionsListMapper
+
+    companion object {
+        @Provides
+        @IntoMap
+        @NavigationTabKey(NavigationTab.Records::class)
+        fun bindNavigationTab(): NavigationTabProvider {
+            return NavigationTabProvider { RecordsContainerFragment.newInstance() }
+        }
+    }
 }

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/di/RunningRecordsModule.kt

@@ -1,13 +1,19 @@
 package com.example.util.simpletimetracker.feature_running_records.di
 
+import com.example.util.simpletimetracker.core.model.NavigationTab
+import com.example.util.simpletimetracker.core.model.NavigationTabKey
+import com.example.util.simpletimetracker.core.model.NavigationTabProvider
 import com.example.util.simpletimetracker.feature_running_records.api.OnShortcutClickInteractor
 import com.example.util.simpletimetracker.feature_running_records.api.RecordsShortcutsViewDataInteractor
 import com.example.util.simpletimetracker.feature_running_records.interactor.OnShortcutClickInteractorImpl
 import com.example.util.simpletimetracker.feature_running_records.interactor.RecordsShortcutsViewDataInteractorImpl
+import com.example.util.simpletimetracker.feature_running_records.view.RunningRecordsFragment
 import dagger.Binds
 import dagger.Module
+import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.IntoMap
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -18,4 +24,13 @@ interface RunningRecordsModule {
 
     @Binds
     fun bindOnShortcutClickInteractor(impl: OnShortcutClickInteractorImpl): OnShortcutClickInteractor
+
+    companion object {
+        @Provides
+        @IntoMap
+        @NavigationTabKey(NavigationTab.RunningRecords::class)
+        fun bindNavigationTab(): NavigationTabProvider {
+            return NavigationTabProvider { RunningRecordsFragment.newInstance() }
+        }
+    }
 }