From 8d7db34871e50fa915853ac31364e51519a8b397 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 07:44:37 +0100
Subject: [PATCH 01/18] feat: Add MainData to UserData and define MainData
 sealed class

Added a new property `mainData` of type `MainData` to the `UserData` data class.
Created a new sealed class `MainData` with the following subtypes:
- `Note`
- `Achieve`
- `Trash`
- `Label` (data class with an `id` property)
- `Remainder`

Each subtype of `MainData` has an `index` property.
---
 .../src/main/java/com/mshdabiola/model/MainData.kt    | 11 +++++++++++
 .../src/main/java/com/mshdabiola/model/UserData.kt    |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 modules/model/src/main/java/com/mshdabiola/model/MainData.kt

diff --git a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
new file mode 100644
index 00000000..e8b9bf6d
--- /dev/null
+++ b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
@@ -0,0 +1,11 @@
+package com.mshdabiola.model
+
+
+sealed class MainData(val index: Long) {
+    object Note : MainData(-1L)
+    object Achieve : MainData(-2L)
+    object Trash : MainData(-3L)
+    data class Label (val id: Long): MainData(0L) // Assigning a default index like in the original enum
+    object Remainder : MainData(-4L)
+
+}
\ No newline at end of file
diff --git a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
index d85c4333..fe71348f 100644
--- a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
+++ b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
@@ -13,4 +13,5 @@ data class UserData(
     val useDynamicColor: Boolean,
     val shouldHideOnboarding: Boolean,
     val contrast: Contrast,
+    val mainData: MainData
 )

From 9610bcad8249c21f9e98beecd789aefad9783a7b Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 07:45:09 +0100
Subject: [PATCH 02/18] Feat: Add main screen type to UserPreferences

This commit introduces a new field `main_screen_type` to the `UserPreferences` proto and updates `UserPreferencesRepository` to support managing the main screen's data type.

- Added `main_screen_type` (int64) to `user_preferences.proto`.
- Updated `UserPreferencesRepository` to map the stored `main_screen_type` integer to the corresponding `MainData` sealed class (Note, Achieve, Trash, Remainder, Label).
- Added `setMainData` function to `UserPreferencesRepository` to update the `main_screen_type` in DataStore.
---
 .../datastore/UserPreferencesRepository.kt         | 14 ++++++++++++++
 .../mshdabiola/datastore/user_preferences.proto    |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
index fb0eb3d4..81dd8f12 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
@@ -6,6 +6,8 @@ package com.mshdabiola.datastore
 
 import androidx.datastore.core.DataStore
 import com.mshdabiola.model.Contrast
+import com.mshdabiola.model.MainData
+import com.mshdabiola.model.NoteType
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -53,6 +55,13 @@ class UserPreferencesRepository @Inject constructor(
 
                     ThemeContrastProto.THEME_CONTRAST_MEDIUM -> Contrast.Medium
                 },
+                mainData = when (it.mainScreenType) {
+                    MainData.Note.index -> MainData.Note
+                    MainData.Achieve.index -> MainData.Achieve
+                    MainData.Trash.index -> MainData.Trash
+                    MainData.Remainder.index -> MainData.Remainder
+                    else -> MainData.Label(it.mainScreenType)
+                }
             )
         }
 
@@ -104,4 +113,9 @@ class UserPreferencesRepository @Inject constructor(
             it.copy { this.shouldHideOnboarding = shouldHideOnboarding }
         }
     }
+    suspend fun setMainData(mainData: MainData) {
+        userPreferences.updateData {
+            it.copy { this.mainScreenType = mainData.index }
+        }
+    }
 }
diff --git a/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto b/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
index 889c9e74..25016c02 100644
--- a/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
+++ b/modules/datastore/src/main/proto/com/mshdabiola/datastore/user_preferences.proto
@@ -19,6 +19,7 @@ message UserPreferences {
 
     ThemeContrastProto contrast = 5;
 
+    int64 main_screen_type = 6;
 
-    // NEXT AVAILABLE ID: 6
+    // NEXT AVAILABLE ID: 7 // Update this comment for the next person
 }

From bd172590ab01870be8df54422adf1919c8aa9963 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 07:45:17 +0100
Subject: [PATCH 03/18] Refactor: Add `mainData` to `MainActivityUiState`

Added a new field `mainData` to the `MainActivityUiState` data class in `SharedActivityViewModel.kt`. This field is of type `MainData` and defaults to `MainData.Note`.

The `mainData` field will be used to determine which main screen content to display (e.g., Notes, Labels).
---
 .../java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
index 73f0b7f7..f0649a46 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
@@ -13,6 +13,7 @@ import com.mshdabiola.data.repository.INotePadRepository
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
 import com.mshdabiola.model.Label
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NoteImage
 import com.mshdabiola.model.NotePad
 import com.mshdabiola.model.ThemeBrand
