Commit 68572524 authored by akwizgran's avatar akwizgran

Merge branch '1480-window-background' into 'master'

[android] Change light theme background color closer to white

See merge request !1020
parents 684c64a1 4307d266
Pipeline #2937 passed with stage
in 8 minutes and 58 seconds
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"> android:layout_weight="1"
android:background="@color/thread_item_background">
<org.briarproject.briar.android.view.BriarRecyclerView <org.briarproject.briar.android.view.BriarRecyclerView
android:id="@+id/list" android:id="@+id/list"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
<color name="briar_button_text_disabled">#23cccccc</color> <color name="briar_button_text_disabled">#23cccccc</color>
<color name="thread_indicator">@color/briar_blue</color> <color name="thread_indicator">@color/briar_blue</color>
<color name="thread_item_background">@color/window_background</color>
<color name="thread_item_highlight">@color/briar_black</color> <color name="thread_item_highlight">@color/briar_black</color>
<color name="divider">@color/briar_black</color> <color name="divider">@color/briar_black</color>
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<color name="briar_primary_dark">@color/briar_blue_very_dark</color> <color name="briar_primary_dark">@color/briar_blue_very_dark</color>
<color name="briar_accent">@color/briar_blue</color> <color name="briar_accent">@color/briar_blue</color>
<color name="window_background">#E3EBEF</color> <color name="window_background">#EBEBEB</color>
<color name="card_background">@color/cardview_light_background</color> <color name="card_background">@color/cardview_light_background</color>
<color name="item_background_highlight">#DCDCDC</color> <color name="item_background_highlight">#DCDCDC</color>
<color name="briar_warning_background">@color/briar_red</color> <color name="briar_warning_background">@color/briar_red</color>
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<color name="briar_button_text_disabled">#28000000</color> <color name="briar_button_text_disabled">#28000000</color>
<color name="thread_indicator">@color/m_grey_500</color> <color name="thread_indicator">@color/m_grey_500</color>
<color name="thread_item_background">@color/m_blue_grey_50</color> <color name="thread_item_background">@color/window_background</color>
<color name="thread_item_highlight">@color/briar_white</color> <color name="thread_item_highlight">@color/briar_white</color>
<color name="divider">#c1c1c1</color> <color name="divider">#c1c1c1</color>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment