Improved themes

app/src/main/res/layout-sw720dp-land/activity_main.xml

@@ -31,7 +31,7 @@
           android:layout_width="match_parent"
           android:layout_height="?attr/actionBarSize"
           app:contentInsetStartWithNavigation="0dp"
-          app:popupTheme="@style/Widget.PopupOverlay" />
+          app:popupTheme="?attr/actionBarPopupTheme" />
 
       </android.support.design.widget.AppBarLayout>
 

app/src/main/res/layout/activity_main.xml

@@ -27,7 +27,7 @@
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           app:contentInsetStartWithNavigation="0dp"
-          app:popupTheme="@style/Widget.PopupOverlay">
+          app:popupTheme="?attr/actionBarPopupTheme">
 
           <fragment
             android:id="@+id/fragment_toolbar"

app/src/main/res/layout/fragment_chat_list.xml

@@ -15,13 +15,13 @@
       android:layout_width="match_parent"
       android:layout_height="?attr/actionBarSize"
       app:contentInsetStartWithNavigation="0dp"
-      app:popupTheme="@style/Widget.PopupOverlay">
+      app:popupTheme="?attr/actionBarPopupTheme">
 
       <android.support.v7.widget.AppCompatSpinner
         android:id="@+id/chatListSpinner"
         android:layout_width="fill_parent"
         android:layout_height="match_parent"
-        app:popupTheme="@style/Widget.PopupOverlay" />
+        app:popupTheme="?attr/actionBarPopupTheme" />
 
     </android.support.v7.widget.Toolbar>
 

app/src/main/res/values/styles_widgets.xml

@@ -9,15 +9,17 @@
   <style name="Widget.Button.Colored" parent="Widget.AppCompat.Button.Colored" />
 
   <style name="Widget.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-    <item name="colorControlNormal">@color/colorFillDark</item>
-    <item name="android:textColorPrimary">@color/colorFillDark</item>
     <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+    <item name="android:textColorPrimary">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
   </style>
 
   <style name="Widget.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.ActionBar">
-    <item name="colorControlNormal">@color/colorFillLight</item>
-    <item name="android:textColorPrimary">@color/colorFillLight</item>
     <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle.Light</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+    <item name="android:textColorPrimary">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
   </style>
 
   <style name="Widget.DrawerArrowToggle" parent="Widget.AppCompat.DrawerArrowToggle">
@@ -28,5 +30,15 @@
     <item name="color">?attr/colorControlNormal</item>
   </style>
 
-  <style name="Widget.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+  <style name="Widget.PopupOverlay" parent="ThemeOverlay.AppCompat">
+    <item name="android:colorBackground">?colorBackgroundCard</item>
+  </style>
+
+  <style name="Widget.PopupOverlay.Light" parent="ThemeOverlay.AppCompat.Light">
+    <item name="android:colorBackground">?colorBackgroundCard</item>
+  </style>
+
+  <style name="Widget.DialogTheme" parent="Theme.AppCompat.Dialog.Alert" />
+
+  <style name="Widget.DialogTheme.Light" parent="Theme.AppCompat.Light.Dialog.Alert" />
 </resources>

app/src/main/res/values/themes_base.xml

@@ -36,17 +36,22 @@
     <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
     <item name="formatBarTheme">@style/Widget.AppBarOverlay</item>
     <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    <item name="actionBarPopupTheme">@style/Widget.PopupOverlay</item>
 
     <item name="windowActionModeOverlay">true</item>
 
-    <item name="colorTextPrimary">#8a8a8a</item>
-    <item name="colorTextSecondary">#dedede</item>
+    <item name="colorTextPrimary">#dedede</item>
+    <item name="colorTextSecondary">#8a8a8a</item>
     <item name="colorDivider">#1FFFFFFF</item>
 
     <item name="colorFill">@color/colorFillDark</item>
     <item name="colorOffline">@color/colorOfflineDark</item>
     <item name="colorAway">@color/colorAwayDark</item>
 
+    <item name="android:textColor">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+
     <item name="cardStyle">@style/CardView.Dark</item>
 
     <item name="mircColor0">#ffffff</item>
@@ -71,6 +76,7 @@
     <item name="actionBarTheme">@style/Widget.AppBarOverlay</item>
     <item name="formatBarTheme">@style/Widget.AppBarOverlay.Light</item>
     <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Light</item>
 
     <item name="windowActionModeOverlay">true</item>
 
