diff --git a/TODO.md b/TODO.md
index 135f6cbfe..92987cbde 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,7 @@
# High priority
MVP features required for first public alpha
+( show username icons in the next window)
* make chat pretty and functional
* let user set name and shortname
* take video
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
index 1072c4485..285493f03 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
@@ -104,12 +104,14 @@ fun HomeContent() {
}
}
+val palette = lightColorPalette() // darkColorPalette()
+
@Composable
fun MeshApp() {
val (drawerState, onDrawerStateChange) = state { DrawerState.Closed }
- MaterialTheme(colors = darkColorPalette()) {
+ MaterialTheme(colors = palette) {
ModalDrawerLayout(
drawerState = drawerState,
onStateChange = onDrawerStateChange,
@@ -129,7 +131,7 @@ fun MeshApp() {
@Composable
fun previewView() {
// It seems modaldrawerlayout not yet supported in preview
- MaterialTheme(colors = darkColorPalette()) {
+ MaterialTheme(colors = palette) {
HomeContent()
}
}
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
index d99d01d33..39e105941 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
@@ -11,7 +11,6 @@ import androidx.ui.layout.Column
import androidx.ui.layout.LayoutPadding
import androidx.ui.layout.LayoutSize
import androidx.ui.material.MaterialTheme
-import androidx.ui.material.darkColorPalette
import androidx.ui.material.surface.Surface
import androidx.ui.text.TextStyle
import androidx.ui.tooling.preview.Preview
@@ -57,7 +56,7 @@ fun MessagesContent() {
val message = state { "text message" }
val colors = MaterialTheme.colors()
- val backgroundColor = colors.surface.copy(alpha = 0.12f)
+ val backgroundColor = colors.secondary.copy(alpha = 0.12f)
Surface(
modifier = LayoutPadding(8.dp),
@@ -68,7 +67,7 @@ fun MessagesContent() {
value = message.value,
onValueChange = { message.value = it },
textStyle = TextStyle(
- color = colors.onSurface.copy(alpha = 0.8f)
+ color = colors.onSecondary.copy(alpha = 0.8f)
),
imeAction = ImeAction.Send,
onImeActionPerformed = {
@@ -85,7 +84,7 @@ fun MessagesContent() {
@Composable
fun previewMessagesView() {
// another bug? It seems modaldrawerlayout not yet supported in preview
- MaterialTheme(colors = darkColorPalette()) {
+ MaterialTheme(colors = palette) {
MessagesContent()
}
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 69b22338c..898bcdd50 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
- #008577
- #00574B
+ #3700B3
+ #3700B3
#D81B60
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6d2..5e399fa2e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
-