App: revamp embedded style prefs (#26)

Author: cliuff

app/proguard-rules.pro

@@ -31,13 +31,6 @@
  public <init>();
 }
 
-# Page class uses Reflection to create fragment instance
-# used with preference fragments, which extends PreferenceFragmentCompat
--keep class * extends androidx.preference.PreferenceFragmentCompat
--keepclassmembers class * extends androidx.preference.PreferenceFragmentCompat {
- public <init>();
-}
-
 # Keep dynamic feature module classes
 # com.madness.collision.unit.Unit extends Fragment
 #-keep class * extends com.madness.collision.unit.Unit

app/src/main/kotlin/com/madness/collision/settings/SettingsNavRoutes.kt

@@ -19,6 +19,7 @@ package com.madness.collision.settings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.NonRestartableComposable
 import com.madness.collision.chief.app.ComposePageRoute
+import com.madness.collision.ui.settings.StylesPage
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -35,6 +36,7 @@ interface RouteId<R : ComposePageRoute> {
 
 enum class SettingsRouteId : RouteId<SettingsNavRoute> {
 
+    Styles,
     OssLibraries;
 
     override fun asRoute(): SettingsNavRoute = SettingsNavRoute(this)
@@ -43,6 +45,9 @@ enum class SettingsRouteId : RouteId<SettingsNavRoute> {
 @Composable
 private fun SettingsRouteId.RouteContent(): Unit =
     when (this) {
+        SettingsRouteId.Styles -> {
+            StylesPage()
+        }
         SettingsRouteId.OssLibraries -> {
             OssLibsPage()
         }

app/src/main/kotlin/com/madness/collision/settings/SettingsPage.kt

@@ -37,7 +37,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.coerceAtMost
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.os.bundleOf
 import androidx.fragment.compose.AndroidFragment
 import androidx.window.core.layout.WindowSizeClass.Companion.WIDTH_DP_MEDIUM_LOWER_BOUND
 import com.madness.collision.R
@@ -46,9 +45,8 @@ import com.madness.collision.settings.instant.InstantFragment
 import com.madness.collision.main.DevOptions
 import com.madness.collision.main.MainViewModel
 import com.madness.collision.main.showPage
-import com.madness.collision.pref.PrefExterior
+import com.madness.collision.ui.settings.StylesContent
 import com.madness.collision.unit.api_viewing.AccessAV
-import com.madness.collision.util.Page
 import com.madness.collision.util.dev.DarkPreview
 import com.madness.collision.util.dev.LayoutDirectionPreviews
 import kotlinx.coroutines.delay
@@ -86,11 +84,7 @@ private fun SinglePaneLayout(
         paddingValues = contentPadding,
         onSelectDest = { dest ->
             when (dest) {
-                NavDest.Styles ->
-                    context.showPage<Page> {
-                        putString("fragmentClass", PrefExterior::class.qualifiedName)
-                        putInt("titleId", R.string.settings_exterior)
-                    }
+                NavDest.Styles -> navController?.navigateTo(SettingsRouteId.Styles.asRoute())
                 NavDest.Languages -> showLanguages()
                 NavDest.About -> context.showPage<AdviceFragment>()
                 NavDest.Instant -> context.showPage<InstantFragment>()
@@ -126,11 +120,7 @@ private fun SideBySideLayout(
         if (navDest == NavDest.Languages) LaunchedEffect(Unit) { showLanguages() }
 
         when (lastDest) {
-            NavDest.Styles -> {
-                val n = PrefExterior::class.qualifiedName
-                val args = bundleOf("fragmentClass" to n, "titleId" to R.string.settings_exterior)
-                AndroidFragment<Page>(arguments = args)
-            }
+            NavDest.Styles -> StylesContent(contentPadding = contentPadding)
             NavDest.Languages -> Unit
             NavDest.About -> AndroidFragment<AdviceFragment>()
             NavDest.Instant -> AndroidFragment<InstantFragment>()

app/src/main/kotlin/com/madness/collision/ui/settings/StylesPage.kt

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2025 Clifford Liu
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.madness.collision.ui.settings
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.fragment.compose.AndroidFragment
+import com.madness.collision.R
+import com.madness.collision.chief.layout.scaffoldWindowInsets
+import com.madness.collision.pref.PrefExterior
+import com.madness.collision.ui.comp.ClassicTopAppBar
+import com.madness.collision.ui.theme.MetaAppTheme
+
+@Composable
+fun StylesPage() {
+    val (topBarInsets, _, contentInsets) =
+        scaffoldWindowInsets(shareCutout = 12.dp, shareStatusBar = 5.dp, shareWaterfall = 8.dp)
+    Scaffold(
+        topBar = {
+            ClassicTopAppBar(
+                title = { Text(text = stringResource(R.string.settings_exterior)) },
+                windowInsets = topBarInsets
+                    .only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top),
+            )
+        },
+        containerColor = MetaAppTheme.colorScheme.surfaceNeutral,
+        contentWindowInsets = contentInsets,
+    ) { innerPadding ->
+        StylesContent(contentPadding = innerPadding)
+    }
+}
+
+@Composable
+fun StylesContent(contentPadding: PaddingValues = PaddingValues.Zero) {
+    Box(modifier = Modifier.padding(contentPadding)) {
+        AndroidFragment<PrefExterior>(modifier = Modifier.fillMaxWidth())
+    }
+}