@@ -82,6 +88,10 @@
     <item name="colorOffline">@color/colorOfflineLight</item>
     <item name="colorAway">@color/colorAwayLight</item>
 
+    <item name="android:textColor">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+
     <item name="cardStyle">@style/CardView.Light</item>
 
     <item name="mircColor0">#ffffff</item>

app/src/main/res/values/themes_gruvbox.xml

@@ -2,20 +2,11 @@
 
 <resources>
   <color name="gruvbox_light_background">#fbf1c7</color>
-
-  <style name="Widget.AppBarOverlay.Gruvbox_Light" parent="Widget.AppBarOverlay.Light">
-    <item name="colorControlNormal">#3c3836</item>
-    <item name="android:textColorPrimary">#3c3836</item>
-    <item name="android:textColorSecondary">#665c54</item>
-  </style>
-
   <style name="Theme.ChatTheme.Gruvbox_Light" parent="Theme.ChatTheme.Light">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">#b6ae91</item>
     <item name="colorAccent">#d65d0e</item>
 
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Gruvbox_Light</item>
-
     <item name="senderColor0">#d65d0e</item>
     <item name="senderColor1">#cc241d</item>
     <item name="senderColor2">#98971a</item>
@@ -64,19 +55,11 @@
   </style>
 
   <color name="gruvbox_dark_background">#282828</color>
-  <style name="Widget.AppBarOverlay.Gruvbox_Dark" parent="Widget.AppBarOverlay.Light">
-    <item name="colorControlNormal">#dbdbb2</item>
-    <item name="android:textColorPrimary">#dbdbb2</item>
-    <item name="android:textColorSecondary">#bdae93</item>
-  </style>
-
   <style name="Theme.ChatTheme.Gruvbox_Dark" parent="Theme.ChatTheme">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">#3c3734</item>
     <item name="colorAccent">#d65d0e</item>
 
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Gruvbox_Dark</item>
-
     <item name="senderColor0">#d65d0e</item>
     <item name="senderColor1">#cc241d</item>
     <item name="senderColor2">#98971a</item>

app/src/main/res/values/themes_quassel.xml

@@ -2,7 +2,14 @@
 
 <resources>
   <color name="quassel_light_background">#fafafa</color>
+
+  <style name="Widget.AppBarOverlay.Quassel_Light" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">@color/colorFillDark</item>
+    <item name="android:textColorPrimary">@color/colorFillDark</item>
+  </style>
   <style name="Theme.ChatTheme.Quassel_Light" parent="Theme.ChatTheme.Light">
+    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Quassel_Light</item>
+
     <item name="senderColor0">#cc0000</item>
     <item name="senderColor1">#006cad</item>
     <item name="senderColor2">#4d9900</item>

app/src/main/res/values/themes_solarized.xml

@@ -2,19 +2,11 @@
 
 <resources>
   <color name="solarized_light_background">#FDF6E3</color>
-
-  <style name="Widget.AppBarOverlay.Solarized_Light" parent="Widget.AppBarOverlay.Light">
-    <item name="colorControlNormal">#586e75</item>
-    <item name="android:textColorPrimary">#586e75</item>
-    <item name="android:textColorSecondary">#657b83</item>
-  </style>
   <style name="Theme.ChatTheme.Solarized_Light" parent="Theme.ChatTheme.Light">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">#b0ac9e</item>
     <item name="colorAccent">#B58900</item>
 
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Solarized_Light</item>
-
     <item name="senderColor0">#B58900</item>
     <item name="senderColor1">#CB4B16</item>
     <item name="senderColor2">#DC322f</item>
@@ -63,18 +55,11 @@
   </style>
 
   <color name="solarized_dark_background">#002B36</color>
-  <style name="Widget.AppBarOverlay.Solarized_Dark" parent="Widget.AppBarOverlay.Light">
-    <item name="colorControlNormal">#93a1a1</item>
-    <item name="android:textColorPrimary">#93a1a1</item>
-    <item name="android:textColorSecondary">#839496</item>
-  </style>
   <style name="Theme.ChatTheme.Solarized_Dark" parent="Theme.ChatTheme">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">?attr/colorBackground</item>
     <item name="colorAccent">#B58900</item>
 
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Solarized_Dark</item>
-
     <item name="senderColor0">#B58900</item>
     <item name="senderColor1">#CB4B16</item>
     <item name="senderColor2">#DC322f</item>