kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
fix colors
rodzic
ea60f350b0
commit
1139883527
1
TODO.md
1
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
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="colorPrimary">#008577</color>
|
||||
<color name="colorPrimaryDark">#00574B</color>
|
||||
<color name="colorPrimary">#3700B3</color>
|
||||
<color name="colorPrimaryDark">#3700B3</color>
|
||||
<color name="colorAccent">#D81B60</color>
|
||||
</resources>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
|
|
Ładowanie…
Reference in New Issue