Merge branch 'dev' into ui

This commit is contained in:
nielsandriesse
2020-09-17 10:06:30 +10:00
30 changed files with 318 additions and 135 deletions

View File

@@ -25,7 +25,7 @@
<color name="progress_bar_background">#0AFFFFFF</color>
<color name="compose_view_background">#1B1B1B</color>
<color name="compose_text_view_background">#141414</color>
<color name="quote_not_found_background">#99FFFFFF</color>
<color name="quote_not_found_background">#80FFFFFF</color>
<color name="new_conversation_button_collapsed_background">#1F1F1F</color>
<color name="new_conversation_button_shadow">#077C44</color>
<color name="pn_option_background">#1B1B1B</color>