From e186cd07a2e25d9ed77f02d34c587df1b2fe413a Mon Sep 17 00:00:00 2001 From: Kailash Sharma Date: Fri, 15 Sep 2023 02:56:41 +0530 Subject: [PATCH] feat: Theming Android --- .../waste2wealth/com/bottombar/BottomBar.kt | 21 +++-- .../com/bottombar/BottomBarScreens.kt | 1 - .../com/collectwaste/CollectWasteInfo.kt | 8 +- .../com/collectwaste/ListOfCollectWaste.kt | 11 +-- .../com/collectwaste/SuccesfullyCollected.kt | 5 +- .../com/communities/ui/LazyCardItem.kt | 7 +- .../waste2wealth/com/communities/ui/Pager2.kt | 19 ++-- .../com/dashboard/NewDashboard.kt | 88 +++---------------- .../app/waste2wealth/com/maps/MapsScreen.kt | 14 ++- .../com/reportwaste/ReportWaste.kt | 6 +- .../app/waste2wealth/com/ui/theme/Color.kt | 45 +++++++++- .../app/waste2wealth/com/ui/theme/Palette.kt | 71 +++++++++++++++ .../app/waste2wealth/com/ui/theme/Theme.kt | 4 +- 13 files changed, 181 insertions(+), 119 deletions(-) create mode 100644 app/src/main/java/app/waste2wealth/com/ui/theme/Palette.kt diff --git a/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt b/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt index b7c1fa2..9a8851a 100644 --- a/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt +++ b/app/src/main/java/app/waste2wealth/com/bottombar/BottomBar.kt @@ -1,6 +1,7 @@ package app.waste2wealth.com.bottombar import androidx.compose.foundation.background +import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -23,6 +24,8 @@ import androidx.navigation.NavController import androidx.navigation.NavDestination.Companion.hierarchy import androidx.navigation.compose.currentBackStackEntryAsState import app.waste2wealth.com.navigation.Screens +import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteSB import app.waste2wealth.com.ui.theme.textColor @@ -34,21 +37,25 @@ fun BottomBar(navController: NavController) { Card( modifier = Modifier .fillMaxWidth(), - backgroundColor = appBackground, + backgroundColor = CardColor, elevation = 5.dp, shape = RoundedCornerShape(17.dp) ) { BottomNavigation( modifier = Modifier - .padding(12.dp, 0.dp, 12.dp, 0.dp) .height(80.dp), elevation = 0.dp, - backgroundColor = appBackground + backgroundColor = CardColor ) { items.forEach { val isYellow = currentRoute?.hierarchy?.any { nav -> nav.route == it.route } == true + val myTextColor = if (isSystemInDarkTheme()) { + if (isYellow) Color.Black else Color.White + } else { + if (isYellow) Color.White else Color.Black + } BottomNavigationItem( icon = { it.icon?.let { @@ -58,7 +65,7 @@ fun BottomBar(navController: NavController) { modifier = Modifier .size(35.dp) .padding(bottom = 5.dp), - tint = if (isYellow) Color.White else textColor + tint = if (isYellow) myTextColor else CardTextColor ) } }, @@ -66,7 +73,7 @@ fun BottomBar(navController: NavController) { it.title?.let { Text( text = it, - color = if (isYellow) Color.White else textColor, + color = if (isYellow) myTextColor else CardTextColor, softWrap = true, fontFamily = monteSB, fontSize = 10.sp @@ -75,9 +82,9 @@ fun BottomBar(navController: NavController) { }, selected = isYellow, selectedContentColor = Color.Yellow, - unselectedContentColor = Color.White.copy(alpha = 0.4f), + unselectedContentColor = CardColor, modifier = Modifier - .background(if (isYellow) textColor else Color.White) + .background(if (isYellow) textColor else myTextColor) .clip(RoundedCornerShape(17.dp)), onClick = { it.route?.let { it1 -> diff --git a/app/src/main/java/app/waste2wealth/com/bottombar/BottomBarScreens.kt b/app/src/main/java/app/waste2wealth/com/bottombar/BottomBarScreens.kt index 71d9e08..d35b33b 100644 --- a/app/src/main/java/app/waste2wealth/com/bottombar/BottomBarScreens.kt +++ b/app/src/main/java/app/waste2wealth/com/bottombar/BottomBarScreens.kt @@ -15,6 +15,5 @@ sealed class BottomBarScreens(val route: String?, val title: String?, val icon: val items = listOf( BottomBarScreens.HomeScreen, - BottomBarScreens.RewardsScreen, BottomBarScreens.CommunityScreen ) diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt index 6940646..8438ad4 100644 --- a/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt +++ b/app/src/main/java/app/waste2wealth/com/collectwaste/CollectWasteInfo.kt @@ -48,6 +48,8 @@ import app.waste2wealth.com.components.permissions.PermissionDrawer import app.waste2wealth.com.location.LocationViewModel import app.waste2wealth.com.navigation.Screens import app.waste2wealth.com.reportwaste.DialogBox +import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteSB import app.waste2wealth.com.ui.theme.textColor @@ -213,15 +215,15 @@ fun CollectWasteInfo( } }, colors = ButtonDefaults.buttonColors( - backgroundColor = textColor, - contentColor = Color.White + backgroundColor = CardColor, + contentColor = CardTextColor ), shape = RoundedCornerShape(35.dp), modifier = Modifier.padding(start = 10.dp) ) { Text( text = "Collect Waste", - color = Color.White, + color = CardTextColor, fontSize = 12.sp, fontFamily = monteSB, modifier = Modifier.padding(bottom = 4.dp), diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/ListOfCollectWaste.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/ListOfCollectWaste.kt index e105f1f..9c335f9 100644 --- a/app/src/main/java/app/waste2wealth/com/collectwaste/ListOfCollectWaste.kt +++ b/app/src/main/java/app/waste2wealth/com/collectwaste/ListOfCollectWaste.kt @@ -58,6 +58,7 @@ import app.waste2wealth.com.location.LocationViewModel import app.waste2wealth.com.maps.MapScreen import app.waste2wealth.com.navigation.Screens import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteBold import app.waste2wealth.com.ui.theme.monteSB @@ -311,7 +312,7 @@ fun WasteItemCard( ) { Text( text = address, - color = textColor, + color = CardTextColor, fontFamily = monteSB, fontSize = 15.sp, maxLines = if (isEllipsis) 1 else Int.MAX_VALUE, @@ -328,15 +329,15 @@ fun WasteItemCard( if (isCollectedInfo) onCollected() else onClick() }, colors = ButtonDefaults.buttonColors( - backgroundColor = textColor, - contentColor = Color.White + backgroundColor = appBackground, + contentColor = textColor ), shape = RoundedCornerShape(15.dp), modifier = Modifier.padding(start = 10.dp) ) { Text( text = if (isCollectedInfo) "Navigate" else "Collect", - color = Color.White, + color = textColor, fontFamily = monteSB, fontSize = 10.sp ) @@ -350,7 +351,7 @@ fun WasteItemCard( ) { Text( text = "$distance, Reported $time", - color = textColor, + color = CardTextColor.copy(0.75f), fontFamily = monteBold, fontSize = 10.sp ) diff --git a/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt b/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt index 0f509e3..a1f61fc 100644 --- a/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt +++ b/app/src/main/java/app/waste2wealth/com/collectwaste/SuccesfullyCollected.kt @@ -74,6 +74,7 @@ import app.waste2wealth.com.location.LocationViewModel import app.waste2wealth.com.login.TextFieldWithIcons import app.waste2wealth.com.navigation.Screens import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteSB import app.waste2wealth.com.ui.theme.textColor @@ -526,8 +527,8 @@ fun SuccessfullyCollected( } }, colors = ButtonDefaults.buttonColors( - backgroundColor = textColor, - contentColor = Color.White + backgroundColor = CardColor, + contentColor = CardTextColor ), shape = RoundedCornerShape(35.dp), modifier = Modifier.padding(start = 10.dp) diff --git a/app/src/main/java/app/waste2wealth/com/communities/ui/LazyCardItem.kt b/app/src/main/java/app/waste2wealth/com/communities/ui/LazyCardItem.kt index e381e64..9df6a59 100644 --- a/app/src/main/java/app/waste2wealth/com/communities/ui/LazyCardItem.kt +++ b/app/src/main/java/app/waste2wealth/com/communities/ui/LazyCardItem.kt @@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import app.waste2wealth.com.communities.CommunitiesViewModel import app.waste2wealth.com.communities.data.Drives +import app.waste2wealth.com.ui.theme.CardTextColor val cleanlinessDrives = listOf( Drives("2023-09-15 09:00 AM", "City Park", "Park Cleanup Drive"), @@ -75,14 +76,14 @@ fun CardItem(drives: Drives? = null) { Text( text = drives?.title ?: "", fontSize = 15.sp, - color = Color.DarkGray, + color = CardTextColor, fontWeight = FontWeight.SemiBold, modifier = Modifier.padding(bottom = 4.dp) ) Text( text = drives?.location ?: "", fontSize = 13.sp, - color = Color.DarkGray, + color = CardTextColor, fontWeight = FontWeight.Normal, modifier = Modifier.padding(bottom = 4.dp) ) @@ -90,7 +91,7 @@ fun CardItem(drives: Drives? = null) { Text( text = drives?.time.toString(), fontSize = 10.sp, - color = Color.DarkGray, + color = CardTextColor, fontWeight = FontWeight.Bold, modifier = Modifier.padding(bottom = 4.dp), softWrap = true diff --git a/app/src/main/java/app/waste2wealth/com/communities/ui/Pager2.kt b/app/src/main/java/app/waste2wealth/com/communities/ui/Pager2.kt index 857b128..3a473af 100644 --- a/app/src/main/java/app/waste2wealth/com/communities/ui/Pager2.kt +++ b/app/src/main/java/app/waste2wealth/com/communities/ui/Pager2.kt @@ -49,6 +49,7 @@ import app.waste2wealth.com.communities.CommunitiesViewModel import app.waste2wealth.com.components.permissions.Grapple import app.waste2wealth.com.profile.ProfileImage import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteBold import app.waste2wealth.com.ui.theme.monteSB @@ -169,7 +170,7 @@ fun Pager2( ) { Card( backgroundColor = - appBackground, border = BorderStroke( + CardColor, border = BorderStroke( width = 1.dp, color = communitiesItems[page].cardColor ), shape = RoundedCornerShape(40.dp), modifier = Modifier .layoutId("card") @@ -205,7 +206,7 @@ fun Pager2( Spacer(modifier = Modifier.height(10.dp)) Text( text = communitiesItems[page].title, - color = textColor, + color = CardTextColor, fontSize = 20.sp, fontFamily = monteBold, modifier = Modifier.padding(horizontal = 10.dp) @@ -221,7 +222,7 @@ fun Pager2( Spacer(modifier = Modifier.height(10.dp)) Text( text = communitiesItems[page].date, - color = textColor, + color = CardTextColor, fontSize = 15.sp, fontFamily = monteBold, modifier = Modifier.padding(horizontal = 10.dp) @@ -237,7 +238,7 @@ fun Pager2( Spacer(modifier = Modifier.height(10.dp)) Text( text = communitiesItems[page].location, - color = textColor, + color = CardTextColor, fontSize = 15.sp, fontFamily = monteBold, modifier = Modifier.padding(horizontal = 10.dp) @@ -253,7 +254,7 @@ fun Pager2( Spacer(modifier = Modifier.height(10.dp)) Text( text = communitiesItems[page].time, - color = textColor, + color = CardTextColor, fontSize = 15.sp, fontFamily = monteBold, modifier = Modifier.padding(horizontal = 10.dp) @@ -265,14 +266,14 @@ fun Pager2( }, colors = ButtonDefaults.buttonColors( backgroundColor = Color(0xFFFD5065), - contentColor = Color.White + contentColor = appBackground ), shape = RoundedCornerShape(35.dp), modifier = Modifier.padding(start = 10.dp) ) { Text( text = "Register", - color = Color.White, + color = textColor, fontSize = 12.sp, fontFamily = monteSB, modifier = Modifier.padding(bottom = 4.dp), @@ -349,7 +350,7 @@ fun Pager2( .padding(bottom = 0.dp) .requiredHeight(20.dp) .requiredWidth(55.dp) - .alpha(0.22f), color = Color.DarkGray + .alpha(0.22f), color = CardTextColor ) } @@ -367,7 +368,7 @@ fun Pager2( Text( text = "Drives Conducted", fontSize = 21.sp, - color = Color.DarkGray, + color = CardTextColor, fontWeight = FontWeight.Normal, modifier = Modifier.padding(start = 14.dp) ) diff --git a/app/src/main/java/app/waste2wealth/com/dashboard/NewDashboard.kt b/app/src/main/java/app/waste2wealth/com/dashboard/NewDashboard.kt index 05ba590..12d757d 100644 --- a/app/src/main/java/app/waste2wealth/com/dashboard/NewDashboard.kt +++ b/app/src/main/java/app/waste2wealth/com/dashboard/NewDashboard.kt @@ -79,6 +79,7 @@ import app.waste2wealth.com.location.LocationViewModel import app.waste2wealth.com.navigation.Screens import app.waste2wealth.com.profile.ProfileImage import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.monteBold import app.waste2wealth.com.ui.theme.monteNormal @@ -202,7 +203,7 @@ fun NewDashboard( ) Text( text = name, - color = textColor, + color = CardTextColor, fontSize = 20.sp, fontFamily = monteBold, modifier = Modifier.padding(bottom = 7.dp) @@ -247,7 +248,7 @@ fun NewDashboard( ) { Text( text = "Points Earned", - color = textColor, + color = CardTextColor, fontSize = 14.sp, fontFamily = monteBold, softWrap = true, @@ -264,7 +265,7 @@ fun NewDashboard( ) Text( text = pointsEarned, - color = textColor, + color = CardTextColor, fontSize = 15.sp, fontFamily = monteNormal, ) @@ -282,7 +283,7 @@ fun NewDashboard( ) { Text( text = "Points Redeemed", - color = textColor, + color = CardTextColor, fontSize = 14.sp, fontFamily = monteBold, softWrap = true, @@ -299,7 +300,7 @@ fun NewDashboard( ) Text( text = pointsRedeemed, - color = textColor, + color = CardTextColor, fontSize = 15.sp, fontFamily = monteNormal, ) @@ -518,7 +519,7 @@ fun NewDashboard( Spacer(modifier = Modifier.height(10.dp)) Text( text = item.title, - color = Color.Black, + color = CardTextColor, fontSize = 20.sp, fontWeight = FontWeight.Bold, softWrap = true @@ -526,7 +527,7 @@ fun NewDashboard( Spacer(modifier = Modifier.height(10.dp)) Text( text = item.time, - color = Color.Black, + color = CardTextColor, fontSize = 10.sp, fontWeight = FontWeight.Normal ) @@ -545,12 +546,12 @@ fun NewDashboard( imageVector = Icons.Filled.LocationOn, contentDescription = null, modifier = Modifier.size(20.dp), - tint = Color.Black + tint = CardColor ) Spacer(modifier = Modifier.width(10.dp)) Text( text = "Register", - color = Color.Black, + color = textColor, fontSize = 10.sp, fontWeight = FontWeight.Normal ) @@ -570,75 +571,6 @@ fun NewDashboard( } } } - - @Composable - fun RepeatingCard( - type: String, - emoji: String, - title: String, - date: String - ) { - Card( - backgroundColor = CardColor, - shape = RoundedCornerShape( - topStart = 10.dp, - topEnd = 10.dp, - bottomEnd = 10.dp, - bottomStart = 50.dp - ), - modifier = Modifier.padding(end = 10.dp) - ) { - var register by remember { mutableStateOf("Register") } - Column(modifier = Modifier.padding(15.dp)) { - Text( - text = type, - color = Color.Gray, - fontSize = 13.sp, - fontFamily = monteSB, - modifier = Modifier.padding(bottom = 10.dp) - ) - Text( - text = title, - color = textColor, - fontSize = 18.sp, - fontFamily = monteSB, - modifier = Modifier.padding(bottom = 10.dp), - softWrap = true - ) - Text( - text = date, - color = Color.Gray, - fontSize = 16.sp, - fontFamily = monteSB, - modifier = Modifier.padding(bottom = 10.dp) - ) - - Button( - onClick = { - register = "Registered" - }, - colors = ButtonDefaults.buttonColors( - backgroundColor = textColor, - contentColor = Color.White - ), - shape = RoundedCornerShape(35.dp), - modifier = Modifier.padding(start = 10.dp) - ) { - Text( - text = register, - color = Color.White, - fontSize = 12.sp, - fontFamily = monteSB, - modifier = Modifier.padding(bottom = 4.dp), - maxLines = 1, - softWrap = true - ) - } - - } - - } - } } @Composable diff --git a/app/src/main/java/app/waste2wealth/com/maps/MapsScreen.kt b/app/src/main/java/app/waste2wealth/com/maps/MapsScreen.kt index b1e8484..d662813 100644 --- a/app/src/main/java/app/waste2wealth/com/maps/MapsScreen.kt +++ b/app/src/main/java/app/waste2wealth/com/maps/MapsScreen.kt @@ -54,6 +54,8 @@ import app.waste2wealth.com.collectwaste.getTimeAgo import app.waste2wealth.com.components.permissions.PermissionDrawer import app.waste2wealth.com.firebase.firestore.WasteItem import app.waste2wealth.com.location.LocationViewModel +import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.textColor import com.google.accompanist.permissions.ExperimentalPermissionsApi @@ -226,12 +228,12 @@ fun MapScreen(viewModel: LocationViewModel, navController: NavController) { imageVector = Icons.Filled.LocationOn, contentDescription = null, modifier = Modifier.size(20.dp), - tint = Color.Black + tint = textColor ) Spacer(modifier = Modifier.width(10.dp)) Text( text = "Navigate", - color = Color.Black, + color = textColor, fontSize = 10.sp, fontWeight = FontWeight.Normal ) @@ -265,11 +267,15 @@ fun MapScreen(viewModel: LocationViewModel, navController: NavController) { isClicked.value = false }, - shape = RoundedCornerShape(10.dp) + shape = RoundedCornerShape(10.dp), + colors = ButtonDefaults.buttonColors( + backgroundColor = CardColor, + contentColor = CardTextColor + ) ) { Text( text = "Reset", - color = Color.White, + color = CardTextColor, fontSize = 10.sp, fontWeight = FontWeight.Normal ) diff --git a/app/src/main/java/app/waste2wealth/com/reportwaste/ReportWaste.kt b/app/src/main/java/app/waste2wealth/com/reportwaste/ReportWaste.kt index 7aa8732..9378f12 100644 --- a/app/src/main/java/app/waste2wealth/com/reportwaste/ReportWaste.kt +++ b/app/src/main/java/app/waste2wealth/com/reportwaste/ReportWaste.kt @@ -82,6 +82,8 @@ import app.waste2wealth.com.firebase.firestore.updateInfoToFirebase import app.waste2wealth.com.firebase.firestore.updateWasteToFirebase import app.waste2wealth.com.location.LocationViewModel import app.waste2wealth.com.navigation.Screens +import app.waste2wealth.com.ui.theme.CardColor +import app.waste2wealth.com.ui.theme.CardTextColor import app.waste2wealth.com.ui.theme.appBackground import app.waste2wealth.com.ui.theme.backGround import app.waste2wealth.com.ui.theme.monteBold @@ -454,8 +456,8 @@ fun ReportWaste( onClick = { isDialogVisible = true }, colors = ButtonDefaults.buttonColors( - backgroundColor = textColor, - contentColor = Color.White + backgroundColor = CardColor, + contentColor = CardTextColor ), shape = RoundedCornerShape(35.dp), modifier = Modifier.padding(start = 0.dp) diff --git a/app/src/main/java/app/waste2wealth/com/ui/theme/Color.kt b/app/src/main/java/app/waste2wealth/com/ui/theme/Color.kt index 5206cb5..d5b69ac 100644 --- a/app/src/main/java/app/waste2wealth/com/ui/theme/Color.kt +++ b/app/src/main/java/app/waste2wealth/com/ui/theme/Color.kt @@ -1,8 +1,13 @@ package app.waste2wealth.com.ui.theme import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material.MaterialTheme +import androidx.compose.material.darkColors import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color +import androidx.compose.material.lightColors + val Purple200 = Color(0xFFBB86FC) val Purple500 = Color(0xFF6200EE) @@ -10,18 +15,52 @@ val Purple700 = Color(0xFF3700B3) val Teal200 = Color(0xFF03DAC5) val backGround = Color(0xFF21c998) + + +val LightColors = lightColors( + primary = Palette.md_theme_light_primary, + onPrimary = Palette.md_theme_light_onPrimary, + secondary = Palette.md_theme_light_secondary, + onSecondary = Palette.md_theme_light_onSecondary, + error = Palette.md_theme_light_error, + onError = Palette.md_theme_light_onError, + background = Palette.md_theme_light_background, + onBackground = Palette.md_theme_light_onBackground, + surface = Palette.md_theme_light_surface, + onSurface = Palette.md_theme_light_onSurface, +) + + +val DarkColors = darkColors( + primary = Palette.md_theme_dark_primary, + onPrimary = Palette.md_theme_dark_onPrimary, + secondary = Palette.md_theme_dark_secondary, + onSecondary = Palette.md_theme_dark_onSecondary, + error = Palette.md_theme_dark_error, + onError = Palette.md_theme_dark_onError, + background = Palette.md_theme_dark_background, + onBackground = Palette.md_theme_dark_onBackground, + surface = Palette.md_theme_dark_surface, + onSurface = Palette.md_theme_dark_onSurface, +) + + val isDarkThemeEnabled: Boolean @Composable get() = isSystemInDarkTheme() val appBackground: Color @Composable - get() = if (isDarkThemeEnabled) Color(0xFFFFFFFF) else Color(0xFFFFFFFF) + get() = MaterialTheme.colors.onPrimary val CardColor: Color @Composable - get() = if (isDarkThemeEnabled) Color(0xFFCFDCFE) else Color(0xFFCFDCFE) + get() = MaterialTheme.colors.secondary + +val CardTextColor: Color + @Composable + get() = MaterialTheme.colors.surface val textColor: Color @Composable - get() = if (isDarkThemeEnabled) Color(0xFF3549A5) else Color(0xFF3549A5) \ No newline at end of file + get() = MaterialTheme.colors.onSurface diff --git a/app/src/main/java/app/waste2wealth/com/ui/theme/Palette.kt b/app/src/main/java/app/waste2wealth/com/ui/theme/Palette.kt new file mode 100644 index 0000000..de26844 --- /dev/null +++ b/app/src/main/java/app/waste2wealth/com/ui/theme/Palette.kt @@ -0,0 +1,71 @@ +package app.waste2wealth.com.ui.theme + +import androidx.compose.ui.graphics.Color + +object Palette { + val md_theme_light_primary = Color(0xFF006A67) + val md_theme_light_onPrimary = Color(0xFFFFFFFF) + val md_theme_light_primaryContainer = Color(0xFF70F7F1) + val md_theme_light_onPrimaryContainer = Color(0xFF00201F) + val md_theme_light_secondary = Color(0xFF006A67) + val md_theme_light_onSecondary = Color(0xFFFFFFFF) + val md_theme_light_secondaryContainer = Color(0xFF70F7F1) + val md_theme_light_onSecondaryContainer = Color(0xFF00201F) + val md_theme_light_tertiary = Color(0xFF006A66) + val md_theme_light_onTertiary = Color(0xFFFFFFFF) + val md_theme_light_tertiaryContainer = Color(0xFF70F7F0) + val md_theme_light_onTertiaryContainer = Color(0xFF00201F) + val md_theme_light_error = Color(0xFFBA1A1A) + val md_theme_light_errorContainer = Color(0xFFFFDAD6) + val md_theme_light_onError = Color(0xFFFFFFFF) + val md_theme_light_onErrorContainer = Color(0xFF410002) + val md_theme_light_background = Color(0xFFF8FDFF) + val md_theme_light_onBackground = Color(0xFF001F25) + val md_theme_light_surface = Color(0xFFF8FDFF) + val md_theme_light_onSurface = Color(0xFF001F25) + val md_theme_light_surfaceVariant = Color(0xFFDAE5E3) + val md_theme_light_onSurfaceVariant = Color(0xFF3F4948) + val md_theme_light_outline = Color(0xFF6F7978) + val md_theme_light_inverseOnSurface = Color(0xFFD6F6FF) + val md_theme_light_inverseSurface = Color(0xFF00363F) + val md_theme_light_inversePrimary = Color(0xFF4EDAD5) + val md_theme_light_shadow = Color(0xFF000000) + val md_theme_light_surfaceTint = Color(0xFF006A67) + val md_theme_light_outlineVariant = Color(0xFFBEC9C7) + val md_theme_light_scrim = Color(0xFF000000) + + val md_theme_dark_primary = Color(0xFF4EDAD5) + val md_theme_dark_onPrimary = Color(0xFF003735) + val md_theme_dark_primaryContainer = Color(0xFF00504D) + val md_theme_dark_onPrimaryContainer = Color(0xFF70F7F1) + val md_theme_dark_secondary = Color(0xFF4EDAD5) + val md_theme_dark_onSecondary = Color(0xFF003735) + val md_theme_dark_secondaryContainer = Color(0xFF00504D) + val md_theme_dark_onSecondaryContainer = Color(0xFF70F7F1) + val md_theme_dark_tertiary = Color(0xFF4EDAD4) + val md_theme_dark_onTertiary = Color(0xFF003735) + val md_theme_dark_tertiaryContainer = Color(0xFF00504D) + val md_theme_dark_onTertiaryContainer = Color(0xFF70F7F0) + val md_theme_dark_error = Color(0xFFFFB4AB) + val md_theme_dark_errorContainer = Color(0xFF93000A) + val md_theme_dark_onError = Color(0xFF690005) + val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) + val md_theme_dark_background = Color(0xFF001F25) + val md_theme_dark_onBackground = Color(0xFFA6EEFF) + val md_theme_dark_surface = Color(0xFF001F25) + val md_theme_dark_onSurface = Color(0xFFA6EEFF) + val md_theme_dark_surfaceVariant = Color(0xFF3F4948) + val md_theme_dark_onSurfaceVariant = Color(0xFFBEC9C7) + val md_theme_dark_outline = Color(0xFF889392) + val md_theme_dark_inverseOnSurface = Color(0xFF001F25) + val md_theme_dark_inverseSurface = Color(0xFFA6EEFF) + val md_theme_dark_inversePrimary = Color(0xFF006A67) + val md_theme_dark_shadow = Color(0xFF000000) + val md_theme_dark_surfaceTint = Color(0xFF4EDAD5) + val md_theme_dark_outlineVariant = Color(0xFF3F4948) + val md_theme_dark_scrim = Color(0xFF000000) + + + val seed = Color(0xFF006A67) + +} diff --git a/app/src/main/java/app/waste2wealth/com/ui/theme/Theme.kt b/app/src/main/java/app/waste2wealth/com/ui/theme/Theme.kt index a3d15c9..1ae71b4 100644 --- a/app/src/main/java/app/waste2wealth/com/ui/theme/Theme.kt +++ b/app/src/main/java/app/waste2wealth/com/ui/theme/Theme.kt @@ -33,9 +33,9 @@ fun Waste2WealthTheme( content: @Composable () -> Unit, ) { val colors = if (darkTheme) { - DarkColorPalette + DarkColors } else { - LightColorPalette + LightColors } MaterialTheme(