diff --git a/app/src/main/java/com/safebite/app/presentation/screen/main/MainScreen.kt b/app/src/main/java/com/safebite/app/presentation/screen/main/MainScreen.kt index 8f403b1..5b4e050 100644 --- a/app/src/main/java/com/safebite/app/presentation/screen/main/MainScreen.kt +++ b/app/src/main/java/com/safebite/app/presentation/screen/main/MainScreen.kt @@ -30,6 +30,8 @@ import androidx.compose.material3.NavigationBarItemDefaults import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.ui.graphics.Color import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment @@ -97,17 +99,28 @@ fun MainScreen( modifier = Modifier.size(32.dp) ) Spacer(Modifier.width(8.dp)) - Text(stringResource(R.string.app_name)) + Text( + text = stringResource(R.string.app_name), + color = Color.White + ) } }, actions = { IconButton(onClick = onOpenSettings) { Icon( imageVector = Icons.Filled.Settings, - contentDescription = stringResource(R.string.nav_settings) + contentDescription = stringResource(R.string.nav_settings), + tint = Color.White ) } - } + }, + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primary, + scrolledContainerColor = MaterialTheme.colorScheme.primary, + titleContentColor = Color.White, + navigationIconContentColor = Color.White, + actionIconContentColor = Color.White, + ) ) }, bottomBar = { @@ -178,7 +191,7 @@ private fun SafeBiteBottomNavigation( items: List ) { NavigationBar( - containerColor = MaterialTheme.colorScheme.surface, + containerColor = MaterialTheme.colorScheme.primary, tonalElevation = 2.dp ) { items.forEach { item -> @@ -209,11 +222,11 @@ private fun SafeBiteBottomNavigation( }, alwaysShowLabel = true, colors = androidx.compose.material3.NavigationBarItemDefaults.colors( - selectedIconColor = MaterialTheme.colorScheme.onSurface, - selectedTextColor = MaterialTheme.colorScheme.onSurface, - unselectedIconColor = MaterialTheme.colorScheme.onSurfaceVariant, - unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant, - indicatorColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = 0.5f) + selectedIconColor = Color.White, + selectedTextColor = Color.White, + unselectedIconColor = Color.White.copy(alpha = 0.7f), + unselectedTextColor = Color.White.copy(alpha = 0.7f), + indicatorColor = Color.White.copy(alpha = 0.2f) ) ) } diff --git a/app/src/main/res/drawable/safebite_logo_nobg.png b/app/src/main/res/drawable/safebite_logo_nobg.png index 7e7623b..d204ffe 100644 Binary files a/app/src/main/res/drawable/safebite_logo_nobg.png and b/app/src/main/res/drawable/safebite_logo_nobg.png differ diff --git a/app/src/main/res/drawable/safebite_logo_nobg_old.png b/app/src/main/res/drawable/safebite_logo_nobg_old.png deleted file mode 100644 index 8961666..0000000 Binary files a/app/src/main/res/drawable/safebite_logo_nobg_old.png and /dev/null differ diff --git a/version.properties b/version.properties index d60e4d4..6419027 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ MAJOR=1 MINOR=16 -PATCH=0 -CODE=20 +PATCH=3 +CODE=23