@@ -156,6 +157,7 @@ sealed interface SharedActivityUiState {
             useDynamicColor = false,
             shouldHideOnboarding = false,
             contrast = Contrast.High,
+            mainData = MainData.Note
         ),
         val notepad: NotePad = NotePad(),
         val labels: List<Label> = emptyList(),

From 295ab35fe1a44f90cefdd1f4e16270734f11c135 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 09:27:05 +0100
Subject: [PATCH 04/18] Refactor: Add trailing comma in UserData.kt

Added a trailing comma to the `mainData` property in the `UserData` data class. This is a stylistic change for consistency.

Also, removed an extra newline from the end of `MainData.kt`.
---
 .../model/src/main/java/com/mshdabiola/model/MainData.kt    | 6 ++----
 .../model/src/main/java/com/mshdabiola/model/UserData.kt    | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
index e8b9bf6d..65e693c1 100644
--- a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
+++ b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
@@ -1,11 +1,9 @@
 package com.mshdabiola.model
 
-
 sealed class MainData(val index: Long) {
     object Note : MainData(-1L)
     object Achieve : MainData(-2L)
     object Trash : MainData(-3L)
-    data class Label (val id: Long): MainData(0L) // Assigning a default index like in the original enum
+    data class Label(val id: Long) : MainData(0L) // Assigning a default index like in the original enum
     object Remainder : MainData(-4L)
-
-}
\ No newline at end of file
+}
diff --git a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
index fe71348f..6e7c97d3 100644
--- a/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
+++ b/modules/model/src/main/java/com/mshdabiola/model/UserData.kt
@@ -13,5 +13,5 @@ data class UserData(
     val useDynamicColor: Boolean,
     val shouldHideOnboarding: Boolean,
     val contrast: Contrast,
-    val mainData: MainData
+    val mainData: MainData,
 )

From ab26de46a3459bbbc5f15d88b595b683eb362815 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 09:27:20 +0100
Subject: [PATCH 05/18] Refactor: Update `setMainData` to accept `Long`

The `setMainData` function in `UserPreferencesRepository.kt` now accepts a `Long` parameter named `index` instead of a `MainData` object.

The function's implementation was updated to directly use the `index` parameter when setting the `mainScreenType` in user preferences.
---
 .../com/mshdabiola/datastore/UserPreferencesRepository.kt     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
index 81dd8f12..7718cc2c 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
@@ -113,9 +113,9 @@ class UserPreferencesRepository @Inject constructor(
             it.copy { this.shouldHideOnboarding = shouldHideOnboarding }
         }
     }
-    suspend fun setMainData(mainData: MainData) {
+    suspend fun setMainData(index: Long) {
         userPreferences.updateData {
-            it.copy { this.mainScreenType = mainData.index }
+            it.copy { this.mainScreenType = index }
         }
     }
 }

From 038d7d5314f1336cddee88e087c4a02b1a3ed838 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 09:27:31 +0100
Subject: [PATCH 06/18] Feat: Add `setMainData` to `UserDataRepository`

This commit introduces a new function `setMainData(mainData: Long)` to the `UserDataRepository` interface and its implementation `OfflineFirstUserDataRepository`.

This function allows setting a `Long` value, presumably related to main application data, which is then stored via the `userPreferencesRepository`.

- Added `suspend fun setMainData(mainData: Long)` to `UserDataRepository.kt`
- Implemented `setMainData` in `OfflineFirstUserDataRepository.kt` to call `userPreferencesRepository.setMainData(mainData)`
---
 .../data/repository/OfflineFirstUserDataRepository.kt         | 4 ++++
 .../com/mshdabiola/data/repository/UserDataRepository.kt      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
index c707da27..ed22518e 100644
--- a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
+++ b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepository.kt
@@ -45,4 +45,8 @@ internal class OfflineFirstUserDataRepository @Inject constructor(
         userPreferencesRepository.setShouldHideOnboarding(shouldHideOnboarding)
         analyticsHelper.logOnboardingStateChanged(shouldHideOnboarding)
     }
+
+    override suspend fun setMainData(mainData: Long) {
+        userPreferencesRepository.setMainData(mainData)
+    }
 }
diff --git a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
index 422b982c..1a91e468 100644
--- a/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
+++ b/modules/data/src/main/kotlin/com/mshdabiola/data/repository/UserDataRepository.kt
@@ -35,4 +35,5 @@ interface UserDataRepository {
      * Sets whether the user has completed the onboarding process.
      */
     suspend fun setShouldHideOnboarding(shouldHideOnboarding: Boolean)
+    suspend fun setMainData(mainData: Long)
 }

From e9c30d08ee896bb907c22856b464d7db9b87e55c Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 09:27:41 +0100
Subject: [PATCH 07/18] Refactor: Remove navigation argument from MainScreen

Removed the `TypeArg` navigation argument from `MainRoute`. The `MainViewModel` now retrieves the main data type from `UserDataRepository` instead of `SavedStateHandle`.

This change simplifies the navigation to `MainScreen` and centralizes the logic for determining the content to display.

