yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Don't set text colors when creating compose theme (#7316)

Browse Source 
This avoids compose snackbar text color issue
This commit is contained in:
Ivan Iskandar 2022-06-16 22:37:57 +07:00 committed by GitHub
parent 017f6b22f0
commit 4ef337f1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/presentation/theme/TachiyomiTheme.kt
View File

@ -14,7 +14,6 @@ fun TachiyomiTheme(content: @Composable () -> Unit) {
val (colorScheme, typography) = createMdc3Theme( val (colorScheme, typography) = createMdc3Theme(
context = context, context = context,
layoutDirection = layoutDirection, layoutDirection = layoutDirection,
setTextColors = true,
) )
MaterialTheme( MaterialTheme(

9
app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ComposeController.kt
View File

@ -4,7 +4,10 @@ import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import androidx.compose.foundation.layout.consumeWindowInsets 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.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.input.nestedscroll.NestedScrollConnection import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.compose.ui.platform.ViewCompositionStrategy
import androidx.compose.ui.platform.rememberNestedScrollInteropConnection import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
@ -32,12 +35,14 @@ abstract class ComposeController<P : Presenter<*>>(bundle: Bundle? = null) :
setContent { setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection() val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme { TachiyomiTheme {
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
ComposeContent(nestedScrollInterop) ComposeContent(nestedScrollInterop)
} }
} }
} }
} }
} }
}
/** /**
* Basic Compose controller without a presenter. * Basic Compose controller without a presenter.
@ -58,12 +63,14 @@ abstract class BasicComposeController :
setContent { setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection() val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme { TachiyomiTheme {
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
ComposeContent(nestedScrollInterop) ComposeContent(nestedScrollInterop)
} }
} }
} }
} }
} }
}
abstract class SearchableComposeController<P : BasePresenter<*>>(bundle: Bundle? = null) : abstract class SearchableComposeController<P : BasePresenter<*>>(bundle: Bundle? = null) :
SearchableNucleusController<ComposeControllerBinding, P>(bundle), SearchableNucleusController<ComposeControllerBinding, P>(bundle),
@ -81,12 +88,14 @@ abstract class SearchableComposeController<P : BasePresenter<*>>(bundle: Bundle?
setContent { setContent {
val nestedScrollInterop = rememberNestedScrollInteropConnection() val nestedScrollInterop = rememberNestedScrollInteropConnection()
TachiyomiTheme { TachiyomiTheme {
CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
ComposeContent(nestedScrollInterop) ComposeContent(nestedScrollInterop)
} }
} }
} }
} }
} }
}
interface ComposeContentController { interface ComposeContentController {
@Composable fun ComposeContent(nestedScrollInterop: NestedScrollConnection) @Composable fun ComposeContent(nestedScrollInterop: NestedScrollConnection)