From b51eb06af834612fc912db9e752a53d234ef1035 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 14 Jan 2019 17:55:08 +0100
Subject: [PATCH] Fixes search display again
---
app/src/main/res/layout/fragment_chat_list.xml | 11 +++++------
app/src/main/res/values/attrs.xml | 3 +++
app/src/main/res/values/themes_amoled.xml | 2 ++
app/src/main/res/values/themes_base.xml | 7 +++++++
app/src/main/res/values/themes_dracula.xml | 4 +++-
app/src/main/res/values/themes_gruvbox.xml | 4 ++++
app/src/main/res/values/themes_material.xml | 1 +
app/src/main/res/values/themes_quassel.xml | 1 +
app/src/main/res/values/themes_solarized.xml | 4 ++++
9 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/layout/fragment_chat_list.xml b/app/src/main/res/layout/fragment_chat_list.xml
index 78154116a..8c8a2b354 100644
--- a/app/src/main/res/layout/fragment_chat_list.xml
+++ b/app/src/main/res/layout/fragment_chat_list.xml
@@ -54,14 +54,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?colorBackgroundSnackbar"
- android:theme="?attr/actionBarTheme">
+ android:background="?colorBackgroundSnackbar">
<androidx.cardview.widget.CardView
android:id="@+id/buffer_search_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:cardBackgroundColor="?colorBackgroundCard"
+ app:cardBackgroundColor="?colorBackgroundSearch"
app:cardElevation="2dp"
android:layout_margin="6dp">
@@ -84,8 +83,8 @@
android:minHeight="40dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:textColor="?colorTextPrimary"
- android:textColorHint="?colorTextSecondary"
+ android:textColor="?colorTextSearch"
+ android:textColorHint="?colorTextSearchSecondary"
android:textSize="16sp" />
<androidx.appcompat.widget.AppCompatImageButton
@@ -94,7 +93,7 @@
android:layout_height="match_parent"
android:background="?selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_close"
- app:tint="?colorTextSecondary" />
+ app:tint="?colorTextSearchSecondary" />
</LinearLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 43ce8a211..8f69f8835 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -53,12 +53,15 @@
<attr name="colorTextPrimaryInverse" format="color" />
<attr name="colorTextSecondary" format="color" />
<attr name="colorTextSecondaryInverse" format="color" />
+ <attr name="colorTextSearch" format="color" />
+ <attr name="colorTextSearchSecondary" format="color" />
<attr name="colorDivider" format="color" />
<attr name="colorBackground" format="color" />
<attr name="colorBackgroundHighlight" format="color" />
<attr name="colorBackgroundSecondary" format="color" />
<attr name="colorBackgroundCard" format="color" />
+ <attr name="colorBackgroundSearch" format="color" />
<attr name="colorBackgroundDialog" format="color" />
<attr name="colorBackgroundSnackbar" format="color" />
diff --git a/app/src/main/res/values/themes_amoled.xml b/app/src/main/res/values/themes_amoled.xml
index f53273a66..12cb0535b 100644
--- a/app/src/main/res/values/themes_amoled.xml
+++ b/app/src/main/res/values/themes_amoled.xml
@@ -48,6 +48,8 @@
<item name="colorTextPrimaryInverse">#de000000</item>
<item name="colorTextSecondary">#b3ffffff</item>
<item name="colorTextSecondaryInverse">#8a000000</item>
+ <item name="colorTextSearch">#ffffffff</item>
+ <item name="colorTextSearchSecondary">#b3ffffff</item>
<item name="colorDivider">#1FFFFFFF</item>
<item name="colorForeground">#FFFFFF</item>
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index 5184500b7..07d8e4f93 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -98,6 +98,8 @@
<item name="colorTextPrimaryInverse">#de000000</item>
<item name="colorTextSecondary">#b3ffffff</item>
<item name="colorTextSecondaryInverse">#8a000000</item>
+ <item name="colorTextSearch">#de000000</item>
+ <item name="colorTextSearchSecondary">#8a000000</item>
<item name="colorDivider">#1FFFFFFF</item>
<item name="android:textColorHint">?colorTextSecondary</item>
@@ -121,6 +123,7 @@
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
+ <item name="colorBackgroundSearch">?colorBackgroundCard</item>
</style>
<style name="Theme.ChatTheme.Light" parent="Base.ChatTheme.Light">
@@ -139,6 +142,8 @@
<item name="colorTextPrimaryInverse">#ffffffff</item>
<item name="colorTextSecondary">#8a000000</item>
<item name="colorTextSecondaryInverse">#b3ffffff</item>
+ <item name="colorTextSearch">#de000000</item>
+ <item name="colorTextSearchSecondary">#8a000000</item>
<item name="colorDivider">#1F000000</item>
<item name="android:textColorHint">?colorTextSecondary</item>
@@ -163,6 +168,7 @@
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimary</item>
+ <item name="colorBackgroundSearch">?colorBackgroundCard</item>
</style>
<style name="Theme.ChatTheme.Light.DarkHead" parent="Theme.ChatTheme.Light">
@@ -177,6 +183,7 @@
<item name="colorControlNormal">?colorTextPrimary</item>
<item name="colorBackgroundSnackbar">?colorPrimaryDark</item>
+ <item name="colorBackgroundSearch">?colorBackgroundCard</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 6d7e2d613..c92f2fd14 100644
--- a/app/src/main/res/values/themes_dracula.xml
+++ b/app/src/main/res/values/themes_dracula.xml
@@ -22,7 +22,7 @@
<resources>
<color name="dracula_dark_background">#282a36</color>
- <style name="Theme_ChatTheme_Dracula" parent="Theme.ChatTheme.Auto">
+ <style name="Theme.ChatTheme.Dracula" parent="Theme.ChatTheme.Auto">
<item name="colorPrimary">?attr/colorBackgroundCard</item>
<item name="colorPrimaryDark">?attr/colorBackground</item>
<item name="colorAccent">#ff79c6</item>
@@ -56,6 +56,8 @@
<item name="colorTextPrimaryInverse">#282a36</item>
<item name="colorTextSecondary">#6272a4</item>
<item name="colorTextSecondaryInverse">#586e75</item>
+ <item name="colorTextSearch">#f8f8f2</item>
+ <item name="colorTextSearchSecondary">#6272a4</item>
<item name="colorDivider">#19f8f8f2</item>
<item name="colorForegroundMirc">0x0</item>
diff --git a/app/src/main/res/values/themes_gruvbox.xml b/app/src/main/res/values/themes_gruvbox.xml
index fae90a1d9..87db8b04b 100644
--- a/app/src/main/res/values/themes_gruvbox.xml
+++ b/app/src/main/res/values/themes_gruvbox.xml
@@ -56,6 +56,8 @@
<item name="colorTextPrimaryInverse">#fbf1c7</item>
<item name="colorTextSecondary">#665c54</item>
<item name="colorTextSecondaryInverse">#bdae93</item>
+ <item name="colorTextSearch">#3c3836</item>
+ <item name="colorTextSearchSecondary">#665c54</item>
<item name="colorDivider">#2d928374</item>
<item name="colorForegroundMirc">0x1</item>
@@ -117,6 +119,8 @@
<item name="colorTextPrimaryInverse">#282828</item>
<item name="colorTextSecondary">#bdae93</item>
<item name="colorTextSecondaryInverse">#665c54</item>
+ <item name="colorTextSearch">#dbdbb2</item>
+ <item name="colorTextSearchSecondary">#bdae93</item>
<item name="colorDivider">#33928374</item>
<item name="colorForegroundMirc">0x0</item>
diff --git a/app/src/main/res/values/themes_material.xml b/app/src/main/res/values/themes_material.xml
index fd44a4f63..2338b21dd 100644
--- a/app/src/main/res/values/themes_material.xml
+++ b/app/src/main/res/values/themes_material.xml
@@ -115,6 +115,7 @@
<item name="colorBackgroundHighlight">#40ffaf3b</item>
<item name="colorBackgroundSecondary">#424242</item>
<item name="colorBackgroundCard">#424242</item>
+ <item name="colorBackgroundSearch">#FFFFFF</item>
<item name="colorBackgroundDialog">#303030</item>
<item name="colorMarkerLine">#B71C1C</item>
diff --git a/app/src/main/res/values/themes_quassel.xml b/app/src/main/res/values/themes_quassel.xml
index 57df75dd2..d100967cd 100644
--- a/app/src/main/res/values/themes_quassel.xml
+++ b/app/src/main/res/values/themes_quassel.xml
@@ -119,6 +119,7 @@
<item name="colorBackgroundHighlight">#ffaf3b</item>
<item name="colorBackgroundSecondary">#424242</item>
<item name="colorBackgroundCard">#424242</item>
+ <item name="colorBackgroundSearch">#FFFFFF</item>
<item name="colorBackgroundDialog">#303030</item>
<item name="colorMarkerLine">#800000</item>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 257064c9f..384e93909 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -56,6 +56,8 @@
<item name="colorTextPrimaryInverse">#FDF6E3</item>
<item name="colorTextSecondary">#657b83</item>
<item name="colorTextSecondaryInverse">#839496</item>
+ <item name="colorTextSearch">#586e75</item>
+ <item name="colorTextSearchSecondary">#657b83</item>
<item name="colorDivider">#19586e75</item>
<item name="colorForegroundMirc">0x1</item>
@@ -117,6 +119,8 @@
<item name="colorTextPrimaryInverse">#002B36</item>
<item name="colorTextSecondary">#839496</item>
<item name="colorTextSecondaryInverse">#657b83</item>
+ <item name="colorTextSearch">#93a1a1</item>
+ <item name="colorTextSearchSecondary">#839496</item>
<item name="colorDivider">#1993a1a1</item>
<item name="colorForegroundMirc">0x0</item>
--
GitLab