Replace scrollbar library

Author: equeim

app/build.gradle.kts

@@ -110,9 +110,9 @@ dependencies {
     implementation(libs.androidx.compose.materialIconsCore)
 
     implementation(libs.composeGrid)
-    implementation(libs.fastscroller)
     implementation(libs.timber)
     implementation(libs.serialization.json.okio)
+    implementation(libs.lazycolumnscrollbar)
 
     debugImplementation(libs.leakcanary)
     debugImplementation(libs.androidx.compose.uiTooling)

app/src/main/kotlin/org/equeim/tremotesf/ui/components/TremotesfLazyColumnScrollBar.kt

@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2017-2025 Alexey Rochev <[email protected]>
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package org.equeim.tremotesf.ui.components
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import my.nanihadesuka.compose.InternalLazyColumnScrollbar
+import my.nanihadesuka.compose.ScrollbarSettings
+import org.equeim.tremotesf.ui.Dimens
+
+@Composable
+fun TremotesfLazyColumnScrollBar(state: LazyListState, modifier: Modifier = Modifier) {
+    val primaryColor = MaterialTheme.colorScheme.primary
+    val settings = remember(primaryColor) {
+        ScrollbarSettings.Default.copy(
+            thumbSelectedColor = primaryColor,
+            thumbUnselectedColor = primaryColor.copy(alpha = 0.6f)
+        )
+    }
+    InternalLazyColumnScrollbar(
+        state = state,
+        settings = settings,
+        modifier = modifier.padding(vertical = Dimens.SpacingSmall)
+    )
+}

app/src/main/kotlin/org/equeim/tremotesf/ui/components/TremotesfTorrentFilesList.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
@@ -53,9 +52,6 @@ import androidx.compose.ui.state.ToggleableState
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import io.github.oikvpqya.compose.fastscroller.VerticalScrollbar
-import io.github.oikvpqya.compose.fastscroller.material3.defaultMaterialScrollbarStyle
-import io.github.oikvpqya.compose.fastscroller.rememberScrollbarAdapter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.drop
@@ -216,14 +212,7 @@ fun TremotesfTorrentsFilesList(
             }
         }
 
-        VerticalScrollbar(
-            adapter = rememberScrollbarAdapter(listState),
-            style = defaultMaterialScrollbarStyle(),
-            modifier = Modifier
-                .align(Alignment.TopEnd)
-                .padding(contentPadding)
-                .fillMaxHeight()
-        )
+        TremotesfLazyColumnScrollBar(listState, Modifier.padding(contentPadding))
 
         SelectionPanel(
             selectionState = selectionState,

app/src/main/kotlin/org/equeim/tremotesf/ui/torrentslistfragment/TorrentsList.kt

@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
@@ -63,9 +62,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import io.github.oikvpqya.compose.fastscroller.VerticalScrollbar
-import io.github.oikvpqya.compose.fastscroller.material3.defaultMaterialScrollbarStyle
-import io.github.oikvpqya.compose.fastscroller.rememberScrollbarAdapter
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.drop
@@ -89,6 +85,7 @@ import org.equeim.tremotesf.ui.TorrentRenameDialog
 import org.equeim.tremotesf.ui.TorrentsRemoveDialog
 import org.equeim.tremotesf.ui.components.TremotesfIconButtonWithTooltip
 import org.equeim.tremotesf.ui.components.TremotesfIconButtonWithTooltipAndMenu
+import org.equeim.tremotesf.ui.components.TremotesfLazyColumnScrollBar
 import org.equeim.tremotesf.ui.components.TremotesfMultiSelectionPanel
 import org.equeim.tremotesf.ui.components.TremotesfMultiSelectionState
 import org.equeim.tremotesf.ui.components.TremotesfPlaceholderText
@@ -190,14 +187,7 @@ fun TorrentsList(
             )
         }
 
-        VerticalScrollbar(
-            adapter = rememberScrollbarAdapter(listState),
-            style = defaultMaterialScrollbarStyle(),
-            modifier = Modifier
-                .align(Alignment.TopEnd)
-                .padding(innerPadding)
-                .fillMaxHeight()
-        )
+        TremotesfLazyColumnScrollBar(listState, Modifier.padding(innerPadding))
 
         SelectionPanel(
             selectionState = selectionState,

gradle/libs.versions.toml

@@ -28,9 +28,9 @@ androidx-window = "1.4.0"
 androidx-work = "2.10.2"
 
 composeGrid = "2.3.1"
-fastscroller = "0.3.2"
 leakcanary = "2.14"
 timber = "5.0.1"
+lazycolumnscrollbar = "2.2.0"
 
 okhttp = "4.12.0"
 
@@ -73,9 +73,9 @@ androidx-window = { module = "androidx.window:window", version.ref = "androidx-w
 androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "androidx-work" }
 
 composeGrid = { module = "com.cheonjaeung.compose.grid:grid", version.ref = "composeGrid" }
-fastscroller = { module = "io.github.oikvpqya.compose.fastscroller:fastscroller-material3", version.ref = "fastscroller" }
 leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
+lazycolumnscrollbar = { module = "com.github.nanihadesuka:LazyColumnScrollbar", version.ref = "lazycolumnscrollbar" }
 
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }

settings.gradle.kts

@@ -14,6 +14,7 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
         google()
+        maven("https://jitpack.io")
     }
 }