update browse ui

Author: X1nto

app/src/main/java/com/vanced/store/ui/component/AppCard.kt

@@ -10,56 +10,42 @@ import com.vanced.store.ui.theme.VSTheme
 
 @Composable
 fun BrowseAppCard(
+    onClick: (() -> Unit)?,
     icon: @Composable () -> Unit,
     title: @Composable () -> Unit,
     description: @Composable () -> Unit,
     labels: @Composable () -> Unit,
-    actions: @Composable () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     VSElevatedCard(
+        onClick = onClick,
         modifier = modifier,
         shape = VSTheme.shapes.large
     ) {
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(VSTheme.spacing.extraLarge)
-        ) {
-            Row(
-                modifier = Modifier.align(Alignment.TopEnd),
-                horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.extraSmall),
-                verticalAlignment = Alignment.CenterVertically
+        Column {
+            Box(
+                modifier = Modifier
+                    .clip(VSTheme.shapes.medium)
+                    .fillMaxWidth()
+                    .aspectRatio(1f / 1f)
             ) {
-                labels()
+                icon()
             }
-            Row(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .align(Alignment.Center),
-                horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.large)
+            Column(
+                modifier = Modifier.fillMaxWidth().padding(VSTheme.spacing.medium),
+                verticalArrangement = Arrangement.spacedBy(VSTheme.spacing.small)
             ) {
-                Box(modifier = Modifier.clip(VSTheme.shapes.medium)) {
-                    icon()
+                ProvideTextStyle(VSTheme.typography.titleMedium) {
+                    title()
+                }
+                ProvideTextStyle(VSTheme.typography.bodySmall) {
+                    description()
                 }
-                Column(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .padding(top = VSTheme.spacing.extraSmall),
-                    verticalArrangement = Arrangement.spacedBy(VSTheme.spacing.medium)
+                Row(
+                    modifier = Modifier.align(Alignment.End),
+                    horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.extraSmall)
                 ) {
-                    ProvideTextStyle(VSTheme.typography.titleMedium) {
-                        title()
-                    }
-                    ProvideTextStyle(VSTheme.typography.bodySmall) {
-                        description()
-                    }
-                    Row(
-                        modifier = Modifier.align(Alignment.End),
-                        horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.small)
-                    ) {
-                        actions()
-                    }
+                    labels()
                 }
             }
         }

app/src/main/java/com/vanced/store/ui/screen/BrowseScreen.kt

@@ -109,11 +109,8 @@ private fun BrowseScreenSuccess(
             }) {
                 items(pinnedApps) { app ->
                     BrowseAppCardLoaded(
-                        appName = app.appName,
-                        appDescription = app.appDescription,
-                        supportsNonroot = app.supportsNonroot,
-                        supportsRoot = app.supportsRoot,
-                        onDetailsClick = {
+                        app = app,
+                        onClick = {
 
                         }
                     )
@@ -126,11 +123,8 @@ private fun BrowseScreenSuccess(
             }) {
                 items(repositoryApps) { app ->
                     BrowseAppCardLoaded(
-                        appName = app.appName,
-                        appDescription = app.appDescription,
-                        supportsNonroot = app.supportsNonroot,
-                        supportsRoot = app.supportsRoot,
-                        onDetailsClick = {
+                        app = app,
+                        onClick = {
 
                         }
                     )

app/src/main/java/com/vanced/store/ui/util/Grid.kt

@@ -1,7 +1,7 @@
 package com.vanced.store.ui.util
 
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.material3.ProvideTextStyle
@@ -16,11 +16,10 @@ inline fun LazyGridScope.category(
 ) {
     item(span = { GridItemSpan(maxCurrentLineSpan) }) {
         ProvideTextStyle(VSTheme.typography.headlineSmall.copy(fontWeight = FontWeight.Medium)) {
-            title()
+            Box(Modifier.padding(VSTheme.spacing.small)) {
+                title()
+            }
         }
     }
     block()
-    item(span = { GridItemSpan(maxCurrentLineSpan) }) {
-        Spacer(Modifier.height(VSTheme.spacing.small))
-    }
 }

app/src/main/java/com/vanced/store/ui/widget/BrowseAppCard.kt

@@ -2,55 +2,47 @@ package com.vanced.store.ui.widget
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import com.vanced.store.domain.model.DomainBrowseApp
 import com.vanced.store.ui.component.BrowseAppCard
 import com.vanced.store.ui.theme.VSTheme
 
 @Composable
 fun BrowseAppCardLoaded(
-    onDetailsClick: () -> Unit,
-    appName: String,
-    appDescription: String,
-    supportsRoot: Boolean,
-    supportsNonroot: Boolean,
+    onClick: () -> Unit,
+    app: DomainBrowseApp,
     modifier: Modifier = Modifier,
 ) {
     BrowseAppCard(
         modifier = modifier,
+        onClick = onClick,
         icon = {
             Box(modifier = Modifier
-                .size(48.dp)
-                .background(VSTheme.colorScheme.primary))
+                .fillMaxSize()
+                .background(VSTheme.colorScheme.secondary))
         },
         title = {
-            Text(appName)
+            Text(app.appName)
         },
         description = {
-            Text(appDescription)
+            Text(app.appDescription)
         },
         labels = {
-            if (supportsNonroot) {
+            if (app.supportsNonroot) {
                 Label {
                     Text(text = "Nonroot")
                 }
             }
-            if (supportsRoot) {
+            if (app.supportsRoot) {
                 Label {
                     Text(text = "Root")
                 }
             }
         },
-        actions = {
-            Button(onClick = onDetailsClick) {
-                Text("Details")
-            }
-        }
     )
 }
 
@@ -62,9 +54,8 @@ fun BrowseAppCardLoading(
         modifier = modifier,
         icon = {
             Box(modifier = Modifier
-                .size(48.dp)
-                .clip(VSTheme.shapes.medium)
-                .background(VSTheme.colorScheme.primary))
+                .fillMaxSize()
+                .background(VSTheme.colorScheme.secondary))
         },
         title = {
             Box(modifier = Modifier
@@ -88,12 +79,6 @@ fun BrowseAppCardLoading(
                 .width(36.dp)
                 .height(24.dp)) {}
         },
-        actions = {
-            Box(modifier = Modifier
-                .width(72.dp)
-                .height(36.dp)
-                .clip(CircleShape)
-                .background(VSTheme.colorScheme.primary))
-        }
+        onClick = null
     )
 }

app/src/main/java/com/vanced/store/ui/widget/Labels.kt

@@ -34,7 +34,7 @@ fun Label(
             Row(
                 modifier = Modifier
                     .padding(
-                        horizontal = VSTheme.spacing.large,
+                        horizontal = VSTheme.spacing.medium,
                         vertical = VSTheme.spacing.small
                     ),
                 horizontalArrangement = Arrangement.Center,

app/src/main/java/com/vanced/store/ui/widget/Lazy.kt

@@ -39,10 +39,10 @@ fun CardLazyVerticalGrid(
     LazyVerticalGrid(
         modifier = modifier,
         state = state,
-        columns = GridCells.Adaptive(300.dp),
-        verticalArrangement = Arrangement.spacedBy(VSTheme.spacing.medium),
-        horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.medium),
-        contentPadding = PaddingValues(VSTheme.spacing.extraLarge),
+        columns = GridCells.Adaptive(125.dp),
+        verticalArrangement = Arrangement.spacedBy(VSTheme.spacing.large),
+        horizontalArrangement = Arrangement.spacedBy(VSTheme.spacing.large),
+        contentPadding = PaddingValues(16.dp),
         userScrollEnabled = scrollEnabled,
         content = content
     )

app/src/main/java/com/vanced/store/ui/widget/ScreenScaffold.kt

@@ -4,7 +4,6 @@ import androidx.compose.animation.rememberSplineBasedDecay
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 
@@ -17,9 +16,7 @@ fun ScreenScaffold(
     floatingActionButtonPosition: FabPosition = FabPosition.End,
     content: @Composable (PaddingValues) -> Unit
 ) {
-    val topbarScrollState = rememberTopAppBarScrollState()
-    val decayAnimationSpec = rememberSplineBasedDecay<Float>()
-    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(decayAnimationSpec, topbarScrollState)
+    val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
     Scaffold(
         modifier = modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = { topBar(scrollBehavior) },