Remove material library

jonathanarodr · May 3, 2024 · e334fc4 · e334fc4
1 parent 6f06dac
commit e334fc4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 88 deletions.
diff --git a/app/src/main/kotlin/br/com/stonks/ui/BottomAppBarLayout.kt b/app/src/main/kotlin/br/com/stonks/ui/BottomAppBarLayout.kt
diff --git a/app/src/main/kotlin/br/com/stonks/ui/MainActivity.kt b/app/src/main/kotlin/br/com/stonks/ui/MainActivity.kt
@@ -7,16 +7,26 @@ import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import br.com.stonks.designsystem.R
 import br.com.stonks.feature.home.ui.view.HomeScreen
 import br.com.stonks.feature.stocks.ui.view.StockAlertScreen
 import br.com.stonks.navigation.MainNavDestination
@@ -27,8 +37,9 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
 
         setContent {
-            val navController = rememberNavController()
             val snackbarHostState = remember { SnackbarHostState() }
+            val navController = rememberNavController()
+            val selectedNavIndex = rememberSaveable { mutableIntStateOf(MainNavDestination.HOME.ordinal) }
 
             Scaffold(
                 containerColor = Color.Transparent,
@@ -38,7 +49,44 @@ class MainActivity : ComponentActivity() {
                     SnackbarHost(snackbarHostState)
                 },
                 bottomBar = {
-                    BottomAppBarLayout(navController)
+                    NavigationBar {
+                        NavigationBarItem(
+                            selected = (selectedNavIndex.intValue == MainNavDestination.HOME.ordinal),
+                            icon = {
+                                Icon(
+                                    painter = painterResource(R.drawable.ic_home),
+                                    contentDescription = null,
+                                )
+                            },
+                            label = {
+                                Text(
+                                    text = stringResource(id = br.com.stonks.R.string.main_nav_action_home)
+                                )
+                            },
+                            onClick = {
+                                selectedNavIndex.intValue = MainNavDestination.HOME.ordinal
+                                navController.navigate(MainNavDestination.HOME.route)
+                            },
+                        )
+                        NavigationBarItem(
+                            selected = navController.isCurrentDestination(MainNavDestination.STOCK),
+                            icon = {
+                                Icon(
+                                    painter = painterResource(R.drawable.ic_radar),
+                                    contentDescription = null,
+                                )
+                            },
+                            label = {
+                                Text(
+                                    text = stringResource(id = br.com.stonks.R.string.main_nav_action_stock_alert)
+                                )
+                            },
+                            onClick = {
+                                selectedNavIndex.intValue = MainNavDestination.STOCK.ordinal
+                                navController.navigate(MainNavDestination.STOCK.route)
+                            },
+                        )
+                    }
                 }
             ) { innerPadding ->
                 Surface(
@@ -50,7 +98,6 @@ class MainActivity : ComponentActivity() {
                     NavHost(
                         navController = navController,
                         startDestination = MainNavDestination.HOME.route,
-                        modifier = Modifier.padding(innerPadding)
                     ) {
                         composable(route = MainNavDestination.HOME.route) {
                             HomeScreen(
@@ -67,4 +114,9 @@ class MainActivity : ComponentActivity() {
             }
         }
     }
+
+    private fun NavController.isCurrentDestination(destination: MainNavDestination): Boolean {
+        return this.currentDestination?.route == destination.route
+    }
 }
+
diff --git a/...plugins/src/main/kotlin/br/com/stonks/gradlebuild/conventions/AndroidComposeConvention.kt b/...plugins/src/main/kotlin/br/com/stonks/gradlebuild/conventions/AndroidComposeConvention.kt
@@ -33,7 +33,6 @@ fun Project.configureComposeDependencies(
             implementation(libs.findLibrary("androidx-compose-runtime-tracing").get())
             implementation(libs.findLibrary("androidx-compose-ui").get())
             implementation(libs.findLibrary("androidx-compose-foundation").get())
-            implementation(libs.findLibrary("androidx-compose-material").get())
             implementation(libs.findLibrary("androidx-compose-material3").get())
             implementation(libs.findLibrary("androidx-compose-graphics").get())
             implementation(libs.findLibrary("androidx-lifecycle-runtime-compose").get())

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,7 +17,6 @@ kotlinx-coroutines = "1.8.0"
 kotlinx-serialization = "1.6.3"
 
 # google
-material = "1.6.7"
 material3 = "1.11.0"
 accompanist = "0.34.0"
 
@@ -110,7 +109,6 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-compose-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
-androidx-compose-material = { group = "androidx.compose.material", name = "material" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-room-core = { group = "androidx.room", name = "room-ktx", version.ref = "androidx-room" }
 androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx-room" }