Consolidate Compose content/theme setting

2025-11-14 21:18:56 +01:00 · 2022-07-16 17:08:51 -04:00
parent b034f503f8
commit 46ac9fe970
7 changed files with 130 additions and 271 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
@@ -3,17 +3,12 @@ package eu.kanade.tachiyomi.ui.base.controller
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
-import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.databinding.ComposeControllerBinding
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
+import eu.kanade.tachiyomi.util.view.setComposeContent
 import nucleus.presenter.Presenter

 abstract class FullComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
@@ -27,14 +22,8 @@ abstract class FullComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
        super.onViewCreated(view)

        binding.root.apply {
-            consumeWindowInsets = false
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                TachiyomiTheme {
-                    CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
-                        ComposeContent()
-                    }
-                }
+            setComposeContent {
+                ComposeContent()
            }
        }
    }
@@ -54,15 +43,9 @@ abstract class ComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
        super.onViewCreated(view)

        binding.root.apply {
-            consumeWindowInsets = false
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
+            setComposeContent {
                val nestedScrollInterop = rememberNestedScrollInteropConnection()
-                TachiyomiTheme {
-                    CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
-                        ComposeContent(nestedScrollInterop)
-                    }
-                }
+                ComposeContent(nestedScrollInterop)
            }
        }
    }
@@ -82,15 +65,9 @@ abstract class BasicComposeController :
        super.onViewCreated(view)

        binding.root.apply {
-            consumeWindowInsets = false
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
+            setComposeContent {
                val nestedScrollInterop = rememberNestedScrollInteropConnection()
-                TachiyomiTheme {
-                    CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
-                        ComposeContent(nestedScrollInterop)
-                    }
-                }
+                ComposeContent(nestedScrollInterop)
            }
        }
    }
@@ -107,15 +84,9 @@ abstract class SearchableComposeController<P : BasePresenter<*>>(bundle: Bundle?
        super.onViewCreated(view)

        binding.root.apply {
-            consumeWindowInsets = false
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
+            setComposeContent {
                val nestedScrollInterop = rememberNestedScrollInteropConnection()
-                TachiyomiTheme {
-                    CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
-                        ComposeContent(nestedScrollInterop)
-                    }
-                }
+                ComposeContent(nestedScrollInterop)
            }
        }
    }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryAdapter.kt
@@ -3,17 +3,11 @@ package eu.kanade.tachiyomi.ui.library
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.material3.LocalContentColor
-import androidx.compose.material3.LocalTextStyle
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import com.google.accompanist.swiperefresh.SwipeRefresh
 import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
@@ -23,7 +17,6 @@ import eu.kanade.presentation.library.components.LibraryComfortableGrid
 import eu.kanade.presentation.library.components.LibraryCompactGrid
 import eu.kanade.presentation.library.components.LibraryCoverOnlyGrid
 import eu.kanade.presentation.library.components.LibraryList
-import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.LibraryManga
 import eu.kanade.tachiyomi.data.library.LibraryUpdateService
@@ -31,6 +24,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ComposeControllerBinding
 import eu.kanade.tachiyomi.ui.library.setting.DisplayModeSetting
 import eu.kanade.tachiyomi.util.system.toast
