Phase 13 drop challenges and scale achievements

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: adsamcik

app/src/main/java/com/adsamcik/tracker/app/Application.kt

@@ -25,7 +25,6 @@ import com.adsamcik.tracker.tracker.shortcut.Shortcuts
 import com.adsamcik.tracker.tracker.worker.DailySummaryMaterializationWorker
 import android.app.Application as AndroidApplication
 import com.adsamcik.tracker.shared.base.concurrency.DispatchersProvider
-import com.adsamcik.tracker.shared.base.database.ChallengeDatabaseFold
 import com.adsamcik.tracker.shared.base.di.ApplicationScope
 import com.adsamcik.tracker.shared.preferences.store.PreferenceFlushLifecycleObserver
 import com.adsamcik.tracker.tracker.controller.LockManager
@@ -80,9 +79,6 @@ class Application : AndroidApplication(), Configuration.Provider {
 	@Inject
 	lateinit var precisionUpgradeConsumerProvider: Provider<PrecisionUpgradeDomainEventConsumer>
 
-	@Inject
-	lateinit var challengeDatabaseFoldProvider: Provider<ChallengeDatabaseFold>
-
 	@Volatile
 	var isStartupReady: Boolean = false
 	private set
@@ -171,7 +167,6 @@ class Application : AndroidApplication(), Configuration.Provider {
 				Reporter.initialize(this@Application)
 				Logger.initialize(this@Application)
 				CrashHandler(this@Application).initialize()
-				challengeDatabaseFoldProvider.get().awaitComplete()
 				if (!isRobolectricUnitTest()) {
 					initializeModules()
 				}

app/src/main/java/com/adsamcik/tracker/app/di/AppGraphModule.kt

@@ -2,7 +2,6 @@ package com.adsamcik.tracker.app.di
 
 import android.content.Context
 import com.adsamcik.tracker.app.Application
-import com.adsamcik.tracker.game.di.DefaultActiveChallengesProvider
 import com.adsamcik.tracker.game.di.DefaultDailyPointsProvider
 import com.adsamcik.tracker.game.di.DefaultGoalProgressProvider
 import com.adsamcik.tracker.game.repository.GameRepository
@@ -12,7 +11,6 @@ import com.adsamcik.tracker.shared.base.concurrency.DispatchersProvider
 import com.adsamcik.tracker.shared.base.database.dao.DailySummaryDao
 import com.adsamcik.tracker.shared.base.database.dao.LiveStatsDao
 import com.adsamcik.tracker.shared.base.database.dao.TripDao
-import com.adsamcik.tracker.shared.base.di.ActiveChallengesProvider
 import com.adsamcik.tracker.shared.base.di.ApplicationScope
 import com.adsamcik.tracker.shared.base.di.DailyPointsProvider
 import com.adsamcik.tracker.shared.base.di.DailySummaryProvider
@@ -95,13 +93,6 @@ object AppGraphModule {
         @ApplicationScope appScope: CoroutineScope,
     ): GoalProgressProvider = DefaultGoalProgressProvider(context, gameRepository, appScope)
 
-    @Provides
-    @Singleton
-    fun provideActiveChallengesProvider(
-        gameRepository: GameRepository,
-        @ApplicationScope appScope: CoroutineScope,
-    ): ActiveChallengesProvider = DefaultActiveChallengesProvider(gameRepository, appScope)
-
     @Provides
     @Singleton
     fun provideExportPlanStore(

app/src/main/java/com/adsamcik/tracker/app/di/InfrastructureModule.kt

@@ -4,17 +4,11 @@ import android.content.Context
 import com.adsamcik.tracker.shared.base.concurrency.DefaultDispatchersProvider
 import com.adsamcik.tracker.shared.base.concurrency.DispatchersProvider
 import com.adsamcik.tracker.shared.base.database.AppDatabase
-import com.adsamcik.tracker.shared.base.database.ChallengeDatabaseFold
-import com.adsamcik.tracker.shared.base.database.ChallengeDatabaseFoldMarker
 import com.adsamcik.tracker.shared.base.database.dao.AchievementProgressDao
 import com.adsamcik.tracker.shared.base.database.dao.ActivityDao
 import com.adsamcik.tracker.shared.base.database.dao.ActivitySnapshotDao
 import com.adsamcik.tracker.shared.base.database.dao.CellOperatorDao
 import com.adsamcik.tracker.shared.base.database.dao.CellSampleDao
-import com.adsamcik.tracker.shared.base.database.dao.ChallengeDao
-import com.adsamcik.tracker.shared.base.database.dao.ChallengeHistoryDao
-import com.adsamcik.tracker.shared.base.database.dao.ChallengePersonalRecordDao
-import com.adsamcik.tracker.shared.base.database.dao.ChallengeStreakDao
 import com.adsamcik.tracker.shared.base.database.dao.DailySummaryDao
 import com.adsamcik.tracker.shared.base.database.dao.DomainEventDao
 import com.adsamcik.tracker.shared.base.database.dao.ExplorationCellDao
@@ -46,7 +40,6 @@ import com.adsamcik.tracker.shared.base.di.DefaultDispatcher
 import com.adsamcik.tracker.shared.base.di.IoDispatcher
 import com.adsamcik.tracker.shared.base.time.Clock
 import com.adsamcik.tracker.shared.base.time.SystemClock
-import com.adsamcik.tracker.shared.preferences.Preferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -128,35 +121,6 @@ object InfrastructureModule {
     fun provideAppDatabase(@ApplicationContext context: Context): AppDatabase =
         AppDatabase.database(context)
 
-    @Provides
-    @Singleton
-    fun provideChallengeDatabaseFoldMarker(preferences: Preferences): ChallengeDatabaseFoldMarker =
-        object : ChallengeDatabaseFoldMarker {
-            override suspend fun isComplete(): Boolean =
-                preferences.fetchBoolean(ChallengeDatabaseFold.MARKER_KEY, default = false)
-
-            override suspend fun markComplete() {
-                preferences.editSuspend { setBoolean(ChallengeDatabaseFold.MARKER_KEY, true) }
-            }
-
-            override suspend fun isLegacyDataUnrecoverable(): Boolean =
-                preferences.fetchBoolean(ChallengeDatabaseFold.UNRECOVERABLE_MARKER_KEY, default = false)
-
-            override suspend fun markLegacyDataUnrecoverable() {
-                preferences.editSuspend {
-                    setBoolean(ChallengeDatabaseFold.UNRECOVERABLE_MARKER_KEY, true)
-                }
-            }
-        }
-
-    @Provides
-    @Singleton
-    fun provideChallengeDatabaseFold(
-        @ApplicationContext context: Context,
-        database: AppDatabase,
-        marker: ChallengeDatabaseFoldMarker,
-    ): ChallengeDatabaseFold = ChallengeDatabaseFold(context, database, marker)
-
     // DAO Providers - enable direct DAO injection without going through AppDatabase.
     // DAOs are lightweight proxies to the singleton database and do not need @Singleton scoping.
 
@@ -244,19 +208,6 @@ object InfrastructureModule {
     @Provides
     fun providePendingSignalDao(database: AppDatabase): PendingSignalDao = database.pendingSignalDao()
 
-    @Provides
-    fun provideChallengeDao(database: AppDatabase): ChallengeDao = database.challengeDao()
-
-    @Provides
-    fun provideChallengeHistoryDao(database: AppDatabase): ChallengeHistoryDao = database.challengeHistoryDao()
-
-    @Provides
-    fun provideChallengeStreakDao(database: AppDatabase): ChallengeStreakDao = database.challengeStreakDao()
-
-    @Provides
-    fun provideChallengePersonalRecordDao(database: AppDatabase): ChallengePersonalRecordDao =
-        database.challengePersonalRecordDao()
-
     @Provides
     fun provideXpLedgerDao(database: AppDatabase): XpLedgerDao = database.xpLedgerDao()
 

app/src/main/java/com/adsamcik/tracker/app/settings/GameSettingsViewModel.kt

@@ -1,32 +1,8 @@
 package com.adsamcik.tracker.app.settings
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.adsamcik.tracker.game.goals.settings.GoalsSettingsRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
-class GameSettingsViewModel @Inject constructor(
-    private val goalsSettingsRepository: GoalsSettingsRepository
-) : ViewModel() {
-
-    private val _challengeEnabled = MutableStateFlow(true)
-    val challengeEnabled: StateFlow<Boolean> = _challengeEnabled.asStateFlow()
-
-    init {
-        viewModelScope.launch {
-            goalsSettingsRepository.data.collect { _challengeEnabled.value = it.challengesEnabled }
-        }
-    }
-
-    fun setChallengeEnabled(enabled: Boolean) {
-        viewModelScope.launch {
-            goalsSettingsRepository.setChallengesEnabled(enabled)
-        }
-    }
-}
+class GameSettingsViewModel @Inject constructor() : ViewModel()

app/src/main/java/com/adsamcik/tracker/app/settings/game/GameSettingsScreen.kt

@@ -7,50 +7,24 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
-import com.adsamcik.tracker.app.settings.GameSettingsViewModel
 import com.adsamcik.tracker.app.settings.components.SectionHeader
-import com.adsamcik.tracker.app.settings.components.SwitchSettingsItem
 
 @Composable
-fun GameSettingsScreen(
-    viewModel: GameSettingsViewModel = hiltViewModel()
-) {
-    val challengeEnabled by viewModel.challengeEnabled.collectAsStateWithLifecycle()
-
-    LazyColumn(
-        modifier = Modifier.fillMaxSize(),
-        contentPadding = PaddingValues(top = 8.dp, bottom = 88.dp)
-    ) {
-        // Challenges section
-        item {
-            SectionHeader(stringResource(com.adsamcik.tracker.game.R.string.settings_game_challenge_category_title))
-        }
-
-        item {
-            SwitchSettingsItem(
-                title = stringResource(com.adsamcik.tracker.game.R.string.settings_game_challenge_enable_title),
-                checked = challengeEnabled,
-                onCheckedChange = { viewModel.setChallengeEnabled(it) }
-            )
-        }
-
-        // Goals section
-        item {
-            SectionHeader(stringResource(com.adsamcik.tracker.game.R.string.settings_game_goals_category_title))
-        }
-
-        item {
-            Text(
-                text = stringResource(com.adsamcik.tracker.R.string.settings_game_goals_managed_hint),
-                style = MaterialTheme.typography.bodyMedium,
-                modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
-            )
-        }
-    }
+fun GameSettingsScreen() {
+	LazyColumn(
+		modifier = Modifier.fillMaxSize(),
+		contentPadding = PaddingValues(top = 8.dp, bottom = 88.dp),
+	) {
+		item { SectionHeader(stringResource(com.adsamcik.tracker.game.R.string.settings_game_goals_category_title)) }
+		item {
+			Text(
+				text = stringResource(com.adsamcik.tracker.R.string.settings_game_goals_managed_hint),
+				style = MaterialTheme.typography.bodyMedium,
+				modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+			)
+		}
+	}
 }

app/src/main/java/com/adsamcik/tracker/app/ui/MainRoot.kt

@@ -63,7 +63,7 @@ import com.adsamcik.tracker.app.ui.navigation.Stats
 import com.adsamcik.tracker.app.ui.navigation.Map
 import com.adsamcik.tracker.app.ui.navigation.MapTripContext
 import com.adsamcik.tracker.app.ui.navigation.Game
-import com.adsamcik.tracker.app.ui.navigation.TrophyCase
+import com.adsamcik.tracker.app.ui.navigation.Achievements
 import com.adsamcik.tracker.app.ui.navigation.TripDetail
 import com.adsamcik.tracker.app.ui.navigation.History
 import com.adsamcik.tracker.app.ui.navigation.Debug
@@ -122,7 +122,6 @@ fun MainRoot(
     }
     var settingsLaunchNonce by remember { mutableStateOf(0L) }
     var tripDetailFallbackRoute by remember { mutableStateOf<AppRoute>(Stats) }
-    var gameChallengePickerRequest by remember { mutableStateOf(0L) }
 
     // Phase 2: Precision upgrade prompt state
     val context = LocalContext.current
@@ -158,7 +157,7 @@ fun MainRoot(
                 destination.hasRoute<Map>() -> Map
                 destination.hasRoute<MapTripContext>() -> Map
                 destination.hasRoute<Game>() -> Game
-                destination.hasRoute<TrophyCase>() -> TrophyCase
+                destination.hasRoute<Achievements>() -> Achievements
                 destination.hasRoute<TripDetail>() -> Stats
                 destination.hasRoute<History>() -> Stats
                 destination.hasRoute<Debug>() -> Debug
@@ -302,7 +301,7 @@ fun MainRoot(
                 destination.hasRoute<ActivitySettings>() ||
                 destination.hasRoute<TripDetail>() ||
                 destination.hasRoute<History>() ||
-                destination.hasRoute<TrophyCase>()
+                destination.hasRoute<Achievements>()
     } == true
     val effectiveRouteObj = currentRouteObj ?: navItems.find { it.id == lastTopLevelRoute }
     val isDashboard = effectiveRouteObj?.id == Dashboard
@@ -395,10 +394,6 @@ fun MainRoot(
                     useSideRail = useSideRail,
                     onOpenSettings = { openSettings(Dashboard) },
                     onSetTripDetailFallback = { tripDetailFallbackRoute = it },
-                    onOpenChallenges = {
-                        gameChallengePickerRequest += 1L
-                        navController.navigate(Game) { launchSingleTop = true }
-                    },
                 )
                 mapGraph(useSideRail = useSideRail)
                 statsGraph(
@@ -408,7 +403,6 @@ fun MainRoot(
                 )
                 gameGraph(
                     navController = navController,
-                    openChallengePickerRequest = gameChallengePickerRequest,
                     onOpenSettings = { openSettings(Game) },
                 )
                 settingsGraph(navController = navController)

app/src/main/java/com/adsamcik/tracker/app/ui/navigation/DashboardNavGraph.kt

@@ -17,7 +17,6 @@ internal fun NavGraphBuilder.dashboardGraph(
     useSideRail: Boolean,
     onOpenSettings: () -> Unit,
     onSetTripDetailFallback: (AppRoute) -> Unit,
-    onOpenChallenges: () -> Unit,
 ) {
     composable<Dashboard> {
         com.adsamcik.tracker.dashboard.ui.compose.DashboardRoute(
@@ -34,7 +33,6 @@ internal fun NavGraphBuilder.dashboardGraph(
                     restoreState = true
                 }
             },
-            onOpenChallenges = onOpenChallenges,
             onSessionDetailClick = { sessionId ->
                 onSetTripDetailFallback(Dashboard)
                 navController.navigate(TripDetail(sessionId)) {

app/src/main/java/com/adsamcik/tracker/app/ui/navigation/GameNavGraph.kt

@@ -5,36 +5,29 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 
-/**
- * Game-related destinations: Game screen and Trophy case.
- */
 internal fun NavGraphBuilder.gameGraph(
-    navController: NavHostController,
-    openChallengePickerRequest: Long,
-    onOpenSettings: () -> Unit,
+	navController: NavHostController,
+	onOpenSettings: () -> Unit,
 ) {
-    composable<Game> {
-        com.adsamcik.tracker.game.ui.compose.GameRoute(
-            openChallengePickerRequest = openChallengePickerRequest,
-            onOpenSettings = onOpenSettings,
-            onNavigateToTrophyCase = {
-                navController.navigate(TrophyCase) {
-                    launchSingleTop = true
-                }
-            },
-            onNavigateToTracker = {
-                navController.navigate(Dashboard) {
-                    popUpTo(navController.graph.findStartDestination().id) { saveState = true }
-                    launchSingleTop = true
-                    restoreState = true
-                }
-            },
-        )
-    }
+	composable<Game> {
+		com.adsamcik.tracker.game.ui.compose.GameRoute(
+			onOpenSettings = onOpenSettings,
+			onNavigateToAchievements = {
+				navController.navigate(Achievements) { launchSingleTop = true }
+			},
+			onNavigateToTracker = {
+				navController.navigate(Dashboard) {
+					popUpTo(navController.graph.findStartDestination().id) { saveState = true }
+					launchSingleTop = true
+					restoreState = true
+				}
+			},
+		)
+	}
 
-    composable<TrophyCase> {
-        com.adsamcik.tracker.game.ui.compose.TrophyCaseRoute(
-            onBack = { navController.popBackStack() },
-        )
-    }
+	composable<Achievements> {
+		com.adsamcik.tracker.game.ui.compose.AchievementDetailRoute(
+			onBack = { navController.popBackStack() },
+		)
+	}
 }

app/src/main/java/com/adsamcik/tracker/app/ui/navigation/Routes.kt

@@ -31,7 +31,7 @@ data class MapTripContext(
 data object Game : AppRoute
 
 @Serializable
-data object TrophyCase : AppRoute
+data object Achievements : AppRoute
 
 @Serializable
 data class TripDetail(val tripId: Long) : AppRoute