Merge Voyager screens (#8656)

* Merge Voyager screens * cleanups (cherry picked from commit 3d66eaea83) # Conflicts: # app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt # app/src/main/res/layout/main_activity.xml
2022-12-03 10:35:30 +07:00
parent 07c7ec972d
commit 726626f2c5
120 changed files with 1685 additions and 3009 deletions
@@ -2,6 +2,7 @@ package eu.kanade.presentation.components

 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -16,10 +17,10 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.ZeroCornerSize
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.BookmarkAdd
@@ -100,7 +101,11 @@ fun MangaBottomActionMenu(
            }
            Row(
                modifier = Modifier
-                    .padding(WindowInsets.navigationBars.only(WindowInsetsSides.Bottom).asPaddingValues())
+                    .padding(
+                        WindowInsets.navigationBars
+                            .only(WindowInsetsSides.Bottom)
+                            .asPaddingValues(),
+                    )
                    .padding(horizontal = 8.dp, vertical = 12.dp),
            ) {
                if (onBookmarkClicked != null) {
@@ -218,11 +223,11 @@ private fun RowScope.Button(
 fun LibraryBottomActionMenu(
    visible: Boolean,
    modifier: Modifier = Modifier,
-    onChangeCategoryClicked: (() -> Unit)?,
-    onMarkAsReadClicked: (() -> Unit)?,
-    onMarkAsUnreadClicked: (() -> Unit)?,
+    onChangeCategoryClicked: () -> Unit,
+    onMarkAsReadClicked: () -> Unit,
+    onMarkAsUnreadClicked: () -> Unit,
    onDownloadClicked: ((DownloadAction) -> Unit)?,
-    onDeleteClicked: (() -> Unit)?,
+    onDeleteClicked: () -> Unit,
    // SY -->
    onClickCleanTitles: (() -> Unit)?,
    onClickMigrate: (() -> Unit)?,
@@ -231,8 +236,8 @@ fun LibraryBottomActionMenu(
 ) {
    AnimatedVisibility(
        visible = visible,
-        enter = expandVertically(expandFrom = Alignment.Bottom),
-        exit = shrinkVertically(shrinkTowards = Alignment.Bottom),
+        enter = expandVertically(animationSpec = tween(delayMillis = 300)),
+        exit = shrinkVertically(animationSpec = tween()),
    ) {
        val scope = rememberCoroutineScope()
        Surface(
@@ -260,18 +265,19 @@ fun LibraryBottomActionMenu(
            // SY <--
            Row(
                modifier = Modifier
-                    .navigationBarsPadding()
+                    .windowInsetsPadding(
+                        WindowInsets.navigationBars
+                            .only(WindowInsetsSides.Bottom),
+                    )
                    .padding(horizontal = 8.dp, vertical = 12.dp),
            ) {
-                if (onChangeCategoryClicked != null) {
-                    Button(
-                        title = stringResource(R.string.action_move_category),
-                        icon = Icons.Outlined.Label,
-                        toConfirm = confirm[0],
-                        onLongClick = { onLongClickItem(0) },
-                        onClick = onChangeCategoryClicked,
-                    )
-                }
+                Button(
+                    title = stringResource(R.string.action_move_category),
+                    icon = Icons.Outlined.Label,
+                    toConfirm = confirm[0],
+                    onLongClick = { onLongClickItem(0) },
+                    onClick = onChangeCategoryClicked,
+                )
                if (onDownloadClicked != null) {
                    var downloadExpanded by remember { mutableStateOf(false) }
                    Button(
@@ -290,15 +296,13 @@ fun LibraryBottomActionMenu(
                        )
                    }
                }
-                if (onDeleteClicked != null) {
-                    Button(
-                        title = stringResource(R.string.action_delete),
-                        icon = Icons.Outlined.Delete,
-                        toConfirm = confirm[4],
-                        onLongClick = { onLongClickItem(4) },
-                        onClick = onDeleteClicked,
-                    )
-                }
+                Button(
+                    title = stringResource(R.string.action_delete),
+                    icon = Icons.Outlined.Delete,
+                    toConfirm = confirm[4],
+                    onLongClick = { onLongClickItem(4) },
+                    onClick = onDeleteClicked,
+                )
                // SY -->
                if (onMarkAsReadClicked != null) {
                    Button(
@@ -0,0 +1,48 @@
+package eu.kanade.presentation.components
+
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBarDefaults
+import androidx.compose.material3.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+/**
+ * M3 Navbar with no horizontal spacer
+ *
+ * @see [androidx.compose.material3.NavigationBar]
+ */
+@Composable
+fun NavigationBar(
+    modifier: Modifier = Modifier,
+    containerColor: Color = NavigationBarDefaults.containerColor,
+    contentColor: Color = MaterialTheme.colorScheme.contentColorFor(containerColor),
+    tonalElevation: Dp = NavigationBarDefaults.Elevation,
+    windowInsets: WindowInsets = NavigationBarDefaults.windowInsets,
+    content: @Composable RowScope.() -> Unit,
+) {
+    androidx.compose.material3.Surface(
+        color = containerColor,
+        contentColor = contentColor,
+        tonalElevation = tonalElevation,
+        modifier = modifier,
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .windowInsetsPadding(windowInsets)
+                .height(80.dp)
+                .selectableGroup(),
+            content = content,
+        )
+    }
+}
@@ -0,0 +1,59 @@
+package eu.kanade.presentation.components
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.selection.selectableGroup
+import androidx.compose.material3.NavigationRailDefaults
+import androidx.compose.material3.contentColorFor
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+
+/**
+ * Center-aligned M3 Navigation rail
+ *
+ * @see [androidx.compose.material3.NavigationRail]
+ */
+@Composable
+fun NavigationRail(
+    modifier: Modifier = Modifier,
+    containerColor: Color = NavigationRailDefaults.ContainerColor,
+    contentColor: Color = contentColorFor(containerColor),
+    header: @Composable (ColumnScope.() -> Unit)? = null,
+    windowInsets: WindowInsets = NavigationRailDefaults.windowInsets,
+    content: @Composable ColumnScope.() -> Unit,
+) {
+    androidx.compose.material3.Surface(
+        color = containerColor,
+        contentColor = contentColor,
+        modifier = modifier,
+        tonalElevation = 3.dp,
+    ) {
+        Column(
+            Modifier
+                .fillMaxHeight()
+                .windowInsetsPadding(windowInsets)
+                .widthIn(min = 80.dp)
+                .padding(vertical = 4.dp)
+                .selectableGroup(),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(space = 4.dp, alignment = Alignment.CenterVertically),
+        ) {
+            if (header != null) {
+                header()
+                Spacer(Modifier.height(8.dp))
+            }
+            content()
+        }
+    }
+}
@@ -16,11 +16,14 @@

 package eu.kanade.presentation.components

+import androidx.compose.foundation.layout.MutableWindowInsets
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.foundation.layout.exclude
+import androidx.compose.foundation.layout.withConsumedWindowInsets
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ScaffoldDefaults
@@ -31,6 +34,7 @@ import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -67,6 +71,7 @@ import kotlin.math.max
 * * Remove height constraint for expanded app bar
 * * Also take account of fab height when providing inner padding
 * * Fixes for fab and snackbar horizontal placements when [contentWindowInsets] is used
+ * * Handle consumed window insets
 *
 * @param modifier the [Modifier] to be applied to this scaffold
 * @param topBar top app bar of the screen, typically a [SmallTopAppBar]
@@ -103,9 +108,12 @@ fun Scaffold(
    contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
    content: @Composable (PaddingValues) -> Unit,
 ) {
+    // Tachiyomi: Handle consumed window insets
+    val remainingWindowInsets = remember { MutableWindowInsets() }
    androidx.compose.material3.Surface(
        modifier = Modifier
            .nestedScroll(topBarScrollBehavior.nestedScrollConnection)
+            .withConsumedWindowInsets { remainingWindowInsets.insets = contentWindowInsets.exclude(it) }
            .then(modifier),
        color = containerColor,
        contentColor = contentColor,
@@ -116,7 +124,7 @@ fun Scaffold(
            bottomBar = bottomBar,
            content = content,
            snackbar = snackbarHost,
-            contentWindowInsets = contentWindowInsets,
+            contentWindowInsets = remainingWindowInsets,
            fab = floatingActionButton,
        )
    }
@@ -20,7 +20,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
 import kotlinx.coroutines.launch

@Composable
@@ -88,9 +87,7 @@ fun TabbedScreen(
                verticalAlignment = Alignment.Top,
            ) { page ->
                tabs[page].content(
-                    TachiyomiBottomNavigationView.withBottomNavPadding(
-                        PaddingValues(bottom = contentPadding.calculateBottomPadding()),
-                    ),
+                    PaddingValues(bottom = contentPadding.calculateBottomPadding()),
                    snackbarHostState,
                )
            }
@@ -5,7 +5,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.DeleteSweep
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
@@ -21,7 +20,6 @@ import eu.kanade.presentation.history.components.HistoryContent
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.history.HistoryScreenModel
 import eu.kanade.tachiyomi.ui.history.HistoryState
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
 import java.util.Date

@Composable
@@ -55,7 +53,6 @@ fun HistoryScreen(
            )
        },
        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
-        contentWindowInsets = TachiyomiBottomNavigationView.withBottomNavInset(ScaffoldDefaults.contentWindowInsets),
    ) { contentPadding ->
        state.list.let {
            if (it == null) {
@@ -1,10 +1,7 @@
 package eu.kanade.presentation.more

 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.asPaddingValues
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.CloudOff
 import androidx.compose.material.icons.outlined.GetApp
@@ -32,8 +29,7 @@ import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.more.DownloadQueueState
-import eu.kanade.tachiyomi.ui.more.MoreController
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
+import eu.kanade.tachiyomi.util.Constants

@Composable
 fun MoreScreen(
@@ -60,10 +56,7 @@ fun MoreScreen(
    val uriHandler = LocalUriHandler.current

    ScrollbarLazyColumn(
-        modifier = Modifier.statusBarsPadding(),
-        contentPadding = TachiyomiBottomNavigationView.withBottomNavPadding(
-            WindowInsets.navigationBars.asPaddingValues(),
-        ),
+        modifier = Modifier.systemBarsPadding(),
    ) {
        if (isFDroid) {
            item {
@@ -209,7 +202,7 @@ fun MoreScreen(
            TextPreferenceWidget(
                title = stringResource(R.string.label_help),
                icon = Icons.Outlined.HelpOutline,
-                onPreferenceClick = { uriHandler.openUri(MoreController.URL_HELP) },
+                onPreferenceClick = { uriHandler.openUri(Constants.URL_HELP) },
            )
        }
    }
@@ -0,0 +1,144 @@
+package eu.kanade.presentation.more
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.OpenInNew
+import androidx.compose.material.icons.outlined.NewReleases
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBarDefaults
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import com.halilibo.richtext.markdown.Markdown
+import com.halilibo.richtext.ui.RichTextStyle
+import com.halilibo.richtext.ui.material3.Material3RichText
+import com.halilibo.richtext.ui.string.RichTextStringStyle
+import eu.kanade.presentation.components.Scaffold
+import eu.kanade.presentation.util.padding
+import eu.kanade.presentation.util.secondaryItemAlpha
+import eu.kanade.tachiyomi.R
+
+@Composable
+fun NewUpdateScreen(
+    versionName: String,
+    changelogInfo: String,
+    onOpenInBrowser: () -> Unit,
+    onRejectUpdate: () -> Unit,
+    onAcceptUpdate: () -> Unit,
+) {
+    Scaffold(
+        bottomBar = {
+            val strokeWidth = Dp.Hairline
+            val borderColor = MaterialTheme.colorScheme.outline
+            Column(
+                modifier = Modifier
+                    .background(MaterialTheme.colorScheme.background)
+                    .drawBehind {
+                        drawLine(
+                            borderColor,
+                            Offset(0f, 0f),
+                            Offset(size.width, 0f),
+                            strokeWidth.value,
+                        )
+                    }
+                    .windowInsetsPadding(NavigationBarDefaults.windowInsets)
+                    .padding(
+                        horizontal = MaterialTheme.padding.medium,
+                        vertical = MaterialTheme.padding.small,
+                    ),
+            ) {
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onAcceptUpdate,
+                ) {
+                    Text(text = stringResource(id = R.string.update_check_confirm))
+                }
+                TextButton(
+                    modifier = Modifier.fillMaxWidth(),
+                    onClick = onRejectUpdate,
+                ) {
+                    Text(text = stringResource(R.string.action_not_now))
+                }
+            }
+        },
+    ) { paddingValues ->
+        // Status bar scrim
+        Box(
+            modifier = Modifier
+                .zIndex(2f)
+                .secondaryItemAlpha()
+                .background(MaterialTheme.colorScheme.background)
+                .fillMaxWidth()
+                .height(paddingValues.calculateTopPadding()),
+        )
+
+        Column(
+            modifier = Modifier
+                .verticalScroll(rememberScrollState())
+                .padding(paddingValues)
+                .padding(top = 48.dp)
+                .padding(horizontal = MaterialTheme.padding.medium),
+        ) {
+            Icon(
+                imageVector = Icons.Outlined.NewReleases,
+                contentDescription = null,
+                modifier = Modifier
+                    .padding(bottom = MaterialTheme.padding.small)
+                    .size(48.dp),
+                tint = MaterialTheme.colorScheme.primary,
+            )
+            Text(
+                text = stringResource(R.string.update_check_notification_update_available),
+                style = MaterialTheme.typography.headlineLarge,
+            )
+            Text(
+                text = versionName,
+                modifier = Modifier.secondaryItemAlpha(),
+                style = MaterialTheme.typography.titleSmall,
+            )
+
+            Material3RichText(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(vertical = MaterialTheme.padding.large),
+                style = RichTextStyle(
+                    stringStyle = RichTextStringStyle(
+                        linkStyle = SpanStyle(color = MaterialTheme.colorScheme.primary),
+                    ),
+                ),
+            ) {
+                Markdown(content = changelogInfo)
+
+                TextButton(
+                    onClick = onOpenInBrowser,
+                    modifier = Modifier.padding(top = MaterialTheme.padding.small),
+                ) {
+                    Text(text = stringResource(R.string.update_check_open))
+                    Spacer(modifier = Modifier.width(MaterialTheme.padding.tiny))
+                    Icon(imageVector = Icons.Default.OpenInNew, contentDescription = null)
+                }
+            }
+        }
+    }
+}
@@ -8,7 +8,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Public
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
@@ -19,7 +23,6 @@ import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
-import com.bluelinelabs.conductor.Router
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.LinkIcon
@@ -29,13 +32,11 @@ import eu.kanade.presentation.more.LogoHeader
 import eu.kanade.presentation.more.about.LicensesScreen
 import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget
 import eu.kanade.presentation.util.LocalBackPress
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.updater.AppUpdateChecker
 import eu.kanade.tachiyomi.data.updater.AppUpdateResult
-import eu.kanade.tachiyomi.ui.main.WhatsNewDialogController
-import eu.kanade.tachiyomi.ui.more.NewUpdateDialogController
+import eu.kanade.tachiyomi.ui.more.NewUpdateScreen
 import eu.kanade.tachiyomi.util.CrashLogUtil
 import eu.kanade.tachiyomi.util.lang.toDateTimestampString
 import eu.kanade.tachiyomi.util.lang.withIOContext
@@ -63,7 +64,10 @@ object AboutScreen : Screen {
        val uriHandler = LocalUriHandler.current
        val handleBack = LocalBackPress.current
        val navigator = LocalNavigator.currentOrThrow
-        val router = LocalRouter.currentOrThrow
+
+        // SY -->
+        var showWhatsNewDialog by remember { mutableStateOf(false) }
+        // SY <--

        Scaffold(
            topBar = { scrollBehavior ->
@@ -98,7 +102,15 @@ object AboutScreen : Screen {
                            title = stringResource(R.string.check_for_updates),
                            onPreferenceClick = {
                                scope.launch {
-                                    checkVersion(context, router)
+                                    checkVersion(context) { result ->
+                                        val updateScreen = NewUpdateScreen(
+                                            versionName = result.release.version,
+                                            changelogInfo = result.release.info,
+                                            releaseLink = result.release.releaseLink,
+                                            downloadLink = result.release.getDownloadLink(),
+                                        )
+                                        navigator.push(updateScreen)
+                                    }
                                }
                            },
                        )
@@ -109,7 +121,7 @@ object AboutScreen : Screen {
                        TextPreferenceWidget(
                            title = stringResource(R.string.whats_new),
                            // SY -->
-                            onPreferenceClick = { WhatsNewDialogController().showDialog(router) },
+                            onPreferenceClick = { showWhatsNewDialog = true },
                            // SY <--
                        )
                    }
@@ -179,19 +191,25 @@ object AboutScreen : Screen {
                }
            }
        }
+
+        // SY -->
+        if (showWhatsNewDialog) {
+            WhatsNewDialog(onDismissRequest = { showWhatsNewDialog = false })
+        }
+        // SY <--
    }

    /**
     * Checks version and shows a user prompt if an update is available.
     */
-    private suspend fun checkVersion(context: Context, router: Router) {
+    private suspend fun checkVersion(context: Context, onAvailableUpdate: (AppUpdateResult.NewUpdate) -> Unit) {
        val updateChecker = AppUpdateChecker()
        withUIContext {
            context.toast(R.string.update_check_look_for_updates)
            try {
                when (val result = withIOContext { updateChecker.checkForUpdate(context, isUserPrompt = true) }) {
                    is AppUpdateResult.NewUpdate -> {
-                        NewUpdateDialogController(result).showDialog(router)
+                        onAvailableUpdate(result)
                    }
                    is AppUpdateResult.NoNewUpdate -> {
                        context.toast(R.string.update_check_no_new_updates)
@@ -0,0 +1,121 @@
+package eu.kanade.presentation.more.settings.screen
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.window.DialogProperties
+import eu.kanade.domain.UnsortedPreferences
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.lang.launchUI
+import eu.kanade.tachiyomi.util.system.toast
+import exh.log.xLogE
+import exh.uconfig.EHConfigurator
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
+
+@Composable
+fun ConfigureExhDialog(run: Boolean, onRunning: () -> Unit) {
+    val unsortedPreferences = remember {
+        Injekt.get<UnsortedPreferences>()
+    }
+    var warnDialogOpen by remember { mutableStateOf(false) }
+    var configureDialogOpen by remember { mutableStateOf(false) }
+    var configureFailedDialogOpen by remember { mutableStateOf<Exception?>(null) }
+
+    LaunchedEffect(run) {
+        if (run) {
+            if (unsortedPreferences.exhShowSettingsUploadWarning().get()) {
+                warnDialogOpen = true
+            } else {
+                configureDialogOpen = true
+            }
+            onRunning()
+        }
+    }
+
+    if (warnDialogOpen) {
+        AlertDialog(
+            onDismissRequest = { warnDialogOpen = false },
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false,
+            ),
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        unsortedPreferences.exhShowSettingsUploadWarning().set(false)
+                        configureDialogOpen = true
+                        warnDialogOpen = false
+                    },
+                ) {
+                    Text(text = stringResource(android.R.string.ok))
+                }
+            },
+            title = {
+                Text(text = stringResource(R.string.settings_profile_note))
+            },
+            text = {
+                Text(text = stringResource(R.string.settings_profile_note_message))
+            },
+        )
+    }
+    if (configureDialogOpen) {
+        val context = LocalContext.current
+        LaunchedEffect(Unit) {
+            withContext(Dispatchers.IO + NonCancellable) {
+                try {
+                    EHConfigurator(context).configureAll()
+                    launchUI {
+                        context.toast(R.string.eh_settings_successfully_uploaded)
+                    }
+                } catch (e: Exception) {
+                    configureFailedDialogOpen = e
+                    xLogE("Configuration error!", e)
+                } finally {
+                    configureDialogOpen = false
+                }
+            }
+        }
+        AlertDialog(
+            onDismissRequest = {},
+            properties = DialogProperties(
+                dismissOnBackPress = false,
+                dismissOnClickOutside = false,
+            ),
+            confirmButton = {},
+            title = {
+                Text(text = stringResource(R.string.eh_settings_uploading_to_server))
+            },
+            text = {
+                Text(text = stringResource(R.string.eh_settings_uploading_to_server_message))
+            },
+        )
+    }
+    if (configureFailedDialogOpen != null) {
+        AlertDialog(
+            onDismissRequest = { configureFailedDialogOpen = null },
+            confirmButton = {
+                TextButton(onClick = { configureFailedDialogOpen = null }) {
+                    Text(text = stringResource(android.R.string.ok))
+                }
+            },
+            title = {
+                Text(text = stringResource(R.string.eh_settings_configuration_failed))
+            },
+            text = {
+                Text(text = stringResource(R.string.eh_settings_configuration_failed_message, configureFailedDialogOpen?.message.orEmpty()))
+            },
+        )
+    }
+}
@@ -46,7 +46,6 @@ import eu.kanade.domain.manga.interactor.GetAllManga
 import eu.kanade.domain.manga.repository.MangaRepository
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.presentation.more.settings.Preference
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.cache.ChapterCache
@@ -71,7 +70,6 @@ import eu.kanade.tachiyomi.network.PREF_DOH_QUAD101
 import eu.kanade.tachiyomi.network.PREF_DOH_QUAD9
 import eu.kanade.tachiyomi.network.PREF_DOH_SHECAN
 import eu.kanade.tachiyomi.source.SourceManager
-import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.util.CrashLogUtil
 import eu.kanade.tachiyomi.util.lang.launchNonCancellable
 import eu.kanade.tachiyomi.util.lang.withUIContext
@@ -82,7 +80,7 @@ import eu.kanade.tachiyomi.util.system.logcat
 import eu.kanade.tachiyomi.util.system.powerManager
 import eu.kanade.tachiyomi.util.system.setDefaultSettings
 import eu.kanade.tachiyomi.util.system.toast
-import exh.debug.SettingsDebugController
+import exh.debug.SettingsDebugScreen
 import exh.log.EHLogLevel
 import exh.pref.DelegateSourcePreferences
 import exh.source.BlacklistedSources
@@ -673,7 +671,7 @@ object SettingsAdvancedScreen : SearchableSettings {
    @Composable
    private fun getDeveloperToolsGroup(): Preference.PreferenceGroup {
        val context = LocalContext.current
-        val router = LocalRouter.currentOrThrow
+        val navigator = LocalNavigator.currentOrThrow
        val sourcePreferences = remember { Injekt.get<SourcePreferences>() }
        val unsortedPreferences = remember { Injekt.get<UnsortedPreferences>() }
        val delegateSourcePreferences = remember { Injekt.get<DelegateSourcePreferences>() }
@@ -729,7 +727,7 @@ object SettingsAdvancedScreen : SearchableSettings {
                        HtmlCompat.fromHtml(context.getString(R.string.open_debug_menu_summary), HtmlCompat.FROM_HTML_MODE_COMPACT)
                            .toAnnotatedString()
                    },
-                    onClick = { router.pushController(SettingsDebugController()) },
+                    onClick = { navigator.push(SettingsDebugScreen()) },
                ),
            ),
        )
@@ -9,19 +9,18 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import androidx.fragment.app.FragmentActivity
+import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.domain.UnsortedPreferences
 import eu.kanade.domain.base.BasePreferences
 import eu.kanade.domain.source.service.SourcePreferences
 import eu.kanade.domain.ui.UiPreferences
 import eu.kanade.presentation.more.settings.Preference
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.extension.ExtensionUpdateJob
-import eu.kanade.tachiyomi.ui.base.controller.pushController
-import eu.kanade.tachiyomi.ui.category.repos.RepoController
-import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryController
+import eu.kanade.tachiyomi.ui.category.repos.RepoScreen
+import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreen
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -48,13 +47,13 @@ object SettingsBrowseScreen : SearchableSettings {
                title = stringResource(R.string.label_sources),
                preferenceItems = listOf(
                    kotlin.run {
-                        val router = LocalRouter.currentOrThrow
+                        val navigator = LocalNavigator.currentOrThrow
                        val count by sourcePreferences.sourcesTabCategories().collectAsState()
                        Preference.PreferenceItem.TextPreference(
                            title = stringResource(R.string.action_edit_categories),
                            subtitle = pluralStringResource(R.plurals.num_categories, count.size, count.size),
                            onClick = {
-                                router.pushController(SourceCategoryController())
+                                navigator.push(SourceCategoryScreen())
                            },
                        )
                    },
@@ -99,13 +98,13 @@ object SettingsBrowseScreen : SearchableSettings {
                    ),
                    // SY -->
                    kotlin.run {
-                        val router = LocalRouter.currentOrThrow
+                        val navigator = LocalNavigator.currentOrThrow
                        val count by unsortedPreferences.extensionRepos().collectAsState()
                        Preference.PreferenceItem.TextPreference(
                            title = stringResource(R.string.action_edit_repos),
                            subtitle = pluralStringResource(R.plurals.num_repos, count.size, count.size),
                            onClick = {
-                                router.pushController(RepoController())
+                                navigator.push(RepoScreen())
                            },
                        )
                    },
@@ -46,13 +46,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.core.content.ContextCompat.startActivity
-import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.domain.UnsortedPreferences
 import eu.kanade.domain.manga.interactor.DeleteFavoriteEntries
 import eu.kanade.domain.manga.interactor.GetExhFavoriteMangaWithMetadata
 import eu.kanade.domain.manga.interactor.GetFlatMetadataById
 import eu.kanade.presentation.more.settings.Preference
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
@@ -68,7 +66,6 @@ import exh.eh.EHentaiUpdateWorkerConstants
 import exh.eh.EHentaiUpdaterStats
 import exh.favorites.FavoritesIntroDialog
 import exh.metadata.metadata.EHentaiSearchMetadata
-import exh.uconfig.WarnConfigureDialogController
 import exh.ui.login.EhLoginActivity
 import exh.util.nullIfBlank
 import kotlinx.serialization.decodeFromString
@@ -126,18 +123,18 @@ object SettingsEhScreen : SearchableSettings {

    @Composable
    override fun getPreferences(): List<Preference> {
-        val router = LocalRouter.currentOrThrow
-        val openWarnConfigureDialogController = {
-            WarnConfigureDialogController.uploadSettings(router)
-        }
        val unsortedPreferences: UnsortedPreferences = remember { Injekt.get() }
        val getFlatMetadataById: GetFlatMetadataById = remember { Injekt.get() }
        val deleteFavoriteEntries: DeleteFavoriteEntries = remember { Injekt.get() }
        val getExhFavoriteMangaWithMetadata: GetExhFavoriteMangaWithMetadata = remember { Injekt.get() }
        val exhentaiEnabled by unsortedPreferences.enableExhentai().collectAsState()
+        var runConfigureDialog by remember { mutableStateOf(false) }
+        val openWarnConfigureDialogController = { runConfigureDialog = true }

        Reconfigure(unsortedPreferences, openWarnConfigureDialogController)

+        ConfigureExhDialog(run = runConfigureDialog, onRunning = { runConfigureDialog = false })
+
        return listOf(
            Preference.PreferenceGroup(
                stringResource(R.string.ehentai_prefs_account_settings),
@@ -26,15 +26,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.fragment.app.FragmentActivity
+import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import eu.kanade.presentation.more.settings.Preference
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.presentation.util.collectAsState
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.core.security.SecurityPreferences
-import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate
-import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesController
+import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreen
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.authenticate
 import eu.kanade.tachiyomi.util.system.AuthenticatorUtil.isAuthenticationSupported
 import uy.kohesive.injekt.Injekt
@@ -98,7 +97,7 @@ object SettingsSecurityScreen : SearchableSettings {
            ),
            // SY -->
            kotlin.run {
-                val router = LocalRouter.currentOrThrow
+                val navigator = LocalNavigator.currentOrThrow
                val count by securityPreferences.authenticatorTimeRanges().collectAsState()
                Preference.PreferenceItem.TextPreference(
                    title = stringResource(R.string.action_edit_biometric_lock_times),
@@ -108,7 +107,7 @@ object SettingsSecurityScreen : SearchableSettings {
                        count.size,
                    ),
                    onClick = {
-                        router.pushController(BiometricTimesController())
+                        navigator.push(BiometricTimesScreen())
                    },
                    enabled = useAuth,
                )
@@ -0,0 +1,156 @@
+package eu.kanade.presentation.more.settings.screen
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.produceState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import eu.kanade.presentation.components.Divider
+import eu.kanade.presentation.components.LazyColumn
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.lang.withIOContext
+import eu.kanade.tachiyomi.util.system.isPreviewBuildType
+import kotlinx.serialization.Serializable
+import nl.adaptivity.xmlutil.AndroidXmlReader
+import nl.adaptivity.xmlutil.serialization.XML
+import nl.adaptivity.xmlutil.serialization.XmlSerialName
+import nl.adaptivity.xmlutil.serialization.XmlValue
+
+@Composable
+fun WhatsNewDialog(onDismissRequest: () -> Unit) {
+    AlertDialog(
+        onDismissRequest = onDismissRequest,
+        confirmButton = {
+            TextButton(onClick = onDismissRequest) {
+                Text(text = stringResource(android.R.string.cancel))
+            }
+        },
+        title = {
+            Text(text = stringResource(R.string.whats_new))
+        },
+        text = {
+            Column {
+                val context = LocalContext.current
+                val changelog by produceState<List<DisplayChangelog>?>(initialValue = null) {
+                    value = withIOContext {
+                        XML.decodeFromReader<Changelog>(
+                            AndroidXmlReader(
+                                context.resources.openRawResource(
+                                    if (isPreviewBuildType) R.raw.changelog_debug else R.raw.changelog_release,
+                                ).bufferedReader(),
+                            ),
+                        ).toDisplayChangelog()
+                    }
+                }
+                if (changelog != null) {
+                    LazyColumn(
+                        verticalArrangement = Arrangement.spacedBy(16.dp),
+                        modifier = Modifier.fillMaxSize(),
+                    ) {
+                        items(changelog.orEmpty()) { changelog ->
+                            Column(Modifier.fillMaxWidth()) {
+                                Text(
+                                    text = stringResource(R.string.changelog_version, changelog.version),
+                                    color = MaterialTheme.colorScheme.primary,
+                                    fontWeight = FontWeight.Bold,
+                                    style = MaterialTheme.typography.titleSmall,
+                                )
+                                Divider(Modifier.padding(vertical = 8.dp))
+                                Column(
+                                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                                ) {
+                                    changelog.changelog.forEach {
+                                        Text(text = it, style = MaterialTheme.typography.bodySmall)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        modifier = Modifier.fillMaxSize(),
+    )
+}
+
+data class DisplayChangelog(
+    val version: String,
+    val changelog: List<AnnotatedString>,
+)
+
+@Serializable
+@XmlSerialName("changelog", "", "")
+data class Changelog(
+    val bulletedList: Boolean,
+    val changelogs: List<ChangelogVersion>,
+)
+
+@Serializable
+@XmlSerialName("changelogversion", "", "")
+data class ChangelogVersion(
+    val versionName: String,
+    val changeDate: String,
+    val text: List<ChangelogText>,
+)
+
+@Serializable
+@XmlSerialName("changelogtext", "", "")
+data class ChangelogText(
+    @XmlValue(true) val value: String,
+)
+
+private const val bullet = "\u2022"
+
+fun Changelog.toDisplayChangelog(): List<DisplayChangelog> {
+    val prefix = if (bulletedList) bullet + "\t\t" else ""
+    return changelogs.map { version ->
+        DisplayChangelog(
+            version = version.versionName,
+            changelog = version.text.mapIndexed { index, changelogText ->
+                buildAnnotatedString {
+                    append(prefix)
+                    var inBBCode = false
+                    var isEscape = false
+                    changelogText.value.forEachIndexed { charIndex, c ->
+                        if (!inBBCode && c == '[') {
+                            inBBCode = true
+                        } else if (inBBCode && c == ']') {
+                            inBBCode = false
+                            isEscape = false
+                        } else if (inBBCode && c == '/') {
+                            isEscape = true
+                        } else if (inBBCode && c == 'b') {
+                            if (isEscape) {
+                                try {
+                                    pop()
+                                } catch (e: IllegalStateException) {
+                                    throw Exception("Exception on ${version.versionName}:$index:$charIndex", e)
+                                }
+                            } else {
+                                pushStyle(SpanStyle(fontWeight = FontWeight.Bold))
+                            }
+                        } else {
+                            append(c)
+                        }
+                    }
+                }
+            },
+        )
+    }
+}
@@ -9,7 +9,6 @@ import androidx.compose.material.icons.outlined.Refresh
 import androidx.compose.material.icons.outlined.SelectAll
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.TopAppBarScrollBehavior
@@ -36,7 +35,6 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.updates.UpdatesItem
 import eu.kanade.tachiyomi.ui.updates.UpdatesState
-import eu.kanade.tachiyomi.widget.TachiyomiBottomNavigationView
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlin.time.Duration.Companion.seconds
@@ -87,7 +85,6 @@ fun UpdateScreen(
            )
        },
        snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
-        contentWindowInsets = TachiyomiBottomNavigationView.withBottomNavInset(ScaffoldDefaults.contentWindowInsets),
    ) { contentPadding ->
        when {
            state.isLoading -> LoadingScreen(modifier = Modifier.padding(contentPadding))
@@ -1,15 +1,11 @@
 package eu.kanade.presentation.util

 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.staticCompositionLocalOf
-import com.bluelinelabs.conductor.Router
-
-/**
- * For interop with Conductor
- */
-val LocalRouter: ProvidableCompositionLocal<Router?> = staticCompositionLocalOf { null }
+import cafe.adriel.voyager.navigator.Navigator

 /**
 * For invoking back press to the parent activity
@@ -17,3 +13,12 @@ val LocalRouter: ProvidableCompositionLocal<Router?> = staticCompositionLocalOf
 val LocalBackPress: ProvidableCompositionLocal<(() -> Unit)?> = staticCompositionLocalOf { null }

 val LocalNavigatorContentPadding: ProvidableCompositionLocal<PaddingValues> = compositionLocalOf { PaddingValues() }
+
+interface Tab : cafe.adriel.voyager.navigator.tab.Tab {
+    suspend fun onReselect(navigator: Navigator) {}
+
+    // SY -->
+    @Composable
+    fun isEnabled(): Boolean = true
+    // SY <--
+}