Wire tool order sync into DashboardPresenter and ToolsPresenter via SyncTaskRegistry

DashboardPresenter now registers its syncData task with the SyncTaskRegistry
and exposes the registry on CircuitContext so nested presenters can participate.
ToolsPresenter registers a syncToolOrder task against that registry, replacing
the previous direct rememberSyncTracker usage.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: frett

app/src/main/kotlin/org/cru/godtools/ui/dashboard/DashboardPresenter.kt

@@ -2,11 +2,13 @@ package org.cru.godtools.ui.dashboard
 
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.foundation.NavEvent
 import com.slack.circuit.foundation.onNavEvent
+import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.Navigator
@@ -18,18 +20,20 @@ import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import org.ccci.gto.android.common.sync.SyncTracker
-import org.ccci.gto.android.common.sync.rememberSyncTracker
 import org.cru.godtools.base.ui.circuit.screen.dashboard.DashboardScreen
 import org.cru.godtools.base.ui.circuit.screen.dashboard.page.DashboardPage
 import org.cru.godtools.base.ui.circuit.screen.dashboard.page.HomeScreen
 import org.cru.godtools.sync.GodToolsSyncService
 import org.cru.godtools.ui.dashboard.DashboardPresenter.UiState
+import org.cru.godtools.ui.dashboard.SyncTaskRegistry.Companion.rememberSyncRegistry
+import org.cru.godtools.ui.dashboard.SyncTaskRegistry.Companion.syncTaskRegistry
 import org.cru.godtools.ui.drawer.DrawerMenuPresenter
 import org.cru.godtools.ui.drawer.DrawerMenuScreen
 
 class DashboardPresenter @AssistedInject internal constructor(
     private val drawerMenuPresenter: DrawerMenuPresenter,
     private val syncService: GodToolsSyncService,
+    @Assisted private val circuitContext: CircuitContext,
     @Assisted private val navigator: Navigator,
     @Assisted private val screen: DashboardScreen,
 ) : Presenter<UiState> {
@@ -49,16 +53,25 @@ class DashboardPresenter @AssistedInject internal constructor(
 
     @Composable
     override fun present(): UiState {
-        val syncTracker = rememberSyncTracker { it.syncData() }
+        val syncRegistry = rememberSyncRegistry()
+        DisposableEffect(syncRegistry) {
+            circuitContext.syncTaskRegistry = syncRegistry
+            val id = syncRegistry.registerSyncTask { syncData(it) }
+
+            onDispose {
+                circuitContext.syncTaskRegistry = null
+                syncRegistry.unregisterSyncTask(id)
+            }
+        }
 
         return UiState(
             drawerState = drawerMenuPresenter.present(),
-            isSyncing = syncTracker.isSyncing.collectAsState().value,
+            isSyncing = syncRegistry.syncTracker.isSyncing.collectAsState().value,
             initialPage = screen.initialPage,
             snackbarState = remember { SnackbarHostState() },
         ) {
             when (it) {
-                UiEvent.TriggerSync -> syncTracker.syncData(force = true)
+                UiEvent.TriggerSync -> syncRegistry.triggerSyncTasks(force = true)
                 is UiEvent.NestedNavEvent -> navigator.onNavEvent(it.event)
             }
         }
@@ -81,6 +94,6 @@ class DashboardPresenter @AssistedInject internal constructor(
     @AssistedFactory
     @CircuitInject(DashboardScreen::class, SingletonComponent::class)
     interface Factory {
-        fun create(navigator: Navigator, screen: DashboardScreen): DashboardPresenter
+        fun create(context: CircuitContext, navigator: Navigator, screen: DashboardScreen): DashboardPresenter
     }
 }

app/src/main/kotlin/org/cru/godtools/ui/dashboard/tools/ToolsPresenter.kt

@@ -1,6 +1,7 @@
 package org.cru.godtools.ui.dashboard.tools
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.key
@@ -11,6 +12,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.slack.circuit.codegen.annotations.CircuitInject
+import com.slack.circuit.runtime.CircuitContext
 import com.slack.circuit.runtime.CircuitUiEvent
 import com.slack.circuit.runtime.CircuitUiState
 import com.slack.circuit.runtime.Navigator
@@ -19,19 +21,25 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.components.SingletonComponent
+import java.util.Locale
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import org.ccci.gto.android.common.sync.SyncTracker
 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.CONFIG_UI_DASHBOARD_PERSONALIZATION_ENABLED
+import org.cru.godtools.base.Settings
 import org.cru.godtools.base.ui.circuit.screen.dashboard.page.ToolsScreen
 import org.cru.godtools.db.repository.ToolsRepository
 import org.cru.godtools.model.Language
 import org.cru.godtools.model.Tool
+import org.cru.godtools.sync.GodToolsSyncService
 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.SyncTaskRegistry.Companion.syncTaskRegistry
 import org.cru.godtools.ui.dashboard.tools.ToolFiltersStateProducer.Filters
 import org.cru.godtools.ui.dashboard.tools.ToolsPresenter.UiState
 import org.cru.godtools.ui.dashboard.tools.ToolsPresenter.UiState.Mode
@@ -43,11 +51,14 @@ import org.greenrobot.eventbus.EventBus
 class ToolsPresenter @AssistedInject internal constructor(
     private val eventBus: EventBus,
     private val remoteConfig: FirebaseRemoteConfig,
+    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,
+    private val syncService: GodToolsSyncService,
+    @Assisted private val circuitContext: CircuitContext,
     @Assisted private val navigator: Navigator,
 ) : Presenter<UiState> {
     // region UiState / UiEvent
@@ -83,6 +94,8 @@ class ToolsPresenter @AssistedInject internal constructor(
         val filters = toolFiltersStateProducer.produce(mode)
         val selectedLocale by rememberUpdatedState(filters.languageFilter.selectedItem?.code)
 
+        RegisterSyncTask(selectedLocale)
+
         val eventSink: (UiEvent) -> Unit = remember {
             {
                 when (it) {
@@ -124,6 +137,16 @@ class ToolsPresenter @AssistedInject internal constructor(
         )
     }
 
+    @Composable
+    private fun RegisterSyncTask(selectedLocale: Locale?) {
+        val syncRegistry = circuitContext.syncTaskRegistry
+        DisposableEffect(syncRegistry, selectedLocale) {
+            if (syncRegistry == null) return@DisposableEffect onDispose { }
+            val id = syncRegistry.registerSyncTask { force -> syncData(selectedLocale ?: settings.appLanguage, force) }
+            onDispose { syncRegistry.unregisterSyncTask(id) }
+        }
+    }
+
     @Composable
     private fun rememberSpotlightTools(
         secondLanguage: Language?,
@@ -190,9 +213,14 @@ class ToolsPresenter @AssistedInject internal constructor(
         }
     }
 
+    private fun SyncTracker.syncData(locale: Locale, force: Boolean = false) = launchSync {
+        val country = settings.getCountrySettingFlow().first()
+        syncService.syncToolOrder(locale, country, force)
+    }
+
     @AssistedFactory
     @CircuitInject(ToolsScreen::class, SingletonComponent::class)
     interface Factory {
-        fun create(navigator: Navigator): ToolsPresenter
+        fun create(circuitContext: CircuitContext, navigator: Navigator): ToolsPresenter
     }
 }

app/src/test/kotlin/org/cru/godtools/ui/dashboard/DashboardPresenterTest.kt

@@ -5,6 +5,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import app.cash.turbine.ReceiveTurbine
 import com.jeppeman.mockposable.mockk.everyComposable
 import com.slack.circuit.foundation.NavEvent
+import com.slack.circuit.runtime.CircuitContext
+import com.slack.circuit.runtime.InternalCircuitApi
 import com.slack.circuit.test.FakeNavigator
 import com.slack.circuit.test.test
 import io.mockk.coEvery
@@ -14,6 +16,8 @@ import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.sync.Mutex
@@ -27,6 +31,7 @@ import org.cru.godtools.base.ui.circuit.screen.dashboard.page.LessonsScreen
 import org.cru.godtools.sync.GodToolsSyncService
 import org.cru.godtools.ui.dashboard.DashboardPresenter.UiEvent
 import org.cru.godtools.ui.dashboard.DashboardPresenter.UiState
+import org.cru.godtools.ui.dashboard.SyncTaskRegistry.Companion.syncTaskRegistry
 import org.cru.godtools.ui.drawer.DrawerMenuPresenter
 import org.cru.godtools.ui.drawer.DrawerMenuScreen
 import org.cru.godtools.ui.tooldetails.ToolDetailsScreen
@@ -36,9 +41,11 @@ import org.robolectric.annotation.Config
 @RunWith(AndroidJUnit4::class)
 @Config(application = Application::class)
 @Suppress("DeferredResultUnused")
+@OptIn(InternalCircuitApi::class)
 class DashboardPresenterTest {
     private val screen = DashboardScreen(HomeScreen)
     private val syncLock = Mutex(true)
+    private val circuitContext = CircuitContext(null)
 
     private val drawerMenuPresenter: DrawerMenuPresenter = mockk {
         everyComposable { present() } returns DrawerMenuScreen.State()
@@ -55,6 +62,7 @@ class DashboardPresenterTest {
     private val presenter = DashboardPresenter(
         drawerMenuPresenter = drawerMenuPresenter,
         syncService = syncService,
+        circuitContext = circuitContext,
         navigator = navigator,
         screen = screen,
     )
@@ -72,6 +80,7 @@ class DashboardPresenterTest {
         val presenter = DashboardPresenter(
             drawerMenuPresenter = drawerMenuPresenter,
             syncService = syncService,
+            circuitContext = circuitContext,
             navigator = navigator,
             screen = DashboardScreen(LessonsScreen),
         )
@@ -140,5 +149,17 @@ class DashboardPresenterTest {
     }
     // endregion UiEvent.TriggerSync
 
+    // region SideEffect - SyncTaskRegistry
+    @Test
+    fun `SideEffect - SyncTaskRegistry - set on CircuitContext while presenter is active`() = runTest {
+        assertNull(circuitContext.syncTaskRegistry)
+        presenter.test {
+            awaitInitialState()
+            assertNotNull(circuitContext.syncTaskRegistry)
+        }
+        assertNull(circuitContext.syncTaskRegistry)
+    }
+    // endregion SideEffect - SyncTaskRegistry
+
     private suspend fun ReceiveTurbine<UiState>.awaitInitialState() = awaitItemMatching { it.isSyncing }
 }