From 64e0a2ee4365091b778b338c91413bd8f7424838 Mon Sep 17 00:00:00 2001 From: Ellen Poe Date: Thu, 2 Oct 2025 16:15:24 -0700 Subject: [PATCH] feat: e/OS branding --- .../earth/maps/cardinal/ui/core/AppContent.kt | 6 +- .../cardinal/ui/settings/SettingsScreen.kt | 36 -- .../src/main/res/drawable/cardinal_icon.xml | 408 +++--------------- .../app/src/main/res/values/colors.xml | 3 + .../app/src/main/res/values/strings.xml | 1 - 5 files changed, 78 insertions(+), 376 deletions(-) diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt index 70fa5f4..52feab1 100644 --- a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt +++ b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/core/AppContent.kt @@ -76,6 +76,7 @@ import androidx.compose.ui.layout.positionInRoot import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.res.colorResource import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -92,6 +93,7 @@ import androidx.navigation.compose.composable import androidx.navigation.compose.currentBackStackEntryAsState import com.google.gson.Gson import com.google.gson.reflect.TypeToken +import earth.maps.cardinal.R.color import earth.maps.cardinal.R.dimen import earth.maps.cardinal.R.drawable import earth.maps.cardinal.R.string @@ -1211,11 +1213,11 @@ fun BirdSettingsFab(navController: NavController) { .border( width = 4.dp, color = MaterialTheme.colorScheme.surface, shape = CircleShape ), - containerColor = MaterialTheme.colorScheme.surfaceDim, + containerColor = colorResource(color.icon_background), shape = CircleShape ) { Image( - modifier = Modifier.size(48.dp), + modifier = Modifier.size(36.dp), painter = painterResource(drawable.cardinal_icon), contentDescription = "Cardinal Maps Settings", ) diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/settings/SettingsScreen.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/settings/SettingsScreen.kt index 0949cb6..8191804 100644 --- a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/settings/SettingsScreen.kt +++ b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/settings/SettingsScreen.kt @@ -138,42 +138,6 @@ fun SettingsScreen( .fillMaxSize() .verticalScroll(rememberScrollState()) ) { - // Version and call to action. - Column { - Row( - Modifier - .fillMaxWidth() - .padding(dimensionResource(dimen.padding)), - horizontalArrangement = Arrangement.SpaceBetween, - verticalAlignment = Alignment.CenterVertically - ) { - Text( - modifier = Modifier.weight(1f), - text = stringResource(string.call_to_action), - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - IconButton( - modifier = Modifier.size(48.dp), - colors = IconButtonDefaults.iconButtonColors( - containerColor = Color( - 0xAA, - 0x11, - 0x11 - ) - ), - onClick = { - viewModel.onCallToActionClicked() - }) { - Icon( - painter = painterResource(drawable.ic_heart), - tint = Color.White, - contentDescription = stringResource(string.open_cardinal_maps_github_repository_in_browser) - ) - } - } - } - HorizontalDivider( modifier = Modifier.padding(vertical = 8.dp), thickness = DividerDefaults.Thickness, diff --git a/cardinal-android/app/src/main/res/drawable/cardinal_icon.xml b/cardinal-android/app/src/main/res/drawable/cardinal_icon.xml index 1801191..b691b60 100644 --- a/cardinal-android/app/src/main/res/drawable/cardinal_icon.xml +++ b/cardinal-android/app/src/main/res/drawable/cardinal_icon.xml @@ -1,344 +1,78 @@ - - - - + + + - + android:pathData="m15.407,-0.411a22.354,22.354 0,0 1,21.593 5.786l-15.807,15.807z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#f49138" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:pathData="m36.999,5.374a22.354,22.354 105,0 1,5.786 21.593L21.193,21.181Z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#ee6954" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + + + - + android:pathData="m42.785,26.967a22.354,22.354 75,0 1,-15.807 15.807l-5.786,-21.593z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#020f16" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + + + - + android:pathData="m26.978,42.774a22.354,22.354 0,0 1,-21.593 -5.786l15.807,-15.807z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#182f70" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + + + - + android:pathData="m5.386,36.988a22.354,22.354 105,0 1,-5.786 -21.593l21.593,5.786z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#b1d585" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:pathData="m-0.4,15.396a22.354,22.354 75,0 1,15.807 -15.807l5.786,21.593z" + android:strokeLineJoin="round" + android:strokeWidth="7.829" + android:fillColor="#f8cf43" + android:strokeColor="#00000000" + android:fillType="nonZero" + android:strokeLineCap="round"/> + diff --git a/cardinal-android/app/src/main/res/values/colors.xml b/cardinal-android/app/src/main/res/values/colors.xml index dfc7c4c..087e3d0 100644 --- a/cardinal-android/app/src/main/res/values/colors.xml +++ b/cardinal-android/app/src/main/res/values/colors.xml @@ -29,4 +29,7 @@ #1A4C90 #FF2222DD + + #FFDDDDDD + \ No newline at end of file diff --git a/cardinal-android/app/src/main/res/values/strings.xml b/cardinal-android/app/src/main/res/values/strings.xml index 33b25e9..6fef334 100644 --- a/cardinal-android/app/src/main/res/values/strings.xml +++ b/cardinal-android/app/src/main/res/values/strings.xml @@ -179,7 +179,6 @@ Adjust accessibility settings for better usability Configure advanced settings for the app Cardinal Maps - If you\'re enjoying the app please consider contributing bug reports, feature requests, storage/compute resources, or sponsoring the project. Map data from OpenStreetMap. Open cardinal maps GitHub repository in browser No routing profiles configured yet. Unnamed Location -- GitLab