Skip to content

Changed title bar color to black for issue #1704 and #1633. #1713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −2
Draft

Changed title bar color to black for issue #1704 and #1633. #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a6b717
Changed title bar color to black for issue #1704.
todd2982 Mar 24, 2025
39dce63
Fix colors on channel selection
todd2982 Mar 27, 2025
c1ebcfe
Correct theming to black on green when in light theme.
todd2982 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ val LightPink = Color(0xFFFFE6E6)
val LightGreen = Color(0xFFCFE8A9)
val LightRed = Color(0xFFFFB3B3)

val Black = Color(0x000000)

val MeshtasticGreen = Color(0xFF67EA94)

val HyperlinkBlue = Color(0xFF43C3B0)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import androidx.compose.material.MaterialTheme
import androidx.compose.material.darkColors
import androidx.compose.material.lightColors
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color

private val DarkColorPalette = darkColors(
primary = MeshtasticGreen,
Expand All @@ -33,6 +34,7 @@ private val LightColorPalette = lightColors(
primary = MeshtasticGreen,
primaryVariant = LightSkyBlue,
secondary = Teal200,
onPrimary = Color.Black

/* Other default colors to override
background = Color.White,
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
-->

<resources>
<color name="colorOnPrimary">#FFFFFF</color>
<color name="colorOnPrimary">#000000</color>
<color name="colorPrimary">#67EA94</color>
<color name="colorPrimaryDark">#67EA94</color>
<color name="colorMsg">#F2F2F2</color>
Expand All @@ -30,5 +30,5 @@
<color name="colourGrey">#535353</color>
<color name="colorAnnotation">#0288D1</color>
<color name="toolbarBackground">#67EA94</color>
<color name="toolbarText">#FFFFFF</color>
<color name="toolbarText">#000000</color>
</resources>