Files affected:
- `feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt`
- `feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt`
---
 .../com/mshdabiola/main/MainViewModel.kt      | 12 +++++--
 .../main/navigation/MainNavigation.kt         | 35 ++-----------------
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
index c706551d..fbafffa3 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
@@ -11,7 +11,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mshdabiola.common.IAlarmManager
 import com.mshdabiola.data.repository.INotePadRepository
+import com.mshdabiola.data.repository.UserDataRepository
 import com.mshdabiola.main.navigation.MainArg
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NoteType
 import com.mshdabiola.ui.state.DateDialogUiData
 import com.mshdabiola.ui.state.DateListUiState
@@ -20,11 +22,14 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -49,10 +54,13 @@ internal class MainViewModel
     savedStateHandle: SavedStateHandle,
     private val notepadRepository: INotePadRepository,
     private val alarmManager: IAlarmManager,
+    userDataRepository: UserDataRepository
 ) : ViewModel() {
 
     val searchState = TextFieldState()
-    private val mainArg = MainArg(savedStateHandle)
+    private val mainArg = userDataRepository.userData
+        .mapLatest { it.mainData }
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), MainData.Note)
     private val _mainState = MutableStateFlow<MainState>(MainState.Loading)
     val mainState = _mainState.asStateFlow()
 
