From e0f9916a2686ec46ac0ef6d9574d1ee70bd63cf2 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 11 Dec 2018 20:48:18 +0100
Subject: [PATCH] Improved design of connection info bar

---
 app/src/main/res/layout/widget_connection_status.xml | 12 ++++++++----
 app/src/main/res/values/attrs.xml                    |  1 +
 app/src/main/res/values/themes_base.xml              |  8 +++++++-
 app/src/main/res/values/themes_dracula.xml           |  1 +
 app/src/main/res/values/themes_solarized.xml         |  1 +
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/widget_connection_status.xml b/app/src/main/res/layout/widget_connection_status.xml
index 40b2c94ea..1414ff1e9 100644
--- a/app/src/main/res/layout/widget_connection_status.xml
+++ b/app/src/main/res/layout/widget_connection_status.xml
@@ -5,13 +5,14 @@
   android:id="@+id/connection_status"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?colorPrimaryDark"
+  android:background="?colorBackgroundSnackbar"
   android:minHeight="32dp"
   android:paddingLeft="16dp"
   android:paddingTop="6dp"
   android:paddingRight="16dp"
   android:paddingBottom="6dp"
   android:visibility="gone"
+  android:theme="?attr/actionBarTheme"
   tools:visibility="visible">
 
   <androidx.appcompat.widget.AppCompatImageView
@@ -19,7 +20,9 @@
     android:layout_width="20dp"
     android:layout_height="20dp"
     app:srcCompat="@drawable/ic_disconnected"
-    app:tint="?colorTextPrimaryInverse" />
+    android:visibility="gone"
+    app:tint="?android:textColorPrimary"
+    tools:visibility="visible" />
 
   <me.zhanghai.android.materialprogressbar.MaterialProgressBar
     android:id="@+id/connection_status_progress"
@@ -27,7 +30,8 @@
     android:layout_width="20dp"
     android:layout_height="20dp"
     android:indeterminate="true"
-    app:mpb_indeterminateTint="?colorTextPrimaryInverse" />
+    android:visibility="gone"
+    app:mpb_indeterminateTint="?android:textColorPrimary" />
 
   <TextView
     android:id="@+id/connection_status_text"
@@ -35,7 +39,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
     android:layout_marginLeft="16dp"
-    android:textColor="?colorTextPrimaryInverse"
+    android:textColor="?android:textColorPrimary"
     tools:text="@string/label_status_connecting" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 94405b9f6..5fbd71cdd 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -60,6 +60,7 @@
   <attr name="colorBackgroundSecondary" format="color" />
   <attr name="colorBackgroundCard" format="color" />
   <attr name="colorBackgroundDialog" format="color" />
+  <attr name="colorBackgroundSnackbar" format="color" />
 
   <attr name="colorMarkerLine" format="color" />
 
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 4fce570ce..9cf22b9da 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -119,6 +119,8 @@
     <item name="android:textColor">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
   </style>
 
   <style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light">
@@ -159,9 +161,11 @@
     <item name="android:textColorPrimary">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimary</item>
   </style>
 
-  <style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light.Auto">
+  <style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light">
     <item name="actionBarTheme">@style/Widget.AppBarOverlay.Light.DarkHead</item>
     <item name="formatBarTheme">@style/Widget.AppBarOverlay.Light.Auto</item>
     <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light.Auto</item>
@@ -171,6 +175,8 @@
     <item name="android:textColorPrimary">?colorTextPrimary</item>
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
   </style>
 
   <style name="Widget.PopupOverlay.Setup" parent="Widget.AppBarOverlay.Light">
diff --git a/app/src/main/res/values/themes_dracula.xml b/app/src/main/res/values/themes_dracula.xml
index f1f26e2d0..cbed35825 100644
--- a/app/src/main/res/values/themes_dracula.xml
+++ b/app/src/main/res/values/themes_dracula.xml
@@ -66,6 +66,7 @@
     <item name="colorBackgroundSecondary">#44475a</item>
     <item name="colorBackgroundCard">#44475a</item>
     <item name="colorBackgroundDialog">#282a36</item>
+    <item name="colorBackgroundSnackbar">#373949</item>
 
     <item name="colorOffline">#586e75</item>
     <item name="colorAway">#586e75</item>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 1d2a5ec0f..d3582f40c 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -127,6 +127,7 @@
     <item name="colorBackgroundSecondary">#073642</item>
     <item name="colorBackgroundCard">#073642</item>
     <item name="colorBackgroundDialog">#002B36</item>
+    <item name="colorBackgroundSnackbar">#04313c</item>
 
     <item name="colorOffline">#839496</item>
     <item name="colorAway">#839496</item>
-- 
GitLab