Wire up Banner presenters in Home/Tools presenters via Circuit pattern

frett · claude · frett · commit dfc83c4cbf7a · 2026-04-22T16:56:47.000-06:00
Replace direct Settings flow observation with injected BannerPresenter dependencies in HomePresenter and ToolsPresenter, enabling proper Circuit-based composition and simplifying testing via FakeBannerPresenter.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/banner/BannerModule.kt b/app/src/main/kotlin/org/cru/godtools/ui/banner/BannerModule.kt
@@ -0,0 +1,22 @@
+package org.cru.godtools.ui.banner
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.cru.godtools.ui.banner.favoritetools.FavoriteToolsBannerPresenter
+import org.cru.godtools.ui.banner.tutorial.TutorialFeaturesBannerPresenter
+
+@Module
+@InstallIn(SingletonComponent::class)
+interface BannerModule {
+    @Binds
+    fun favoriteToolsBannerPresenter(
+        presenter: FavoriteToolsBannerPresenter,
+    ): BannerPresenter<FavoriteToolsBannerPresenter.UiState>
+
+    @Binds
+    fun tutorialFeaturesBannerPresenter(
+        presenter: TutorialFeaturesBannerPresenter,
+    ): BannerPresenter<TutorialFeaturesBannerPresenter.UiState>
+}
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/banner/Banners.kt b/app/src/main/kotlin/org/cru/godtools/ui/banner/Banners.kt
@@ -9,19 +9,24 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import org.cru.godtools.ui.banner.favoritetools.FavoriteToolsBannerLayout
+import org.cru.godtools.ui.banner.favoritetools.FavoriteToolsBannerPresenter
+import org.cru.godtools.ui.banner.tutorial.TutorialFeaturesBannerLayout
+import org.cru.godtools.ui.banner.tutorial.TutorialFeaturesBannerPresenter
 
 @Composable
-internal fun Banners(banner: () -> Banner.Type?, modifier: Modifier = Modifier) = Box(modifier.heightIn(min = 1.dp)) {
+internal fun Banners(state: Banner.UiState?, modifier: Modifier = Modifier) = Box(modifier.heightIn(min = 1.dp)) {
     AnimatedContent(
-        targetState = banner(),
+        targetState = state,
         transitionSpec = {
             slideInVertically(initialOffsetY = { -it }) togetherWith slideOutVertically(targetOffsetY = { -it })
         },
         label = "Banner Visibility",
+        contentKey = { it?.type },
     ) {
         when (it) {
-            Banner.Type.TOOL_LIST_FAVORITES -> FavoriteToolsBanner()
-            Banner.Type.TUTORIAL_FEATURES -> TutorialFeaturesBanner()
+            is FavoriteToolsBannerPresenter.UiState -> FavoriteToolsBannerLayout(it)
+            is TutorialFeaturesBannerPresenter.UiState -> TutorialFeaturesBannerLayout(it)
             else -> Unit
         }
     }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/banner/FavoriteToolsBanner.kt b/app/src/main/kotlin/org/cru/godtools/ui/banner/FavoriteToolsBanner.kt
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/banner/TutorialFeaturesBanner.kt b/app/src/main/kotlin/org/cru/godtools/ui/banner/TutorialFeaturesBanner.kt
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayout.kt
@@ -45,15 +45,14 @@ private val PADDING_HORIZONTAL = 16.dp
 internal fun HomeLayout(state: UiState, modifier: Modifier = Modifier) {
     val columnState = rememberLazyListState()
 
-    val banner by rememberUpdatedState(state.banner)
-    LaunchedEffect(banner) { if (banner != null) columnState.animateScrollToItem(0) }
+    LaunchedEffect(state.banner?.type) { if (state.banner != null) columnState.animateScrollToItem(0) }
 
     LazyColumn(state = columnState, contentPadding = PaddingValues(bottom = 16.dp), modifier = modifier) {
         if (!state.dataLoaded) return@LazyColumn
 
         item("banners", "banners") {
             Banners(
-                { banner },
+                state.banner,
                 modifier = Modifier
                     .animateItem()
                     .fillMaxWidth()
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenter.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenter.kt
@@ -17,7 +17,6 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import org.cru.godtools.BuildConfig
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent
@@ -27,9 +26,10 @@ import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.ACTIO
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_FAVORITE
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_FEATURED
 import org.cru.godtools.base.CONFIG_UI_DASHBOARD_HOME_FAVORITE_TOOLS
-import org.cru.godtools.base.Settings
 import org.cru.godtools.db.repository.ToolsRepository
 import org.cru.godtools.ui.banner.Banner
+import org.cru.godtools.ui.banner.BannerPresenter
+import org.cru.godtools.ui.banner.tutorial.TutorialFeaturesBannerPresenter
 import org.cru.godtools.ui.dashboard.home.HomePresenter.UiState
 import org.cru.godtools.ui.dashboard.tools.ToolsScreen
 import org.cru.godtools.ui.tooldetails.ToolDetailsScreen
@@ -43,16 +43,15 @@ class HomePresenter @AssistedInject constructor(
     private val context: Context,
     private val eventBus: EventBus,
     private val remoteConfig: FirebaseRemoteConfig,
-    private val settings: Settings,
     private val toolCardPresenter: ToolCardPresenter,
     private val toolsRepository: ToolsRepository,
-    @Assisted
-    private val navigator: Navigator,
+    private val tutorialFeaturesBannerPresenter: BannerPresenter<TutorialFeaturesBannerPresenter.UiState>,
+    @Assisted private val navigator: Navigator,
 ) : Presenter<UiState> {
     // region UiState / UiEvent
     data class UiState(
         val dataLoaded: Boolean = true,
-        val banner: Banner.Type? = null,
+        val banner: Banner.UiState? = null,
         val spotlightLessons: List<ToolCard.State> = emptyList(),
         val favoriteTools: List<ToolCard.State> = emptyList(),
         val eventSink: (UiEvent) -> Unit = {},
@@ -71,7 +70,7 @@ class HomePresenter @AssistedInject constructor(
 
         return UiState(
             dataLoaded = spotlightLessons != null && favoriteTools != null,
-            banner = rememberBanner(),
+            banner = tutorialFeaturesBannerPresenter.present(),
             spotlightLessons = spotlightLessons.orEmpty(),
             favoriteTools = favoriteTools.orEmpty(),
         ) {
@@ -82,17 +81,6 @@ class HomePresenter @AssistedInject constructor(
         }
     }
 
-    @Composable
-    private fun rememberBanner() = remember {
-        settings.isFeatureDiscoveredFlow(Settings.FEATURE_TUTORIAL_FEATURES)
-            .combine(settings.appLanguageFlow) { discovered, language ->
-                when {
-                    !discovered -> Banner.Type.TUTORIAL_FEATURES
-                    else -> null
-                }
-            }
-    }.collectAsState(null).value
-
     @Composable
     private fun rememberSpotlightLessons() =
         remember { toolsRepository.getLessonsFlow().map { it.filter { !it.isHidden && it.isSpotlight } } }
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsLayout.kt
@@ -33,20 +33,19 @@ internal val MARGIN_TOOLS_LAYOUT_HORIZONTAL = 16.dp
 @Composable
 @CircuitInject(ToolsScreen::class, SingletonComponent::class)
 internal fun ToolsLayout(state: UiState, modifier: Modifier = Modifier) {
-    val banner by rememberUpdatedState(state.banner)
     val spotlightTools by rememberUpdatedState(state.spotlightTools)
     val filters by rememberUpdatedState(state.filters)
     val tools by rememberUpdatedState(state.tools)
 
     val columnState = rememberLazyListState()
-    LaunchedEffect(banner) { if (banner != null) columnState.animateScrollToItem(0) }
+    LaunchedEffect(state.banner?.type) { if (state.banner != null) columnState.animateScrollToItem(0) }
 
     LazyColumn(state = columnState, modifier = modifier) {
         if (!state.dataLoaded) return@LazyColumn
 
         item("banners", "banners") {
             Banners(
-                { banner },
+                state.banner,
                 modifier = Modifier
                     .animateItem()
                     .fillMaxWidth()
diff --git a/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsPresenter.kt b/app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsPresenter.kt
@@ -20,11 +20,12 @@ import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.ACTION_OPEN_TOOL_DETAILS
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_ALL_TOOLS
 import org.cru.godtools.analytics.model.OpenAnalyticsActionEvent.Companion.SOURCE_SPOTLIGHT
-import org.cru.godtools.base.Settings
 import org.cru.godtools.db.repository.ToolsRepository
 import org.cru.godtools.model.Language
 import org.cru.godtools.model.Tool
 import org.cru.godtools.ui.banner.Banner
+import org.cru.godtools.ui.banner.BannerPresenter
+import org.cru.godtools.ui.banner.favoritetools.FavoriteToolsBannerPresenter
 import org.cru.godtools.ui.dashboard.tools.ToolFiltersStateProducer.Filters
 import org.cru.godtools.ui.dashboard.tools.ToolsPresenter.UiState
 import org.cru.godtools.ui.tooldetails.ToolDetailsScreen
@@ -34,16 +35,16 @@ import org.greenrobot.eventbus.EventBus
 
 class ToolsPresenter @AssistedInject internal constructor(
     private val eventBus: EventBus,
-    private val settings: Settings,
     private val toolCardPresenter: ToolCardPresenter,
     private val toolsRepository: ToolsRepository,
+    private val favoriteToolsBannerPresenter: BannerPresenter<FavoriteToolsBannerPresenter.UiState>,
     private val filteredToolsFlowProducer: FilteredToolsFlowProducer,
     private val toolFiltersStateProducer: ToolFiltersStateProducer,
     @Assisted private val navigator: Navigator,
 ) : Presenter<UiState> {
     // region UiState / UiEvent
     data class UiState(
-        val banner: Banner.Type? = null,
+        val banner: Banner.UiState? = null,
         val dataLoaded: Boolean = true,
         val spotlightTools: List<ToolCard.State> = emptyList(),
         val filters: Filters = Filters(),
@@ -85,7 +86,7 @@ class ToolsPresenter @AssistedInject internal constructor(
         )
 
         return UiState(
-            banner = rememberBanner(),
+            banner = favoriteToolsBannerPresenter.present(),
             dataLoaded = spotlightTools != null && tools != null,
             spotlightTools = spotlightTools.orEmpty(),
             filters = filters,
@@ -94,12 +95,6 @@ class ToolsPresenter @AssistedInject internal constructor(
         )
     }
 
-    @Composable
-    private fun rememberBanner() = remember {
-        settings.isFeatureDiscoveredFlow(Settings.FEATURE_TOOL_FAVORITE)
-            .map { if (!it) Banner.Type.TOOL_LIST_FAVORITES else null }
-    }.collectAsState(null).value
-
     @Composable
     private fun rememberSpotlightTools(
         secondLanguage: Language?,
diff --git a/app/src/test/kotlin/org/cru/godtools/ui/banner/FakeBannerPresenter.kt b/app/src/test/kotlin/org/cru/godtools/ui/banner/FakeBannerPresenter.kt
@@ -0,0 +1,16 @@
+package org.cru.godtools.ui.banner
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class FakeBannerPresenter<T : Banner.UiState>(initialState: T? = null) : BannerPresenter<T> {
+    private val uiState = MutableStateFlow(initialState)
+
+    fun updateState(state: T?) {
+        uiState.value = state
+    }
+
+    @Composable
+    override fun present(): T? = uiState.collectAsState().value
+}
diff --git a/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NIGHT,NO_ACCESSIBILITY].png b/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NIGHT,NO_ACCESSIBILITY].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe72508ae9e967a9807804df1437d3a893fa62792227322947f30b49d2002ddf
+size 82679
diff --git a/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NOTNIGHT,ACCESSIBILITY].png b/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NOTNIGHT,ACCESSIBILITY].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71e5a6d58151fa8131932bb7063089d7569800938c4adc29cc0309624c9cb267
+size 115727
diff --git a/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NOTNIGHT,NO_ACCESSIBILITY].png b/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Nexus_5,NOTNIGHT,NO_ACCESSIBILITY].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcd4bed1a9a1ee5c21557ebeec7e66b2f197fba6cc380877201b3f9a3ccefefe
+size 82098
diff --git a/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Pixel_6_Pro,NIGHT,NO_ACCESSIBILITY].png b/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Pixel_6_Pro,NIGHT,NO_ACCESSIBILITY].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba0acd773ec0998c31df5619ea9cc6e6b30a833d37e5a48247f08431252802c4
+size 73497
diff --git a/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Pixel_6_Pro,NOTNIGHT,NO_ACCESSIBILITY].png b/app/src/test/snapshots/images/org.cru.godtools.ui.dashboard.home_HomeLayoutPaparazziTest_HomeLayout()_-_Banner_-_Tutorial[Pixel_6_Pro,NOTNIGHT,NO_ACCESSIBILITY].png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4594bf01f365c579ee2f751a5e75b95bb5dedfeaf9339e020dc3660a0e5285b9
+size 73572
diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayoutPaparazziTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomeLayoutPaparazziTest.kt
@@ -14,15 +14,14 @@ import com.google.testing.junit.testparameterinjector.TestParameter
 import com.google.testing.junit.testparameterinjector.TestParameterInjector
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
-import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
 import org.cru.godtools.base.ui.BasePaparazziTest
-import org.cru.godtools.ui.banner.Banner
+import org.cru.godtools.ui.banner.tutorial.TutorialFeaturesBannerPresenter
 import org.cru.godtools.ui.dashboard.home.HomePresenter.UiState
 import org.cru.godtools.ui.tools.ToolCardStateTestData
 import org.junit.Assume.assumeTrue
@@ -78,9 +77,8 @@ class HomeLayoutPaparazziTest(
     }
 
     @Test
-    @Ignore("The Banner currently uses a ViewModel, which doesn't support Paparazzi")
     fun `HomeLayout() - Banner - Tutorial`() {
-        snapshotHomeLayout(state.copy(banner = Banner.Type.TUTORIAL_FEATURES))
+        snapshotHomeLayout(state.copy(banner = TutorialFeaturesBannerPresenter.UiState()))
     }
 
     @Test
diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenterTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/home/HomePresenterTest.kt
diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsPresenterTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsPresenterTest.kt
