Clean up UpdatesController

- Move loading state into scaffold (closes #7704)
- Move logic into presenter
- Make some composables private

app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt

@@ -95,14 +95,13 @@ class LibraryController(
         }
 
         LaunchedEffect(presenter.selectionMode) {
-            val activity = (activity as? MainActivity) ?: return@LaunchedEffect
             // Could perhaps be removed when navigation is in a Compose world
             if (router.backstackSize == 1) {
-                activity.showBottomNav(presenter.selectionMode.not())
+                (activity as? MainActivity)?.showBottomNav(presenter.selectionMode.not())
             }
         }
         LaunchedEffect(presenter.isLoading) {
-            if (presenter.isLoading.not()) {
+            if (!presenter.isLoading) {
                 (activity as? MainActivity)?.ready = true
             }
         }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -195,7 +195,7 @@ class MangaController : FullComposeController<MangaPresenter> {
         }
     }
 
-    // Let compose view handle this
+    // Let Compose view handle this
     override fun handleBack(): Boolean {
         val dispatcher = (activity as? OnBackPressedDispatcherOwner)?.onBackPressedDispatcher ?: return false
         return if (dispatcher.hasEnabledCallbacks()) {

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt

@@ -1,24 +1,15 @@
 package eu.kanade.tachiyomi.ui.recent.updates
 
 import androidx.activity.OnBackPressedDispatcherOwner
-import androidx.compose.animation.Crossfade
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import eu.kanade.presentation.components.ChapterDownloadAction
-import eu.kanade.presentation.components.LoadingScreen
 import eu.kanade.presentation.updates.UpdateScreen
-import eu.kanade.tachiyomi.data.download.DownloadService
-import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.ui.base.controller.FullComposeController
 import eu.kanade.tachiyomi.ui.base.controller.RootController
 import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.ui.main.MainActivity
 import eu.kanade.tachiyomi.ui.manga.MangaController
-import kotlinx.coroutines.launch
 
-/**
- * Fragment that shows recent chapters.
- */
 class UpdatesController :
     FullComposeController<UpdatesPresenter>(),
     RootController {
@@ -27,32 +18,26 @@ class UpdatesController :
 
     @Composable
     override fun ComposeContent() {
-        Crossfade(targetState = presenter.isLoading) { isLoading ->
-            if (isLoading) {
-                LoadingScreen()
-            } else {
-                UpdateScreen(
-                    presenter = presenter,
-                    onClickCover = { item ->
-                        router.pushController(MangaController(item.update.mangaId))
-                    },
-                    onBackClicked = this::onBackClicked,
-                    onDownloadChapter = this::downloadChapters,
-                )
-            }
-        }
+        UpdateScreen(
+            presenter = presenter,
+            onClickCover = { item ->
+                router.pushController(MangaController(item.update.mangaId))
+            },
+            onBackClicked = {
+                (activity as? MainActivity)?.moveToStartScreen()
+            },
+        )
         LaunchedEffect(presenter.selectionMode) {
-            val activity = (activity as? MainActivity) ?: return@LaunchedEffect
-            activity.showBottomNav(presenter.selectionMode.not())
+            (activity as? MainActivity)?.showBottomNav(presenter.selectionMode.not())
         }
         LaunchedEffect(presenter.isLoading) {
-            if (presenter.isLoading.not()) {
+            if (!presenter.isLoading) {
                 (activity as? MainActivity)?.ready = true
             }
         }
     }
 
-    // Let compose view handle this
+    // Let Compose view handle this
     override fun handleBack(): Boolean {
         val dispatcher = (activity as? OnBackPressedDispatcherOwner)?.onBackPressedDispatcher ?: return false
         return if (dispatcher.hasEnabledCallbacks()) {
@@ -62,34 +47,4 @@ class UpdatesController :
             false
         }
     }
-
-    private fun onBackClicked() {
-        (activity as? MainActivity)?.moveToStartScreen()
-    }
-
-    private fun downloadChapters(items: List<UpdatesItem>, action: ChapterDownloadAction) {
-        if (items.isEmpty()) return
-        viewScope.launch {
-            when (action) {
-                ChapterDownloadAction.START -> {
-                    presenter.downloadChapters(items)
-                    if (items.any { it.downloadStateProvider() == Download.State.ERROR }) {
-                        DownloadService.start(activity!!)
-                    }
-                }
-                ChapterDownloadAction.START_NOW -> {
-                    val chapterId = items.singleOrNull()?.update?.chapterId ?: return@launch
-                    presenter.startDownloadingNow(chapterId)
-                }
-                ChapterDownloadAction.CANCEL -> {
-                    val chapterId = items.singleOrNull()?.update?.chapterId ?: return@launch
-                    presenter.cancelDownload(chapterId)
-                }
-                ChapterDownloadAction.DELETE -> {
-                    presenter.deleteChapters(items)
-                }
-            }
-            presenter.toggleAllSelection(false)
-        }
-    }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesPresenter.kt

@@ -13,10 +13,12 @@ import eu.kanade.domain.chapter.model.toDbChapter
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.domain.updates.interactor.GetUpdates
 import eu.kanade.domain.updates.model.UpdatesWithRelations
+import eu.kanade.presentation.components.ChapterDownloadAction
 import eu.kanade.presentation.updates.UpdatesState
 import eu.kanade.presentation.updates.UpdatesStateImpl
 import eu.kanade.presentation.updates.UpdatesUiModel
 import eu.kanade.tachiyomi.data.download.DownloadManager
+import eu.kanade.tachiyomi.data.download.DownloadService
 import eu.kanade.tachiyomi.data.download.model.Download
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.source.SourceManager
@@ -33,6 +35,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
 import logcat.LogPriority
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -178,11 +181,37 @@ class UpdatesPresenter(
         }
     }
 
-    fun startDownloadingNow(chapterId: Long) {
+    fun downloadChapters(items: List<UpdatesItem>, action: ChapterDownloadAction) {
+        if (items.isEmpty()) return
+        presenterScope.launch {
+            when (action) {
+                ChapterDownloadAction.START -> {
+                    downloadChapters(items)
+                    if (items.any { it.downloadStateProvider() == Download.State.ERROR }) {
+                        DownloadService.start(view!!.activity!!)
+                    }
+                }
+                ChapterDownloadAction.START_NOW -> {
+                    val chapterId = items.singleOrNull()?.update?.chapterId ?: return@launch
+                    startDownloadingNow(chapterId)
+                }
+                ChapterDownloadAction.CANCEL -> {
+                    val chapterId = items.singleOrNull()?.update?.chapterId ?: return@launch
+                    cancelDownload(chapterId)
+                }
+                ChapterDownloadAction.DELETE -> {
+                    deleteChapters(items)
+                }
+            }
+            toggleAllSelection(false)
+        }
+    }
+
+    private fun startDownloadingNow(chapterId: Long) {
         downloadManager.startDownloadNow(chapterId)
     }
 
-    fun cancelDownload(chapterId: Long) {
+    private fun cancelDownload(chapterId: Long) {
         val activeDownload = downloadManager.queue.find { chapterId == it.chapter.id } ?: return
         downloadManager.deletePendingDownload(activeDownload)
         updateDownloadState(activeDownload.apply { status = Download.State.NOT_DOWNLOADED })

app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt

@@ -45,7 +45,7 @@ class WebViewActivity : BaseActivity() {
 
         setComposeContent {
             WebViewScreen(
-                onUp = { finish() },
+                onNavigateUp = { finish() },
                 initialTitle = intent.extras?.getString(TITLE_KEY),
                 url = url,
                 headers = headers,