From 9e2b83afa44cc2182773c30af5d0edbf122ec19b Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 14 Sep 2018 20:51:30 +0200
Subject: highlight selected conversation in tablet view

---
 .../de/pixart/messenger/ui/adapter/ConversationAdapter.java    |  2 +-
 src/main/res/layout/conversation_list_row.xml                  |  2 +-
 src/main/res/layout/fragment_conversation.xml                  | 10 +++++-----
 src/main/res/values/themes.xml                                 |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 5294ba7cd..7e29de8a6 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -99,7 +99,7 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
         if (conversation == ConversationFragment.getConversation(activity)) {
             viewHolder.frame.setBackgroundColor(Color.get(activity, R.attr.color_background_tertiary));
         } else {
-            viewHolder.frame.setBackgroundColor(Color.get(activity,R.attr.color_background_primary));
+            viewHolder.frame.setBackgroundColor(Color.get(activity, R.attr.color_background_primary));
         }
 
         Message message = conversation.getLatestMessage();
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index b00be5a4b..002696ce7 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -13,7 +13,7 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/color_background_secondary"
+            android:background="?android:selectableItemBackground"
             android:orientation="horizontal"
             android:padding="8dp">
 
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d081b6543..3ddcd69c7 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -5,7 +5,7 @@
     <RelativeLayout xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/color_background_secondary"
+        android:background="?attr/color_background_tertiary"
         android:clickable="false">
 
         <ListView
@@ -15,7 +15,7 @@
             android:layout_above="@+id/snackbar"
             android:layout_alignParentLeft="true"
             android:layout_alignParentTop="true"
-            android:background="?attr/color_background_secondary"
+            android:background="?attr/color_background_tertiary"
             android:divider="@null"
             android:dividerHeight="0dp"
             android:listSelector="@android:color/transparent"
@@ -61,7 +61,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:background="?attr/color_background_secondary"
+                android:background="?attr/color_background_tertiary"
                 android:clickable="true"
                 android:paddingBottom="2dp"
                 android:paddingLeft="2dp"
@@ -73,7 +73,7 @@
                     android:layout_height="48dp"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:background="?attr/color_background_secondary"
+                    android:background="?attr/color_background_tertiary"
                     android:contentDescription="@string/attach_record_voice"
                     android:src="@drawable/ic_send_voice_offline"
                     android:visibility="gone" />
@@ -107,7 +107,7 @@
                     android:layout_height="48dp"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:background="?attr/color_background_secondary"
+                    android:background="?attr/color_background_tertiary"
                     android:contentDescription="@string/send_message"
                     android:src="@drawable/ic_send_text_offline" />
             </RelativeLayout>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index c17bb820f..0e58f26a6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -150,9 +150,9 @@
         <item name="colorControlActivated">@color/accent</item>
         <item name="text_Color_Main">@color/realwhite</item>
 
-        <item name="color_background_primary">@color/grey800</item>
-        <item name="color_background_secondary">@color/grey900</item>
-        <item name="color_background_tertiary">@color/grey700</item>
+        <item name="color_background_primary">@color/grey700</item>
+        <item name="color_background_secondary">@color/grey800</item>
+        <item name="color_background_tertiary">@color/grey900</item>
         <item name="color_warning">@color/red_a700</item>
         <item name="TextColorOnline">@color/green500</item>
         <item name="TextColorError">@color/red500</item>
-- 
cgit v1.2.3