Merge pull request #363 from you-apps/scrollbar

feat: use fast scrollbar for contacts list
you-apps · Jan 11, 2024 · 81031da · 81031da
2 parents 48425ad + e0a2076
commit 81031da
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 259 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -76,6 +76,7 @@ dependencies {
     implementation("androidx.compose.ui:ui-tooling-preview:$compose_version")
     implementation("androidx.compose.material3:material3:1.2.0-alpha02")
     implementation("androidx.compose.material:material-icons-extended:1.4.3")
+    implementation("com.github.nanihadesuka:LazyColumnScrollbar:1.9.0")
 
     // VCard
     implementation("com.googlecode.ez-vcard:ez-vcard:0.11.3")

diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt b/app/src/main/java/com/bnyro/contacts/ui/components/ContactsList.kt
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -15,7 +16,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.FilterOptions
-import com.bnyro.contacts.ui.components.modifier.scrollbar
+import my.nanihadesuka.compose.LazyColumnScrollbar
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -43,46 +44,52 @@ fun ContactsList(
             it.getNameBySortOrder(filterOptions.sortOder)?.firstOrNull()?.uppercase()
         }
     }
-    LazyColumn(
-        state = state,
-        modifier = Modifier
-            .padding(end = 5.dp)
-            .scrollbar(state, false)
-            .let { modifier ->
-                scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
-            }
+    LazyColumnScrollbar(
+        listState = state,
+        thumbColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),
+        thumbSelectedColor = MaterialTheme.colorScheme.primary,
+        thickness = 8.dp
     ) {
-        contactGroups.forEach { (firstLetter, groupedContacts) ->
-            stickyHeader {
-                CharacterHeader(firstLetter.orEmpty())
-            }
-            items(groupedContacts) {
-                ContactItem(
-                    modifier = Modifier.padding(horizontal = 10.dp),
-                    contact = it,
-                    sortOrder = filterOptions.sortOder,
-                    selected = selectedContacts.contains(it),
-                    onSinglePress = {
-                        if (selectedContacts.isEmpty()) {
-                            false
-                        } else {
-                            if (selectedContacts.contains(it)) {
-                                selectedContacts.remove(it)
+        LazyColumn(
+            state = state,
+            modifier = Modifier
+                .padding(end = 5.dp)
+                .let { modifier ->
+                    scrollConnection?.let { modifier.nestedScroll(it) } ?: modifier
+                }
+        ) {
+            contactGroups.forEach { (firstLetter, groupedContacts) ->
+                stickyHeader {
+                    CharacterHeader(firstLetter.orEmpty())
+                }
+                items(groupedContacts) {
+                    ContactItem(
+                        modifier = Modifier.padding(horizontal = 10.dp),
+                        contact = it,
+                        sortOrder = filterOptions.sortOder,
+                        selected = selectedContacts.contains(it),
+                        onSinglePress = {
+                            if (selectedContacts.isEmpty()) {
+                                false
                             } else {
-                                selectedContacts.add(it)
+                                if (selectedContacts.contains(it)) {
+                                    selectedContacts.remove(it)
+                                } else {
+                                    selectedContacts.add(it)
+                                }
+                                true
                             }
-                            true
+                        },
+                        onLongPress = {
+                            if (!selectedContacts.contains(it)) selectedContacts.add(it)
                         }
-                    },
-                    onLongPress = {
-                        if (!selectedContacts.contains(it)) selectedContacts.add(it)
-                    }
-                )
+                    )
+                }
             }
-        }
 
-        item {
-            Spacer(modifier = Modifier.height(10.dp))
+            item {
+                Spacer(modifier = Modifier.height(10.dp))
+            }
         }
     }
 }
diff --git a/app/src/main/java/com/bnyro/contacts/ui/components/modifier/Scrollable.kt b/app/src/main/java/com/bnyro/contacts/ui/components/modifier/Scrollable.kt
diff --git a/...ro/contacts/ui/components/ContactsPage.kt → ...yro/contacts/ui/screens/ContactsScreen.kt b/...ro/contacts/ui/components/ContactsPage.kt → ...yro/contacts/ui/screens/ContactsScreen.kt
@@ -1,4 +1,4 @@
-package com.bnyro.contacts.ui.components
+package com.bnyro.contacts.ui.screens
 
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -50,17 +50,16 @@ import com.bnyro.contacts.R
 import com.bnyro.contacts.enums.ContactsSource
 import com.bnyro.contacts.obj.ContactData
 import com.bnyro.contacts.obj.FilterOptions
+import com.bnyro.contacts.ui.components.ContactSearchScreen
+import com.bnyro.contacts.ui.components.ContactsList
+import com.bnyro.contacts.ui.components.NothingHere
 import com.bnyro.contacts.ui.components.base.ClickableIcon
 import com.bnyro.contacts.ui.components.base.OptionMenu
 import com.bnyro.contacts.ui.components.dialogs.ConfirmationDialog
 import com.bnyro.contacts.ui.components.dialogs.FilterDialog
 import com.bnyro.contacts.ui.components.dialogs.SimImportDialog
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.ui.models.state.ContactListState
-import com.bnyro.contacts.ui.screens.AboutScreen
-import com.bnyro.contacts.ui.screens.EditorScreen
-import com.bnyro.contacts.ui.screens.SettingsScreen
-import com.bnyro.contacts.ui.screens.SingleContactScreen
 import com.bnyro.contacts.util.BackupHelper
 import com.bnyro.contacts.util.Preferences
 

diff --git a/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt b/app/src/main/java/com/bnyro/contacts/ui/screens/MainAppContent.kt
@@ -32,7 +32,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.bnyro.contacts.R
 import com.bnyro.contacts.obj.NavBarItem
-import com.bnyro.contacts.ui.components.ContactsPage
 import com.bnyro.contacts.ui.models.ContactsModel
 import com.bnyro.contacts.ui.models.SmsModel
 import com.bnyro.contacts.ui.models.ThemeModel

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://jitpack.io")
     }
 }
 rootProject.name = "Connect You"