+import eu.kanade.tachiyomi.util.view.setComposeContent
 import eu.kanade.tachiyomi.widget.RecyclerViewPagerAdapter
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -101,80 +95,74 @@ class LibraryAdapter(
     */
    override fun bindView(view: View, position: Int) {
        (view as ComposeView).apply {
-            consumeWindowInsets = false
-            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
-            setContent {
-                TachiyomiTheme {
-                    CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.bodySmall, LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
-                        val nestedScrollInterop = rememberNestedScrollInteropConnection()
+            setComposeContent {
+                val nestedScrollInterop = rememberNestedScrollInteropConnection()

-                        val category = presenter.categories[position]
-                        val displayMode = presenter.getDisplayMode(index = position)
-                        val mangaList by presenter.getMangaForCategory(categoryId = category.id)
+                val category = presenter.categories[position]
+                val displayMode = presenter.getDisplayMode(index = position)
+                val mangaList by presenter.getMangaForCategory(categoryId = category.id)

-                        val onClickManga = { manga: LibraryManga ->
-                            if (presenter.hasSelection().not()) {
-                                onClickManga(manga)
-                            } else {
-                                presenter.toggleSelection(manga)
-                            }
+                val onClickManga = { manga: LibraryManga ->
+                    if (presenter.hasSelection().not()) {
+                        onClickManga(manga)
+                    } else {
+                        presenter.toggleSelection(manga)
+                    }
+                }
+                val onLongClickManga = { manga: LibraryManga ->
+                    presenter.toggleSelection(manga)
+                }
+
+                SwipeRefresh(
+                    modifier = Modifier.nestedScroll(nestedScrollInterop),
+                    state = rememberSwipeRefreshState(isRefreshing = false),
+                    onRefresh = {
+                        if (LibraryUpdateService.start(context, category)) {
+                            context.toast(R.string.updating_category)
                        }
-                        val onLongClickManga = { manga: LibraryManga ->
-                            presenter.toggleSelection(manga)
+                    },
+                    indicator = { s, trigger ->
+                        SwipeRefreshIndicator(
+                            state = s,
+                            refreshTriggerDistance = trigger,
+                        )
+                    },
+                ) {
+                    when (displayMode) {
+                        DisplayModeSetting.LIST -> {
+                            LibraryList(
+                                items = mangaList,
+                                selection = presenter.selection,
+                                onClick = onClickManga,
+                                onLongClick = onLongClickManga,
+                            )
                        }
-
-                        SwipeRefresh(
-                            modifier = Modifier.nestedScroll(nestedScrollInterop),
-                            state = rememberSwipeRefreshState(isRefreshing = false),
-                            onRefresh = {
-                                if (LibraryUpdateService.start(context, category)) {
-                                    context.toast(R.string.updating_category)
-                                }
-                            },
-                            indicator = { s, trigger ->
-                                SwipeRefreshIndicator(
-                                    state = s,
-                                    refreshTriggerDistance = trigger,
-                                )
-                            },
-                        ) {
-                            when (displayMode) {
-                                DisplayModeSetting.LIST -> {
-                                    LibraryList(
-                                        items = mangaList,
-                                        selection = presenter.selection,
-                                        onClick = onClickManga,
-                                        onLongClick = onLongClickManga,
-                                    )
-                                }
-                                DisplayModeSetting.COMPACT_GRID -> {
-                                    LibraryCompactGrid(
-                                        items = mangaList,
-                                        columns = presenter.columns,
-                                        selection = presenter.selection,
-                                        onClick = onClickManga,
-                                        onLongClick = onLongClickManga,
-                                    )
-                                }
-                                DisplayModeSetting.COMFORTABLE_GRID -> {
-                                    LibraryComfortableGrid(
-                                        items = mangaList,
-                                        columns = presenter.columns,
-                                        selection = presenter.selection,
-                                        onClick = onClickManga,
-                                        onLongClick = onLongClickManga,
-                                    )
-                                }
-                                DisplayModeSetting.COVER_ONLY_GRID -> {
-                                    LibraryCoverOnlyGrid(
-                                        items = mangaList,
-                                        columns = presenter.columns,
-                                        selection = presenter.selection,
-                                        onClick = onClickManga,
-                                        onLongClick = onLongClickManga,
-                                    )
-                                }
-                            }
+                        DisplayModeSetting.COMPACT_GRID -> {
+                            LibraryCompactGrid(
+                                items = mangaList,
+                                columns = presenter.columns,
+                                selection = presenter.selection,
+                                onClick = onClickManga,
+                                onLongClick = onLongClickManga,
+                            )
+                        }
+                        DisplayModeSetting.COMFORTABLE_GRID -> {
+                            LibraryComfortableGrid(
+                                items = mangaList,
+                                columns = presenter.columns,
+                                selection = presenter.selection,
+                                onClick = onClickManga,
+                                onLongClick = onLongClickManga,
+                            )
+                        }
+                        DisplayModeSetting.COVER_ONLY_GRID -> {
+                            LibraryCoverOnlyGrid(
+                                items = mangaList,
+                                columns = presenter.columns,
+                                selection = presenter.selection,
+                                onClick = onClickManga,
+                                onLongClick = onLongClickManga,
+                            )
                        }
                    }
                }
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/track/BaseOAuthLoginActivity.kt
@@ -3,12 +3,11 @@ package eu.kanade.tachiyomi.ui.setting.track
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.activity.compose.setContent
 import eu.kanade.presentation.components.LoadingScreen
-import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.ui.base.activity.BaseActivity
 import eu.kanade.tachiyomi.ui.main.MainActivity
+import eu.kanade.tachiyomi.util.view.setComposeContent
 import uy.kohesive.injekt.injectLazy

 abstract class BaseOAuthLoginActivity : BaseActivity() {
@@ -20,10 +19,8 @@ abstract class BaseOAuthLoginActivity : BaseActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)

-        setContent {
-            TachiyomiTheme {
-                LoadingScreen()
-            }
+        setComposeContent {
+            LoadingScreen()
        }

        handleResult(intent.data)
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/WebViewActivity.kt
@@ -4,8 +4,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.compose.setContent
-import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.presentation.webview.WebViewScreen
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.network.NetworkHelper
@@ -16,6 +14,7 @@ import eu.kanade.tachiyomi.util.system.WebViewUtil
 import eu.kanade.tachiyomi.util.system.logcat
 import eu.kanade.tachiyomi.util.system.openInBrowser
 import eu.kanade.tachiyomi.util.system.toast
+import eu.kanade.tachiyomi.util.view.setComposeContent
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import uy.kohesive.injekt.injectLazy

@@ -44,18 +43,16 @@ class WebViewActivity : BaseActivity() {
            headers = source.headers.toMultimap().mapValues { it.value.getOrNull(0) ?: "" }.toMutableMap()
        }

-        setContent {
-            TachiyomiTheme {
-                WebViewScreen(
-                    onUp = { finish() },
-                    initialTitle = intent.extras?.getString(TITLE_KEY),
-                    url = url,
-                    headers = headers,
-                    onShare = this::shareWebpage,
-                    onOpenInBrowser = this::openInBrowser,
-                    onClearCookies = this::clearCookies,
-                )
-            }
+        setComposeContent {
+            WebViewScreen(
+                onUp = { finish() },
+                initialTitle = intent.extras?.getString(TITLE_KEY),
+                url = url,
+                headers = headers,
+                onShare = this::shareWebpage,
+                onOpenInBrowser = this::openInBrowser,
+                onClearCookies = this::clearCookies,
+            )
        }
    }