Use PreferenceFragment instead of MoreFragment in bottom navigation

SIKV · Jun 18, 2024 · 1e88255 · 1e88255
1 parent 7717634
commit 1e88255
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 81 deletions.
diff --git a/app/src/main/java/com/github/sikv/photos/ui/fragment/MoreFragment.kt b/app/src/main/java/com/github/sikv/photos/ui/fragment/MoreFragment.kt
diff --git a/app/src/main/res/layout/fragment_more.xml b/app/src/main/res/layout/fragment_more.xml
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
@@ -20,7 +20,7 @@
 
     <fragment
         android:id="@+id/more"
-        android:name="com.github.sikv.photos.ui.fragment.MoreFragment"
+        android:name="com.github.sikv.photos.preferences.PreferenceFragment"
         android:label="@string/more" />
 
     <fragment

diff --git a/feature/preferences/build.gradle b/feature/preferences/build.gradle
@@ -20,6 +20,7 @@ android {
 
 dependencies {
     implementation project(':common-ui')
+    implementation project(':compose-ui')
     implementation project(':navigation')
     implementation project(':theme-manager')
 

diff --git a/feature/preferences/src/main/java/com/github/sikv/photos/preferences/PreferenceFragment.kt b/feature/preferences/src/main/java/com/github/sikv/photos/preferences/PreferenceFragment.kt
@@ -7,17 +7,17 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.platform.ComposeView
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
-import com.github.sikv.photos.common.ui.BaseFragment
 import com.github.sikv.photos.navigation.route.FeedbackRoute
 import com.google.accompanist.themeadapter.material3.Mdc3Theme
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class PreferenceFragment : BaseFragment() {
+class PreferenceFragment : Fragment() {
 
     @Inject
     lateinit var feedbackRoute: FeedbackRoute

diff --git a/feature/preferences/src/main/java/com/github/sikv/photos/preferences/PreferenceScreen.kt b/feature/preferences/src/main/java/com/github/sikv/photos/preferences/PreferenceScreen.kt
@@ -11,23 +11,30 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import com.github.sikv.photos.compose.ui.Scaffold
 
 @Composable
 internal fun PreferenceScreen(
     preferences: List<PreferenceItem>,
     onPreferencePress: (PreferenceAction) -> Unit
 ) {
-    Column {
-        preferences.iterator().forEach { item ->
-            when (item) {
-                is PreferenceItem.Item -> PreferenceItem(
-                    item = item,
-                    onPress = { onPreferencePress(item.action) }
-                )
-                is PreferenceItem.Divider -> Divider(
-                    modifier = Modifier
-                        .padding(dimensionResource(id = R.dimen.paddingOne))
-                )
+    Scaffold(
+        title = { Text(text = stringResource(id = R.string.more)) }
+    ) {
+        Column {
+            preferences.iterator().forEach { item ->
+                when (item) {
+                    is PreferenceItem.Item -> PreferenceItem(
+                        item = item,
+                        onPress = { onPreferencePress(item.action) }
+                    )
+
+                    is PreferenceItem.Divider -> Divider(
+                        modifier = Modifier
+                            .padding(dimensionResource(id = R.dimen.paddingOne))
+                    )
+                }
             }
         }
     }

diff --git a/feature/preferences/src/main/res/values/strings.xml b/feature/preferences/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="more">More</string>
     <string name="theme">Theme</string>
     <string name="send_feedback">Send Feedback</string>
     <string name="open_source_licences">Open Source Licences</string>