Add separate default/apply buttons to reading mode/orientation selection dialogs

Related to #3453

(cherry picked from commit 9e67abcc8a1e7ca90c0a92acc563e998a7a99886)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/reader/appbars/ReaderAppBars.kt

app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt

@@ -1,15 +1,15 @@
 package eu.kanade.presentation.reader
 
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.items
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
@@ -17,13 +17,15 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.presentation.components.AdaptiveSheet
+import eu.kanade.presentation.reader.components.ModeSelectionDialog
 import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
-import tachiyomi.presentation.core.components.material.padding
+
+private val ReadingModesWithoutDefault = ReadingMode.entries - ReadingMode.DEFAULT
 
 @Composable
 fun ReadingModeSelectDialog(
@@ -51,13 +53,18 @@ private fun DialogContent(
     readingMode: ReadingMode,
     onChangeReadingMode: (ReadingMode) -> Unit,
 ) {
-    Box(modifier = Modifier.padding(vertical = MaterialTheme.padding.medium)) {
+    var selected by remember { mutableStateOf(readingMode) }
+
+    ModeSelectionDialog(
+        onUseDefault = { onChangeReadingMode(ReadingMode.DEFAULT) }.takeIf { readingMode != ReadingMode.DEFAULT },
+        onApply = { onChangeReadingMode(selected) },
+    ) {
         SettingsIconGrid(R.string.pref_category_reading_mode) {
-            items(ReadingMode.entries) { mode ->
+            items(ReadingModesWithoutDefault) { mode ->
                 IconToggleButton(
-                    checked = mode == readingMode,
+                    checked = mode == selected,
                     onCheckedChange = {
-                        onChangeReadingMode(mode)
+                        selected = mode
                     },
                     modifier = Modifier.fillMaxWidth(),
                     imageVector = ImageVector.vectorResource(mode.iconRes),
@@ -73,10 +80,17 @@ private fun DialogContent(
 private fun DialogContentPreview() {
     TachiyomiTheme {
         Surface {
-            DialogContent(
-                readingMode = ReadingMode.DEFAULT,
-                onChangeReadingMode = {},
-            )
+            Column {
+                DialogContent(
+                    readingMode = ReadingMode.DEFAULT,
+                    onChangeReadingMode = {},
+                )
+
+                DialogContent(
+                    readingMode = ReadingMode.LEFT_TO_RIGHT,
+                    onChangeReadingMode = {},
+                )
+            }
         }
     }
 }