From e06b30cd7a99b99bd258429eb642568eacedf9a5 Mon Sep 17 00:00:00 2001
From: Ushie <ushiekane@gmail.com>
Date: Mon, 10 Oct 2022 21:33:22 +0300
Subject: [PATCH] feat: improve contributors screen

---
 app/build.gradle.kts                          |  2 +
 .../manager/ui/component/ContributorsCard.kt  | 77 ++++++++++---------
 .../subscreens/ContributorsSubscreen.kt       | 29 ++++---
 .../ui/viewmodel/ContributorsViewModel.kt     | 10 ++-
 app/src/main/res/values/strings.xml           | 10 +--
 5 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e6c205c..3ff765d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -101,6 +101,7 @@ dependencies {
     implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
     implementation("com.google.accompanist:accompanist-placeholder-material:$accompanistVersion")
     implementation("com.google.accompanist:accompanist-drawablepainter:$accompanistVersion")
+    implementation("com.google.accompanist:accompanist-flowlayout:$accompanistVersion")
 
     // Coil (async image loading)
     implementation("io.coil-kt:coil-compose:2.1.0")
@@ -136,5 +137,6 @@ dependencies {
     implementation("androidx.concurrent:concurrent-futures:1.1.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.6.4")
 
+    // Networking
     implementation("com.github.niusounds:cronet-engine:0.1.0")
 }
diff --git a/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt b/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt
index b54b901..1e2fd0d 100644
--- a/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ContributorsCard.kt
@@ -1,15 +1,11 @@
 package app.revanced.manager.ui.component
 
 import android.widget.Toast
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
-import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
+import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.ui.Alignment
@@ -17,23 +13,27 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.dto.github.Contributor
+import app.revanced.manager.ui.viewmodel.ContributorsViewModel
 import coil.compose.AsyncImage
+import com.google.accompanist.flowlayout.FlowRow
+import com.google.accompanist.flowlayout.SizeMode
+import org.koin.androidx.compose.getViewModel
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 @ExperimentalMaterial3Api
 fun ContributorsCard(
     title: String,
-    size: Int,
     data: SnapshotStateList<Contributor>,
+    vm: ContributorsViewModel = getViewModel()
 ) {
     val context = LocalContext.current
     Column(
         Modifier
-            .padding(horizontal = 8.dp, vertical = 8.dp)
+            .padding(16.dp, 8.dp, 16.dp, 4.dp)
             .fillMaxWidth()
     ) {
         Text(
@@ -41,36 +41,41 @@ fun ContributorsCard(
             modifier = Modifier
                 .fillMaxWidth()
                 .align(Alignment.CenterHorizontally)
-                .padding(8.dp),
-            fontSize = MaterialTheme.typography.titleLarge.fontSize,
-            maxLines = 1,
-            overflow = TextOverflow.Ellipsis,
+                .padding(bottom = 8.dp),
             style = MaterialTheme.typography.titleLarge
         )
 
-        if (data.isNotEmpty()) {
-            LazyVerticalGrid(
-                columns = GridCells.Adaptive(48.dp),
-                verticalArrangement = Arrangement.spacedBy(4.dp),
-                horizontalArrangement = Arrangement.spacedBy(4.dp),
-                modifier = Modifier.height(size.dp),
-                userScrollEnabled = false
-            ) {
-                items(data) { contributor ->
-                    AsyncImage(
-                        model = contributor.avatarUrl,
-                        contentDescription = stringResource(id = R.string.contributor_image),
-                        Modifier
-                            .padding(4.dp)
-                            .size(40.dp)
-                            .clip(CircleShape)
-                            .clickable {
-                                Toast
-                                    .makeText(context, contributor.username, Toast.LENGTH_SHORT)
-                                    .show()
-                            }
-                    )
+        ElevatedCard {
+            if (data.isNotEmpty()) {
+                FlowRow(
+                    mainAxisSize = SizeMode.Expand,
+                    modifier = Modifier.padding(8.dp)
+                ) {
+                    data.forEach { contributor ->
+                        AsyncImage(
+                            model = contributor.avatarUrl,
+                            contentDescription = stringResource(id = R.string.contributor_image),
+                            Modifier
+                                .padding(4.dp)
+                                .size(48.dp)
+                                .clip(CircleShape)
+                                .combinedClickable(
+                                    onClick = { vm.openUserProfile(contributor.username) },
+                                    onLongClick = {
+                                        Toast.makeText(context, contributor.username, Toast.LENGTH_SHORT).show()
+                                    }
+                                )
+                        )
+                    }
                 }
+            } else {
+                Box(
+                    modifier = Modifier
+                        .padding(vertical = 24.dp)
+                        .fillMaxWidth(),
+                    contentAlignment = Alignment.Center,
+                    content = { CircularProgressIndicator() }
+                )
             }
         }
     }
diff --git a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt
index 1146a88..4921e2e 100644
--- a/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/subscreens/ContributorsSubscreen.kt
@@ -9,9 +9,11 @@ import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.ContributorsCard
 import app.revanced.manager.ui.navigation.AppDestination
@@ -27,10 +29,16 @@ fun ContributorsSubscreen(
     navigator: BackstackNavigator<AppDestination>,
     vm: ContributorsViewModel = getViewModel()
 ) {
+    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(
+        state = rememberTopAppBarState(),
+        canScroll = { true }
+    )
     val ctx = LocalContext.current.applicationContext
     Scaffold(
+        modifier = Modifier
+            .nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
-            MediumTopAppBar(
+            LargeTopAppBar(
                 title = {
                     Text(
                         text = stringResource(R.string.screen_contributors_title)
@@ -43,7 +51,8 @@ fun ContributorsSubscreen(
                             contentDescription = null
                         )
                     }
-                }
+                },
+                scrollBehavior = scrollBehavior
             )
         },
         floatingActionButton = {
@@ -55,32 +64,28 @@ fun ContributorsSubscreen(
         Column(
             Modifier
                 .padding(paddingValues)
+                .padding(bottom = 8.dp)
                 .verticalScroll(rememberScrollState())
         ) {
             ContributorsCard(
                 stringResource(R.string.cli_contributors),
-                data = vm.cliContributorsList,
-                size = 100
+                data = vm.cliContributorsList
             )
             ContributorsCard(
                 stringResource(R.string.patcher_contributors),
-                data = vm.patcherContributorsList,
-                size = 100
+                data = vm.patcherContributorsList
             )
             ContributorsCard(
                 stringResource(R.string.patches_contributors),
-                data = vm.patchesContributorsList,
-                size = 200
+                data = vm.patchesContributorsList
             )
             ContributorsCard(
                 stringResource(R.string.manager_contributors),
-                data = vm.managerContributorsList,
-                size = 100
+                data = vm.managerContributorsList
             )
             ContributorsCard(
                 stringResource(R.string.integrations_contributors),
-                data = vm.integrationsContributorsList,
-                size = 200
+                data = vm.integrationsContributorsList
             )
         }
     }
diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/ContributorsViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/ContributorsViewModel.kt
index 51d5f34..42dace8 100644
--- a/app/src/main/java/app/revanced/manager/ui/viewmodel/ContributorsViewModel.kt
+++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/ContributorsViewModel.kt
@@ -1,5 +1,6 @@
 package app.revanced.manager.ui.viewmodel
 
+import android.app.Application
 import androidx.compose.runtime.mutableStateListOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -8,7 +9,10 @@ import app.revanced.manager.repository.GitHubRepository
 import app.revanced.manager.util.*
 import kotlinx.coroutines.launch
 
-class ContributorsViewModel(private val repository: GitHubRepository) : ViewModel() {
+class ContributorsViewModel(
+    private val app: Application,
+    private val repository: GitHubRepository
+) : ViewModel() {
     val patcherContributorsList = mutableStateListOf<Contributor>()
     val patchesContributorsList = mutableStateListOf<Contributor>()
     val cliContributorsList = mutableStateListOf<Contributor>()
@@ -55,6 +59,10 @@ class ContributorsViewModel(private val repository: GitHubRepository) : ViewMode
         }
     }
 
+    fun openUserProfile(username: String) {
+        app.openUrl("https://github.com/${username}")
+    }
+
     init {
         viewModelScope.launch {
             loadContributors()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d506e1..c0d6763 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,17 +55,17 @@
     <string name="help_translate">Help translate</string>
     <string name="whats_new">What\'s New</string>
     <string name="ic_non_selected">No patches are selected!</string>
-    <string name="patcher_contributors">Patcher Contributors</string>
     <string name="contributor_image">Contributor image</string>
     <string name="no_contributors">No contributors</string>
     <string name="screen_settings_title">Settings</string>
     <string name="screen_about_title">About</string>
     <string name="about">About</string>
     <string name="navigation_more">More</string>
-    <string name="cli_contributors">CLI Contributors</string>
-    <string name="patches_contributors">Patches Contributors</string>
-    <string name="manager_contributors">Manager Contributors</string>
-    <string name="integrations_contributors">Integrations Contributors</string>
+    <string name="cli_contributors">CLI</string>
+    <string name="patcher_contributors">Patcher</string>
+    <string name="patches_contributors">Patches</string>
+    <string name="manager_contributors">Manager</string>
+    <string name="integrations_contributors">Integrations</string>
     <string name="dropdown_button">Dropdown Button</string>
     <string name="app_version">Version</string>
     <string name="faq">FAQ</string>