Skip to content

Commit 7d4a283

Browse files
Use existing scrollbar theme method
1 parent 226b6de commit 7d4a283

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
2424
import my.nanihadesuka.compose.ColumnScrollbar
2525
import org.schabi.newpipe.BuildConfig
2626
import org.schabi.newpipe.R
27-
import org.schabi.newpipe.ui.theme.NewPipeScrollbarSettings
27+
import org.schabi.newpipe.ui.components.common.defaultThemedScrollbarSettings
2828
import org.schabi.newpipe.util.external_communication.ShareUtils
2929

3030
private val ABOUT_ITEMS = listOf(
@@ -59,7 +59,7 @@ private class AboutData(
5959
fun AboutTab() {
6060
val scrollState = rememberScrollState()
6161

62-
ColumnScrollbar(state = scrollState, settings = NewPipeScrollbarSettings) {
62+
ColumnScrollbar(state = scrollState, settings = defaultThemedScrollbarSettings()) {
6363
Column(
6464
modifier = Modifier
6565
.fillMaxWidth()

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,15 @@ import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.res.stringResource
1414
import androidx.compose.ui.unit.dp
1515
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
16-
import my.nanihadesuka.compose.LazyColumnScrollbar
1716
import org.schabi.newpipe.R
18-
import org.schabi.newpipe.ui.theme.NewPipeScrollbarSettings
17+
import org.schabi.newpipe.ui.components.common.LazyColumnThemedScrollbar
1918

2019
@Composable
2120
@NonRestartableComposable
2221
fun LicenseTab() {
2322
val lazyListState = rememberLazyListState()
2423

25-
LazyColumnScrollbar(state = lazyListState, settings = NewPipeScrollbarSettings) {
24+
LazyColumnThemedScrollbar(state = lazyListState) {
2625
LibrariesContainer(
2726
modifier = Modifier
2827
.fillMaxWidth()

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import androidx.compose.material3.MaterialTheme
55
import androidx.compose.material3.darkColorScheme
66
import androidx.compose.material3.lightColorScheme
77
import androidx.compose.runtime.Composable
8-
import androidx.compose.ui.graphics.Color
9-
import my.nanihadesuka.compose.ScrollbarSettings
108

119
private val LightColors = lightColorScheme(
1210
primary = md_theme_light_primary,
@@ -72,11 +70,6 @@ private val DarkColors = darkColorScheme(
7270
scrim = md_theme_dark_scrim,
7371
)
7472

75-
val NewPipeScrollbarSettings = ScrollbarSettings(
76-
thumbSelectedColor = md_theme_dark_primary,
77-
thumbUnselectedColor = Color.Red
78-
)
79-
8073
@Composable
8174
fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
8275
MaterialTheme(

0 commit comments

Comments
 (0)