Migrate More screen to full Compose

app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt

@@ -3,6 +3,7 @@ package eu.kanade.presentation.more
 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.material.icons.Icons
 import androidx.compose.material.icons.outlined.CloudOff
 import androidx.compose.material.icons.outlined.GetApp
@@ -16,15 +17,16 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.Divider
 import eu.kanade.presentation.components.PreferenceRow
+import eu.kanade.presentation.components.Scaffold
 import eu.kanade.presentation.components.ScrollbarLazyColumn
 import eu.kanade.presentation.components.SwitchPreference
+import eu.kanade.presentation.util.plus
 import eu.kanade.presentation.util.quantityStringResource
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.more.DownloadQueueState
@@ -33,7 +35,6 @@ import eu.kanade.tachiyomi.ui.more.MorePresenter
 
 @Composable
 fun MoreScreen(
-    nestedScrollInterop: NestedScrollConnection,
     presenter: MorePresenter,
     onClickDownloadQueue: () -> Unit,
     onClickCategories: () -> Unit,
@@ -44,9 +45,18 @@ fun MoreScreen(
     val uriHandler = LocalUriHandler.current
     val downloadQueueState by presenter.downloadQueueState.collectAsState()
 
+    Scaffold(
+        modifier = Modifier.statusBarsPadding(),
+        topBar = {
+            AppBar(
+                title = stringResource(R.string.label_more),
+                downloadedOnlyMode = presenter.downloadedOnly.value,
+                incognitoMode = presenter.incognitoMode.value,
+            )
+        },
+    ) { paddingValues ->
         ScrollbarLazyColumn(
-        modifier = Modifier.nestedScroll(nestedScrollInterop),
+            contentPadding = paddingValues + WindowInsets.navigationBars.asPaddingValues(),
-        contentPadding = WindowInsets.navigationBars.asPaddingValues(),
         ) {
             item {
                 LogoHeader()
@@ -81,7 +91,13 @@ fun MoreScreen(
                             if (pending == 0) {
                                 stringResource(R.string.paused)
                             } else {
-                            "${stringResource(R.string.paused)} • ${quantityStringResource(R.plurals.download_queue_summary, pending, pending)}"
+                                "${stringResource(R.string.paused)} • ${
+                                quantityStringResource(
+                                    R.plurals.download_queue_summary,
+                                    pending,
+                                    pending,
+                                )
+                                }"
                             }
                         }
                         is DownloadQueueState.Downloading -> {
@@ -132,4 +148,5 @@ fun MoreScreen(
                 )
             }
         }
+    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt

@@ -6,7 +6,6 @@ import androidx.core.net.toUri
 import com.bluelinelabs.conductor.Controller
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
-import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.util.system.openInBrowser
 
 fun Router.setRoot(controller: Controller, id: Int) {
@@ -44,10 +43,3 @@ fun Controller.withFadeTransaction(): RouterTransaction {
 fun Controller.openInBrowser(url: String) {
     activity?.openInBrowser(url.toUri())
 }
-
-/**
- * Returns [MainActivity]'s app bar height
- */
-fun Controller.getMainAppBarHeight(): Int {
-    return (activity as? MainActivity)?.binding?.appbar?.measuredHeight ?: 0
-}

app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/NoAppBarElevationController.kt

@@ -1,3 +0,0 @@
-package eu.kanade.tachiyomi.ui.base.controller
-
-interface NoAppBarElevationController

app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt

@@ -44,7 +44,6 @@ import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.ui.base.controller.FabController
 import eu.kanade.tachiyomi.ui.base.controller.FullComposeContentController
-import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController
 import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.TabbedController
 import eu.kanade.tachiyomi.ui.base.controller.pushController
@@ -639,8 +638,6 @@ class MainActivity : BaseActivity() {
                     backstackLiftState.remove(it.instanceId)
                 }
             }
-
-            binding.root.isLiftAppBarOnScroll = internalTo !is NoAppBarElevationController
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt

@@ -1,11 +1,9 @@
 package eu.kanade.tachiyomi.ui.more
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import eu.kanade.presentation.more.MoreScreen
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.base.controller.ComposeController
+import eu.kanade.tachiyomi.ui.base.controller.FullComposeController
-import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController
 import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.ui.category.CategoryController
@@ -14,18 +12,16 @@ import eu.kanade.tachiyomi.ui.setting.SettingsBackupController
 import eu.kanade.tachiyomi.ui.setting.SettingsMainController
 
 class MoreController :
-    ComposeController<MorePresenter>(),
+    FullComposeController<MorePresenter>(),
-    RootController,
+    RootController {
-    NoAppBarElevationController {
 
     override fun getTitle() = resources?.getString(R.string.label_more)
 
     override fun createPresenter() = MorePresenter()
 
     @Composable
-    override fun ComposeContent(nestedScrollInterop: NestedScrollConnection) {
+    override fun ComposeContent() {
         MoreScreen(
-            nestedScrollInterop = nestedScrollInterop,
             presenter = presenter,
             onClickDownloadQueue = { router.pushController(DownloadController()) },
             onClickCategories = { router.pushController(CategoryController()) },

app/src/main/java/eu/kanade/tachiyomi/widget/TachiyomiCoordinatorLayout.kt

@@ -34,25 +34,9 @@ class TachiyomiCoordinatorLayout @JvmOverloads constructor(
     defStyleAttr: Int = R.attr.coordinatorLayoutStyle,
 ) : CoordinatorLayout(context, attrs, defStyleAttr) {
 
-    /**
-     * Keep lifted state and do nothing on tablet UI
-     */
-    private val isTablet = context.isTablet()
-
     private var appBarLayout: AppBarLayout? = null
     private var tabLayout: TabLayout? = null
 
-    /**
-     * If true, [AppBarLayout] child will be lifted on nested scroll.
-     */
-    var isLiftAppBarOnScroll = true
-
-    /**
-     * Internal check
-     */
-    private val canLiftAppBarOnScroll
-        get() = !isTablet && isLiftAppBarOnScroll
-
     override fun onNestedScroll(
         target: View,
         dxConsumed: Int,
@@ -64,7 +48,7 @@ class TachiyomiCoordinatorLayout @JvmOverloads constructor(
     ) {
         super.onNestedScroll(target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed, type, consumed)
         // Disable elevation overlay when tabs are visible
-        if (canLiftAppBarOnScroll) {
+        if (context.isTablet().not()) {
             if (target is ComposeView) {
                 val scrollCondition = if (type == ViewCompat.TYPE_NON_TOUCH) {
                     dyUnconsumed >= 0