address review feedback

shared/build.gradle.kts

@@ -37,7 +37,8 @@ kotlin {
 
     compilerOptions {
         freeCompilerArgs.addAll(
-            "-Xexpect-actual-classes"
+            "-Xexpect-actual-classes",
+            "-Xexplicit-backing-fields"
         )
         optIn.addAll(
             "androidx.compose.material3.ExperimentalMaterial3Api",

shared/src/commonMain/kotlin/net/newpipe/app/screen/settings/SettingsHomeScreen.kt

@@ -25,25 +25,18 @@ import net.newpipe.app.composable.PreferenceRow
 import net.newpipe.app.composable.TopAppBar
 import net.newpipe.app.navigation.Navigator
 import net.newpipe.app.preview.ThemePreviewProvider
+import net.newpipe.app.screen.settings.model.SettingsCategory
+import net.newpipe.app.screen.settings.model.SettingsCategoryType
 import net.newpipe.app.viewmodel.settings.SettingsViewModel
 import newpipe.shared.generated.resources.Res
 import newpipe.shared.generated.resources.ic_search
 import newpipe.shared.generated.resources.search
 import newpipe.shared.generated.resources.settings
-import org.jetbrains.compose.resources.DrawableResource
-import org.jetbrains.compose.resources.StringResource
 import org.jetbrains.compose.resources.painterResource
 import org.jetbrains.compose.resources.stringResource
 import org.koin.compose.koinInject
 import org.koin.compose.viewmodel.koinViewModel
 
-data class SettingsCategory(
-    val title: StringResource,
-    val icon: DrawableResource,
-    // TODO: Replace with a Destination once sub-screens are migrated
-    val onClick: () -> Unit = {}
-)
-
 @Composable
 fun SettingsHomeScreen(
     navigator: Navigator = koinInject(),

shared/src/commonMain/kotlin/net/newpipe/app/screen/settings/model/SettingsCategory.kt

@@ -0,0 +1,11 @@
+package net.newpipe.app.screen.settings.model
+
+import org.jetbrains.compose.resources.DrawableResource
+import org.jetbrains.compose.resources.StringResource
+
+data class SettingsCategory(
+    val title: StringResource,
+    val icon: DrawableResource,
+    // TODO: Replace with a Destination once sub-screens are migrated
+    val onClick: () -> Unit = {}
+)

shared/src/commonMain/kotlin/net/newpipe/app/screen/settings/model/SettingsCategoryType.kt

@@ -1,9 +1,4 @@
-/*
-* SPDX-FileCopyrightText: 2026 NewPipe e.V. <https://newpipe-ev.de>
-* SPDX-License-Identifier: GPL-3.0-or-later
-*/
-
-package net.newpipe.app.screen.settings
+package net.newpipe.app.screen.settings.model
 
 import newpipe.shared.generated.resources.Res
 import newpipe.shared.generated.resources.content

shared/src/commonMain/kotlin/net/newpipe/app/viewmodel/settings/SettingsViewModel.kt

@@ -7,16 +7,16 @@ package net.newpipe.app.viewmodel.settings
 
 import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import net.newpipe.app.platform.BuildInfo
-import net.newpipe.app.screen.settings.SettingsCategoryType
+import net.newpipe.app.screen.settings.model.SettingsCategoryType
 import org.koin.core.annotation.KoinViewModel
 
 @KoinViewModel
 class SettingsViewModel(buildInfo: BuildInfo) : ViewModel() {
 
-    private val _categories = MutableStateFlow(computeVisible(buildInfo))
-    val categories = _categories.asStateFlow()
+    val categories: StateFlow<List<SettingsCategoryType>>
+        field = MutableStateFlow(computeVisible(buildInfo))
 
     private fun computeVisible(buildInfo: BuildInfo): List<SettingsCategoryType> =
         SettingsCategoryType.entries.filter { type ->

shared/src/iosMain/kotlin/net/newpipe/app/platform/IOSBuildInfo.kt

@@ -6,4 +6,4 @@ import org.koin.core.annotation.Singleton
 class IOSBuildInfo : BuildInfo {
     override val isReleaseApk: Boolean = false
     override val isDebug: Boolean = false
-}
+}

shared/src/jvmMain/kotlin/net/newpipe/app/platform/JVMBuildInfo.kt

@@ -6,4 +6,4 @@ import org.koin.core.annotation.Singleton
 class JVMBuildInfo : BuildInfo {
     override val isReleaseApk: Boolean = false
     override val isDebug: Boolean = false
-}
+}