@@ -120,7 +128,7 @@ internal class MainViewModel
                     } else {
 
                         val list =
-                            when (mainArg.noteType) {
+                            when (mainArg.value) {
                                 NoteType.LABEL -> {
                                     notepad.filter { it.labels.any { it.id == mainArg.type } }
                                 }
diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
index 682d757b..5738ede7 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/navigation/MainNavigation.kt
@@ -7,24 +7,18 @@ package com.mshdabiola.main.navigation
 import androidx.compose.animation.ExperimentalSharedTransitionApi
 import androidx.compose.animation.SharedTransitionScope
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
-import androidx.navigation.NavType
 import androidx.navigation.compose.composable
-import androidx.navigation.navArgument
 import com.mshdabiola.main.MainRoute
-import com.mshdabiola.model.NoteType
 
 fun NavController.navigateToMain(
-    type: Long,
     navOptions: NavOptions = androidx.navigation.navOptions { },
-) = navigate(route = "$MainRoute/$type", navOptions)
+) = navigate(route = MainRoute, navOptions)
 
 const val MainRoute = "main"
-const val TypeArg = "mainArg"
-const val FullMainRoute = "$MainRoute/{$TypeArg}"
+const val FullMainRoute = MainRoute
 
 @OptIn(ExperimentalSharedTransitionApi::class)
 fun NavGraphBuilder.mainScreen(
@@ -37,12 +31,6 @@ fun NavGraphBuilder.mainScreen(
 ) {
     composable(
         route = FullMainRoute,
-        arguments = listOf(
-            navArgument(TypeArg) {
-                type = NavType.LongType
-                defaultValue = -1L
-            },
-        ),
     ) {
         MainRoute(
             modifier = modifier,
@@ -55,22 +43,3 @@ fun NavGraphBuilder.mainScreen(
         )
     }
 }
-
-//
-//
-internal class MainArg(val type: Long) {
-    val noteType: NoteType = when (type) {
-        NoteType.NOTE.index -> NoteType.NOTE
-        NoteType.ARCHIVE.index -> NoteType.ARCHIVE
-        NoteType.TRASH.index -> NoteType.TRASH
-        NoteType.REMAINDER.index -> NoteType.REMAINDER
-        else -> NoteType.LABEL
-    }
-
-    constructor(savedStateHandle: SavedStateHandle) :
-        this(
-            type = checkNotNull(savedStateHandle[TypeArg]),
-
-        )
-}
-//

From a1948e79f76895f2ffad9a4eb8d960d5209ea488 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 09:27:51 +0100
Subject: [PATCH 08/18] Refactor: Improve navigation and main data handling

This commit introduces changes to how main data (e.g., Note, Checklist) is handled and improves navigation within the application.

- Modified `SharedActivityViewModel` to correctly initialize `mainData` in `UserData`.
- Added `setMainData` function to `MainActivityViewModel` to allow updating the main data type (Note or Checklist) in `UserDataRepository`.
- Updated `NoteApp` to:
    - Use `uiState` from `MainActivityViewModel` to determine the current `mainData` for the `MainNavigation` drawer.
    - Call `viewModel.setMainData(it)` when a navigation item in the drawer is selected.
    - Navigate to the main screen without passing the type argument, as this is now handled by `setMainData`.
- Removed the `mainArg` property from `NoteAppState` as it's no longer needed for determining the main screen's content type.
---
 .../playnotepad/MainActivityViewModel.kt         |  9 ++++++++-
 .../playnotepad/SharedActivityViewModel.kt       |  2 +-
 .../com/mshdabiola/playnotepad/ui/NoteApp.kt     | 16 +++++++---------
 .../mshdabiola/playnotepad/ui/NoteAppState.kt    |  8 ++++----
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
index 8f487319..c307366a 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
@@ -19,11 +19,12 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
 class MainActivityViewModel @Inject constructor(
-    userDataRepository: UserDataRepository,
+    private val userDataRepository: UserDataRepository,
     private val notePadRepository: INotePadRepository,
     private val labelRepository: ILabelRepository,
 
@@ -113,6 +114,12 @@ class MainActivityViewModel @Inject constructor(
         )
         return notePadRepository.upsert(notePad)
     }
+
+    fun setMainData(mainData: Long) {
+        viewModelScope.launch {
+            userDataRepository.setMainData(mainData)
+        }
+    }
 }
 
 sealed interface MainActivityUiState {
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
index f0649a46..50667fb0 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/SharedActivityViewModel.kt
@@ -157,7 +157,7 @@ sealed interface SharedActivityUiState {
             useDynamicColor = false,
             shouldHideOnboarding = false,
             contrast = Contrast.High,
-            mainData = MainData.Note
+            mainData = MainData.Note,
         ),
         val notepad: NotePad = NotePad(),
         val labels: List<Label> = emptyList(),
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
index c645020a..cd110c1d 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
@@ -53,6 +53,8 @@ import com.mshdabiola.detail.navigation.navigateToDetail
 import com.mshdabiola.drawing.navigateToDrawing
 import com.mshdabiola.labelscreen.navigateToLabel
 import com.mshdabiola.main.navigation.navigateToMain
+import com.mshdabiola.model.MainData
+import com.mshdabiola.playnotepad.MainActivityUiState
 import com.mshdabiola.playnotepad.MainActivityViewModel
 import com.mshdabiola.playnotepad.navigation.NoteNavHost
 import com.mshdabiola.setting.navigation.navigateToSetting
@@ -69,6 +71,7 @@ fun NoteApp(
 ) {
     val shouldShowGradientBackground = true
     val labels = viewModel.labels.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     var showAudio by remember { mutableStateOf(false) }
     var showImage by remember { mutableStateOf(false) }
 
@@ -98,17 +101,12 @@ fun NoteApp(
                 drawerContent = {
                     MainNavigation(
                         labels = labels.value,
-                        currentMainArg = appState.mainArg,
+                        currentMainArg = (uiState as? MainActivityUiState.Success)
+                            ?.userData?.mainData?.index ?: MainData.Note.index,
                         onNavigation = {
-                            //  onNavigationNoteType(it)
-//                            appState.navController.navigateToMain()
+                            viewModel.setMainData(it)
                             appState.navController.popBackStack()
-                            appState.navController.navigateToMain(
-                                it,
-                                navOptions {
-                                    //  this.launchSingleTop=true
-                                },
-                            )
+                            appState.navController.navigateToMain()
                             appState.closeDrawer()
                         },
                         navigateToLevel = {
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
index 31e9e1a1..79d156f0 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
@@ -61,10 +61,10 @@ class NoteAppState(
         @Composable get() = navController
             .currentBackStackEntryAsState().value?.destination?.route ?: ""
 
-    val mainArg: Long
-        @Composable get() = navController.currentBackStackEntryAsState().value?.arguments?.getLong(
-            TypeArg,
-        ) ?: NoteType.NOTE.index
+//    val mainArg: Long
+//        @Composable get() = navController.currentBackStackEntryAsState().value?.arguments?.getLong(
+//            TypeArg,
+//        ) ?: NoteType.NOTE.index
 
     //            navController
 //            .currentBackStackEntryAsState().value?.toRoute<Main>() ?:

From 6e301732eddaec466ddb0ee850183f35c74dcaf2 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:23:50 +0100
Subject: [PATCH 09/18] Feat: Integrate MainData into MainState and ViewModel

This commit introduces `MainData` into the `MainState` to manage the type of notes being displayed (e.g., standard notes, labeled notes, reminders).

- Added `mainData: MainData` property to `MainState.Success`.
- `MainViewModel` now observes `userDataRepository.userData` to update `mainData` in `MainState.Success`.
- Logic for filtering notes in `MainViewModel` now uses `mainState.mainData` instead of a separate `mainArg` StateFlow.
- When `MainState` is initialized to `Success` with an empty list, it now also sets the initial `mainData` fetched from `userDataRepository`.
---
 .../kotlin/com/mshdabiola/main/MainState.kt   |  2 ++
 .../com/mshdabiola/main/MainViewModel.kt      | 30 ++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
index 1a534ddf..432d7bd8 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainState.kt
@@ -1,5 +1,6 @@
 package com.mshdabiola.main
 
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NotePad
 import com.mshdabiola.model.NoteType
 
@@ -13,6 +14,7 @@ sealed class MainState {
         val color: List<SearchSort.Color> = emptyList(),
         val label: List<SearchSort.Label> = emptyList(),
         val searchSort: SearchSort? = null,
+        val mainData: MainData = MainData.Note,
 
     ) : MainState()
 
diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
index fbafffa3..19317a9e 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
@@ -12,7 +12,6 @@ import androidx.lifecycle.viewModelScope
 import com.mshdabiola.common.IAlarmManager
 import com.mshdabiola.data.repository.INotePadRepository
 import com.mshdabiola.data.repository.UserDataRepository
-import com.mshdabiola.main.navigation.MainArg
 import com.mshdabiola.model.MainData
 import com.mshdabiola.model.NoteType
 import com.mshdabiola.ui.state.DateDialogUiData
@@ -28,6 +27,7 @@ import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
@@ -58,13 +58,19 @@ internal class MainViewModel
 ) : ViewModel() {
 
     val searchState = TextFieldState()
-    private val mainArg = userDataRepository.userData
-        .mapLatest { it.mainData }
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), MainData.Note)
+
+
     private val _mainState = MutableStateFlow<MainState>(MainState.Loading)
     val mainState = _mainState.asStateFlow()
 
     init {
+        viewModelScope.launch {
+            userDataRepository.userData.collectLatest {
+                if (mainState.value is MainState.Success){
+                    _mainState.value = getSuccess().copy(mainData = it.mainData)
+                }
+            }
+        }
 
         viewModelScope.launch {
             combine(
@@ -128,18 +134,18 @@ internal class MainViewModel
                     } else {
 
                         val list =
-                            when (mainArg.value) {
-                                NoteType.LABEL -> {
-                                    notepad.filter { it.labels.any { it.id == mainArg.type } }
+                            when (mainState.mainData) {
+                                is MainData.Label -> {
+                                    notepad.filter { it.labels.any { it.id == mainState.mainData.index } }
                                 }
 
-                                NoteType.REMAINDER -> {
+                                is MainData.Remainder -> {
                                     notepad.filter { it.reminder > 0 }
                                 }
 
                                 else -> {
                                     notepad.filter {
-                                        it.noteType == mainArg.noteType
+                                        it.noteType.index == mainState.mainData.index
                                     }
                                 }
                             }
@@ -147,10 +153,12 @@ internal class MainViewModel
                             notePads = list,
                         )
                     }
-                } else {
-
+                }
+                else {
+                    val mainData = userDataRepository.userData.mapLatest { it.mainData }.firstOrNull() ?: MainData.Note
                     _mainState.value = MainState.Success(
                         notePads = emptyList(),
+                        mainData = mainData,
                     )
 
                     initDate()

From b125b997bde6facc32e32671a67fc478ddbd5327 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:24:23 +0100
Subject: [PATCH 10/18] Refactor: Update main screen on label deletion

When a label is deleted in `LabelViewModel`, the `userDataRepository.setMainData` method is now called with `MainData.Note.index`. This ensures that the main screen is updated to reflect the change, likely by navigating to the notes screen.
---
 .../main/java/com/mshdabiola/labelscreen/LabelViewModel.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt b/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
index f6ec0b4d..106a7137 100644
--- a/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
+++ b/feature/labelscreen/src/main/java/com/mshdabiola/labelscreen/LabelViewModel.kt
@@ -9,6 +9,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.navigation.toRoute
 import com.mshdabiola.data.repository.ILabelRepository
+import com.mshdabiola.data.repository.UserDataRepository
+import com.mshdabiola.model.MainData
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.flow.collectLatest
@@ -20,6 +22,7 @@ import javax.inject.Inject
 class LabelViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val labelRepository: ILabelRepository,
+    private val userDataRepository: UserDataRepository,
 ) : ViewModel() {
 
     var labelScreenUiState by mutableStateOf(LabelScreenUiState())
@@ -58,6 +61,7 @@ class LabelViewModel @Inject constructor(
         labels.removeAt(index)
         labelScreenUiState = labelScreenUiState.copy(labels = labels.toImmutableList())
         viewModelScope.launch {
+            userDataRepository.setMainData(MainData.Note.index)
             labelRepository.delete(id)
         }
     }

From 6929ee5f0ff1937b8aa0695de2cd7985a58b56ea Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:24:37 +0100
Subject: [PATCH 11/18] Refactor: Update SharingStarted strategy and remove
 unused imports

Modified `SharingStarted.WhileSubscribed` in `MainActivityViewModel.kt` to remove the 5-second timeout.
Removed unused imports `TypeArg` and `NoteType` from `NoteAppState.kt`.

- `SharingStarted.WhileSubscribed(5_000)` -> `SharingStarted.WhileSubscribed()` in `MainActivityViewModel.kt`
---
 .../java/com/mshdabiola/playnotepad/MainActivityViewModel.kt    | 2 +-
 app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
index c307366a..9254b7ef 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/MainActivityViewModel.kt
@@ -35,7 +35,7 @@ class MainActivityViewModel @Inject constructor(
         }.stateIn(
             scope = viewModelScope,
             initialValue = MainActivityUiState.Loading,
-            started = SharingStarted.WhileSubscribed(5_000),
+            started = SharingStarted.WhileSubscribed(),
         )
 
     val labels = labelRepository
diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
index 79d156f0..e3e22de6 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteAppState.kt
@@ -17,8 +17,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.mshdabiola.data.util.NetworkMonitor
 import com.mshdabiola.main.navigation.MainRoute
-import com.mshdabiola.main.navigation.TypeArg
-import com.mshdabiola.model.NoteType
 import com.mshdabiola.ui.TrackDisposableJank
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted

From ea444c51046acec3924ef750602cfdffcc4c5963 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:52:38 +0100
Subject: [PATCH 12/18] Refactor: Remove unused NoteType import

Removed the unused import `com.mshdabiola.model.NoteType` from `UserPreferencesRepository.kt`.
---
 .../com/mshdabiola/datastore/UserPreferencesRepository.kt      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
index 7718cc2c..c3665404 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/UserPreferencesRepository.kt
@@ -7,7 +7,6 @@ package com.mshdabiola.datastore
 import androidx.datastore.core.DataStore
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.MainData
-import com.mshdabiola.model.NoteType
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
@@ -61,7 +60,7 @@ class UserPreferencesRepository @Inject constructor(
                     MainData.Trash.index -> MainData.Trash
                     MainData.Remainder.index -> MainData.Remainder
                     else -> MainData.Label(it.mainScreenType)
-                }
+                },
             )
         }
 

From 1212bcfa471f3d03ac0ea928f6d87dd9934117d7 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:52:51 +0100
Subject: [PATCH 13/18] Refactor: Simplify MainViewModel

This commit refactors the `MainViewModel.kt` file.

- Removed unused imports: `SharingStarted` and `stateIn`.
- Simplified conditional logic for updating `_mainState.value` based on `userDataRepository.userData`.
- Streamlined the logic for initializing `_mainState.value` within the `init` block by directly checking the current state.
---
 .../main/kotlin/com/mshdabiola/main/MainViewModel.kt   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
index 19317a9e..71a18f34 100644
--- a/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
+++ b/feature/main/src/main/kotlin/com/mshdabiola/main/MainViewModel.kt
@@ -21,7 +21,6 @@ import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.combine
@@ -29,7 +28,6 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.mapLatest
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -54,19 +52,18 @@ internal class MainViewModel
     savedStateHandle: SavedStateHandle,
     private val notepadRepository: INotePadRepository,
     private val alarmManager: IAlarmManager,
-    userDataRepository: UserDataRepository
+    userDataRepository: UserDataRepository,
 ) : ViewModel() {
 
     val searchState = TextFieldState()
 
-
     private val _mainState = MutableStateFlow<MainState>(MainState.Loading)
     val mainState = _mainState.asStateFlow()
 
     init {
         viewModelScope.launch {
             userDataRepository.userData.collectLatest {
-                if (mainState.value is MainState.Success){
+                if (mainState.value is MainState.Success) {
                     _mainState.value = getSuccess().copy(mainData = it.mainData)
                 }
             }
@@ -153,8 +150,7 @@ internal class MainViewModel
                             notePads = list,
                         )
                     }
-                }
-                else {
+                } else {
                     val mainData = userDataRepository.userData.mapLatest { it.mainData }.firstOrNull() ?: MainData.Note
                     _mainState.value = MainState.Success(
                         notePads = emptyList(),

From 14b6b66bbd7a2b6a0f6e1d2d066f10fda998b08d Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 11:52:58 +0100
Subject: [PATCH 14/18] Refactor: Remove unused import in NoteApp

Removed the `androidx.navigation.navOptions` import from `NoteApp.kt` as it was no longer needed.
---
 app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
index cd110c1d..7d29ccf0 100644
--- a/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
+++ b/app/src/main/java/com/mshdabiola/playnotepad/ui/NoteApp.kt
@@ -41,7 +41,6 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.navOptions
 import com.mshdabiola.about.navigateToAbout
 import com.mshdabiola.designsystem.component.NoteBackground
 import com.mshdabiola.designsystem.component.NoteGradientBackground

From f8e7b343ee6997bdcfb257ca9af8750031ebb709 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 19:28:26 +0100
Subject: [PATCH 15/18] Test: Implement setMainData in fake and test
 repositories

This commit adds the `setMainData` method to `FakeUserDataRepository` and `TestUserDataRepository`.

- In `FakeUserDataRepository`, `setMainData` now calls the corresponding method in `userPreferencesRepository`.
- In `TestUserDataRepository`, `setMainData` updates the `mainData` field of the current `UserData` to `MainData.Note` and emits the updated data.
- The initial `UserData` in `TestUserDataRepository` now includes `mainData = MainData.Note`.
---
 .../testing/fake/repository/FakeUserDataRepository.kt     | 4 ++++
 .../testing/repository/TestUserDataRepository.kt          | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt b/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
index 2ac482b3..0ee979e7 100644
--- a/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
+++ b/modules/testing/src/main/java/com/mshdabiola/testing/fake/repository/FakeUserDataRepository.kt
@@ -45,4 +45,8 @@ class FakeUserDataRepository @Inject constructor(
     override suspend fun setShouldHideOnboarding(shouldHideOnboarding: Boolean) {
         userPreferencesRepository.setShouldHideOnboarding(shouldHideOnboarding)
     }
+
+    override suspend fun setMainData(mainData: Long) {
+        userPreferencesRepository.setMainData(mainData)
+    }
 }
diff --git a/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt b/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
index 6ab45960..83fa144f 100644
--- a/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
+++ b/modules/testing/src/main/java/com/mshdabiola/testing/repository/TestUserDataRepository.kt
@@ -7,6 +7,7 @@ package com.mshdabiola.testing.repository
 import com.mshdabiola.data.repository.UserDataRepository
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.ThemeBrand
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.channels.BufferOverflow.DROP_OLDEST
@@ -20,6 +21,7 @@ val emptyUserData = UserData(
     useDynamicColor = false,
     shouldHideOnboarding = false,
     contrast = Contrast.High,
+    mainData = MainData.Note,
 )
 
 class TestUserDataRepository : UserDataRepository {
@@ -59,6 +61,12 @@ class TestUserDataRepository : UserDataRepository {
         }
     }
 
+    override suspend fun setMainData(mainData: Long) {
+        currentUserData.let { current ->
+            _userData.tryEmit(current.copy(mainData = MainData.Note))
+        }
+    }
+
     /**
      * A test-only API to allow setting of user data directly.
      */

From 9749081302db10b403911126a622ea4e088116a7 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 19:28:52 +0100
Subject: [PATCH 16/18] Refactor: Align MainData.Label index with its ID

Updated the `MainData.Label` class to use its `id` property as its `index`. Previously, it was hardcoded to `0L`.

- `MainData.Label(val id: Long) : MainData(0L)` -> `MainData.Label(val id: Long) : MainData(index = id)` in `MainData.kt`
---
 modules/model/src/main/java/com/mshdabiola/model/MainData.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
index 65e693c1..4431ff9e 100644
--- a/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
+++ b/modules/model/src/main/java/com/mshdabiola/model/MainData.kt
@@ -4,6 +4,6 @@ sealed class MainData(val index: Long) {
     object Note : MainData(-1L)
     object Achieve : MainData(-2L)
     object Trash : MainData(-3L)
-    data class Label(val id: Long) : MainData(0L) // Assigning a default index like in the original enum
+    data class Label(val id: Long) : MainData(index = id) // Assigning a default index like in the original enum
     object Remainder : MainData(-4L)
 }

From b09dde39c26deddb9a613b6f32fbb6fe19b98064 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 19:29:23 +0100
Subject: [PATCH 17/18] Refactor: Remove unused datastore migrations and
 classes

This commit removes several unused files related to data migrations and data classes from the `datastore` module.

- Deleted `ChangeListVersions.kt`.
- Deleted `IntToStringIdsMigration.kt` and its corresponding test file `IntToStringIdsMigrationTest.kt`.
- Deleted `ListToMapMigrationTest.kt`.
- Removed `IntToStringIdsMigration` from the `DataStoreModule.kt` as it's no longer needed.
---
 .../datastore/ChangeListVersions.kt           | 13 ----
 .../datastore/IntToStringIdsMigration.kt      | 23 -------
 .../datastore/di/DataStoreModule.kt           |  4 --
 .../datastore/IntToStringIdsMigrationTest.kt  | 18 ------
 .../datastore/ListToMapMigrationTest.kt       | 60 -------------------
 5 files changed, 118 deletions(-)
 delete mode 100644 modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt
 delete mode 100644 modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt
 delete mode 100644 modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt
 delete mode 100644 modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt

diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt
deleted file mode 100644
index 8cbb7046..00000000
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/ChangeListVersions.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-/**
- * Class summarizing the local version of each model for sync
- */
-data class ChangeListVersions(
-    val topicVersion: Int = -1,
-    val newsResourceVersion: Int = -1,
-)
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt
deleted file mode 100644
index 4c9c70b5..00000000
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/IntToStringIdsMigration.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-import androidx.datastore.core.DataMigration
-
-/**
- * Migrates saved ids from [Int] to [String] types
- */
-internal object IntToStringIdsMigration : DataMigration<UserPreferences> {
-
-    override suspend fun cleanUp() = Unit
-
-    override suspend fun migrate(currentData: UserPreferences): UserPreferences =
-        currentData.copy {
-            // Migrate topic ids
-        }
-
-    override suspend fun shouldMigrate(currentData: UserPreferences): Boolean =
-        true
-}
diff --git a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
index 722f4587..a30b9f7c 100644
--- a/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
+++ b/modules/datastore/src/main/kotlin/com/mshdabiola/datastore/di/DataStoreModule.kt
@@ -11,7 +11,6 @@ import androidx.datastore.dataStoreFile
 import com.mshdabiola.common.network.Dispatcher
 import com.mshdabiola.common.network.SkDispatchers.IO
 import com.mshdabiola.common.network.di.ApplicationScope
-import com.mshdabiola.datastore.IntToStringIdsMigration
 import com.mshdabiola.datastore.UserPreferences
 import com.mshdabiola.datastore.UserPreferencesSerializer
 import dagger.Module
@@ -38,9 +37,6 @@ object DataStoreModule {
         DataStoreFactory.create(
             serializer = userPreferencesSerializer,
             scope = CoroutineScope(scope.coroutineContext + ioDispatcher),
-            migrations = listOf(
-                IntToStringIdsMigration,
-            ),
         ) {
             context.dataStoreFile("user_preferences.pb")
         }
diff --git a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt b/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt
deleted file mode 100644
index 4333cecc..00000000
--- a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/IntToStringIdsMigrationTest.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-
-/**
- * Unit test for [IntToStringIdsMigration]
- */
-class IntToStringIdsMigrationTest {
-
-    @Test
-    fun IntToStringIdsMigration_should_migrate_topic_ids() = runTest {
-    }
-}
diff --git a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt b/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt
deleted file mode 100644
index c9c77808..00000000
--- a/modules/datastore/src/test/kotlin/com/mshdabiola/datastore/ListToMapMigrationTest.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *abiola 2024
- */
-
-package com.mshdabiola.datastore
-
-class ListToMapMigrationTest {
-//
-//    @Test
-//    fun ListToMapMigration_should_migrate_topic_ids() = runTest {
-//        // Set up existing preferences with topic ids
-//        val preMigrationUserPreferences = userPreferences {
-//            deprecatedFollowedTopicIds.addAll(listOf("1", "2", "3"))
-//        }
-//        // Assert that there are no topic ids in the map yet
-//        assertEquals(
-//            emptyMap<String, Boolean>(),
-//            preMigrationUserPreferences.followedTopicIdsMap,
-//        )
-//
-//        // Run the migration
-//        val postMigrationUserPreferences =
-//            ListToMapMigration.migrate(preMigrationUserPreferences)
-//
-//        // Assert the deprecated topic ids have been migrated to the topic ids map
-//        assertEquals(
-//            mapOf("1" to true, "2" to true, "3" to true),
-//            postMigrationUserPreferences.followedTopicIdsMap,
-//        )
-//
-//        // Assert that the migration has been marked complete
-//        assertTrue(postMigrationUserPreferences.hasDoneListToMapMigration)
-//    }
-//
-//    @Test
-//    fun ListToMapMigration_should_migrate_author_ids() = runTest {
-//        // Set up existing preferences with author ids
-//        val preMigrationUserPreferences = userPreferences {
-//            deprecatedFollowedAuthorIds.addAll(listOf("4", "5", "6"))
-//        }
-//        // Assert that there are no author ids in the map yet
-//        assertEquals(
-//            emptyMap<String, Boolean>(),
-//            preMigrationUserPreferences.followedAuthorIdsMap,
-//        )
-//
-//        // Run the migration
-//        val postMigrationUserPreferences =
-//            ListToMapMigration.migrate(preMigrationUserPreferences)
-//
-//        // Assert the deprecated author ids have been migrated to the author ids map
-//        assertEquals(
-//            mapOf("4" to true, "5" to true, "6" to true),
-//            postMigrationUserPreferences.followedAuthorIdsMap,
-//        )
-//
-//        // Assert that the migration has been marked complete
-//        assertTrue(postMigrationUserPreferences.hasDoneListToMapMigration)
-//    }
-}

From d0e7e9ca7d6d7ab9a02738073723299ccf984925 Mon Sep 17 00:00:00 2001
From: mshdabiola <mshdabiola@gmail.com>
Date: Tue, 10 Jun 2025 19:36:30 +0100
Subject: [PATCH 18/18] Refactor: Add mainData to UserData in tests

This commit updates `OfflineFirstUserDataRepositoryTest.kt` to include `mainData` in the `UserData` initialization.

- Added `MainData.Label(0)` as the initial value for the `mainData` property in the `UserData` object within the test setup.
---
 .../data/repository/OfflineFirstUserDataRepositoryTest.kt       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt b/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
index f38c05a4..ade379d6 100644
--- a/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
+++ b/modules/data/src/test/kotlin/com/mshdabiola/data/repository/OfflineFirstUserDataRepositoryTest.kt
@@ -9,6 +9,7 @@ import com.mshdabiola.datastore.UserPreferencesRepository
 import com.mshdabiola.datastore.di.testUserPreferencesDataStore
 import com.mshdabiola.model.Contrast
 import com.mshdabiola.model.DarkThemeConfig
+import com.mshdabiola.model.MainData
 import com.mshdabiola.model.ThemeBrand
 import com.mshdabiola.model.UserData
 import kotlinx.coroutines.flow.first
@@ -57,6 +58,7 @@ class OfflineFirstUserDataRepositoryTest {
                 useDynamicColor = false,
                 shouldHideOnboarding = false,
                 contrast = Contrast.Normal,
+                mainData = MainData.Label(0),
             ),
             subject.userData.first(),
         )