update

Author: wzq

app/.gitignore

@@ -1 +1,2 @@
-/build
+/build
+/release

app/build.gradle.kts

@@ -25,7 +25,8 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isShrinkResources = true
+            isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

app/proguard-rules.pro

@@ -18,4 +18,6 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeScreen.kt

@@ -10,12 +10,13 @@ import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Home
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.ShoppingCart
-import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
@@ -40,17 +41,18 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
             navActions.toSearch()
         }
     }, bottomBar = {
-        HomeBottomBar { index ->
+        HomeBottomBar(pagerState.currentPage) {
             localScope.launch {
-                pagerState.scrollToPage(index)
+                pagerState.scrollToPage(it)
             }
         }
     }) { paddingValues ->
         HorizontalPager(
             state = pagerState, modifier = Modifier
                 .padding(paddingValues)
                 .fillMaxSize(),
-            beyondBoundsPageCount = pagerState.pageCount
+            beyondBoundsPageCount = pagerState.pageCount,
+            userScrollEnabled = false
         ) { currentPagerNum ->
             when (currentPagerNum) {
                 0 -> HomeIndexPage(
@@ -73,14 +75,18 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
 }
 
 @Composable
-fun HomeBottomBar(onItemClick: (Int) -> Unit) {
-    BottomAppBar(containerColor = MaterialTheme.colorScheme.secondaryContainer) {
+fun HomeBottomBar(selectedIndex: Int, onItemClick: (Int) -> Unit) {
+    NavigationBar {
         arrayOf(
             Icons.Default.Home, Icons.Default.ShoppingCart, Icons.Default.AccountCircle
         ).forEachIndexed { index, icon ->
-            IconButton(modifier = Modifier.weight(1f), onClick = { onItemClick(index) }) {
-                Icon(icon, null)
-            }
+            NavigationBarItem(
+                selected = selectedIndex == index,
+                onClick = { onItemClick(index) },
+                icon = { Icon(imageVector = icon, contentDescription = null) },
+                label = { Text(text = "label") },
+                alwaysShowLabel = true
+            )
         }
     }
 }

gradle.properties

@@ -12,7 +12,6 @@
 # org.gradle.parallel=true
 #Thu Dec 07 16:49:57 CST 2023
 -Xopt-in=kotlin.RequiresOptIn
-android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=false
 android.nonFinalResIds=true
 android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Dec 11 15:36:55 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists