From e9b97f63bda3936ac07b83c56526586552d65341 Mon Sep 17 00:00:00 2001 From: Lorenzo Vainigli Date: Sun, 18 Jun 2023 16:30:17 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Added=20bottom=20app=20bar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/activity/MainActivity.kt | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt index 21846fb..4d79698 100644 --- a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt +++ b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt @@ -11,6 +11,8 @@ import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size @@ -19,10 +21,11 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.Add +import androidx.compose.material3.BottomAppBar import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.FabPosition import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.FloatingActionButtonDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold @@ -53,8 +56,8 @@ import com.lorenzovainigli.foodexpirationdates.model.PreferencesProvider import com.lorenzovainigli.foodexpirationdates.model.entity.ExpirationDate import com.lorenzovainigli.foodexpirationdates.ui.theme.FoodExpirationDatesTheme import com.lorenzovainigli.foodexpirationdates.ui.theme.TonalElevation -import com.lorenzovainigli.foodexpirationdates.view.composable.MainMenu import com.lorenzovainigli.foodexpirationdates.view.composable.FoodCard +import com.lorenzovainigli.foodexpirationdates.view.composable.MainMenu import com.lorenzovainigli.foodexpirationdates.view.composable.MyTopAppBar import com.lorenzovainigli.foodexpirationdates.viewmodel.ExpirationDateViewModel import dagger.hilt.android.AndroidEntryPoint @@ -127,25 +130,37 @@ class MainActivity : ComponentActivity() { } ) }, - floatingActionButtonPosition = FabPosition.End, - floatingActionButton = { + bottomBar = { if (!items.isNullOrEmpty()) { - FloatingActionButton( - onClick = { - context.startActivity( - Intent( - context, - InsertActivity::class.java + BottomAppBar { + Row( + modifier = Modifier.padding(start = 8.dp, end = 8.dp) + ) { + Spacer(Modifier.weight(1f)) + FloatingActionButton( + onClick = { + context.startActivity( + Intent( + context, + InsertActivity::class.java + ) + ) + }, + containerColor = MaterialTheme.colorScheme.tertiaryContainer, + contentColor = MaterialTheme.colorScheme.onTertiaryContainer, + elevation = FloatingActionButtonDefaults.elevation( + defaultElevation = 2.dp, + pressedElevation = 0.dp, + focusedElevation = 2.dp, + hoveredElevation = 2.dp ) - ) - }, - containerColor = MaterialTheme.colorScheme.tertiaryContainer, - contentColor = MaterialTheme.colorScheme.onTertiaryContainer - ) { - Icon( - imageVector = Icons.Rounded.Add, - contentDescription = null - ) + ) { + Icon( + imageVector = Icons.Rounded.Add, + contentDescription = null + ) + } + } } } }