be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

Use existing scrollbar theme method

This commit is contained in:
Isira Seneviratne 2024-11-16 16:45:35 +05:30
parent 226b6de34f
commit 7d4a2836fc
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt
View File

@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
import my.nanihadesuka.compose.ColumnScrollbar import my.nanihadesuka.compose.ColumnScrollbar
import org.schabi.newpipe.BuildConfig import org.schabi.newpipe.BuildConfig
import org.schabi.newpipe.R import org.schabi.newpipe.R
import org.schabi.newpipe.ui.theme.NewPipeScrollbarSettings import org.schabi.newpipe.ui.components.common.defaultThemedScrollbarSettings
import org.schabi.newpipe.util.external_communication.ShareUtils import org.schabi.newpipe.util.external_communication.ShareUtils
private val ABOUT_ITEMS = listOf( private val ABOUT_ITEMS = listOf(
@ -59,7 +59,7 @@ private class AboutData(
fun AboutTab() { fun AboutTab() {
val scrollState = rememberScrollState() val scrollState = rememberScrollState()
ColumnScrollbar(state = scrollState, settings = NewPipeScrollbarSettings) { ColumnScrollbar(state = scrollState, settings = defaultThemedScrollbarSettings()) {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()

5
app/src/main/java/org/schabi/newpipe/ui/components/about/LicenseTab.kt
View File

@ -13,16 +13,15 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
import my.nanihadesuka.compose.LazyColumnScrollbar
import org.schabi.newpipe.R import org.schabi.newpipe.R
import org.schabi.newpipe.ui.theme.NewPipeScrollbarSettings import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar
@Composable @Composable
@NonRestartableComposable @NonRestartableComposable
fun LicenseTab() { fun LicenseTab() {
val lazyListState = rememberLazyListState() val lazyListState = rememberLazyListState()
LazyColumnScrollbar(state = lazyListState, settings = NewPipeScrollbarSettings) { LazyColumnThemedScrollbar(state = lazyListState) {
LibrariesContainer( LibrariesContainer(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()

7
app/src/main/java/org/schabi/newpipe/ui/theme/Theme.kt
View File

@ -5,8 +5,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.lightColorScheme import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import my.nanihadesuka.compose.ScrollbarSettings
private val LightColors = lightColorScheme( private val LightColors = lightColorScheme(
primary = md_theme_light_primary, primary = md_theme_light_primary,
@ -72,11 +70,6 @@ private val DarkColors = darkColorScheme(
scrim = md_theme_dark_scrim, scrim = md_theme_dark_scrim,
) )
val NewPipeScrollbarSettings = ScrollbarSettings(
thumbSelectedColor = md_theme_dark_primary,
thumbUnselectedColor = Color.Red
)
@Composable @Composable
fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) { fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
MaterialTheme( MaterialTheme(