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

---
 src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java')

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();
-- 
cgit v1.2.3


From 51887fe4971405e3cabcb985629296d3329480d9 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 14 Sep 2018 22:58:59 +0200
Subject: show background in chatoverview a bit darker

---
 src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java')

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 7e29de8a6..36cae0eb3 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_secondary));
         }
 
         Message message = conversation.getLatestMessage();
-- 
cgit v1.2.3


From 1e63a8291579043659f86dbb46d4d63d3225c471 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 23 Sep 2018 16:42:56 +0200
Subject: preview media before sending them and allow sharing and attaching of
 multiple files

---
 .../de/pixart/messenger/ui/adapter/ConversationAdapter.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java')

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 36cae0eb3..55dd6d65f 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -31,7 +31,7 @@ import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Transferable;
 import de.pixart.messenger.ui.ConversationFragment;
 import de.pixart.messenger.ui.XmppActivity;
-import de.pixart.messenger.ui.util.Color;
+import de.pixart.messenger.ui.util.StyledAttributes;
 import de.pixart.messenger.ui.widget.UnreadCountCustomView;
 import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.IrregularUnicodeDetector;
@@ -97,9 +97,9 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
         }
 
         if (conversation == ConversationFragment.getConversation(activity)) {
-            viewHolder.frame.setBackgroundColor(Color.get(activity, R.attr.color_background_tertiary));
+            viewHolder.frame.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_tertiary));
         } else {
-            viewHolder.frame.setBackgroundColor(Color.get(activity, R.attr.color_background_secondary));
+            viewHolder.frame.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_secondary));
         }
 
         Message message = conversation.getLatestMessage();
@@ -250,11 +250,11 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
                     viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.notavailable));
                     break;
                 default:
-                    viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+                    viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
                     break;
             }
         } else {
-            viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main));
+            viewHolder.name.setTextColor(StyledAttributes.getColor(activity, R.attr.text_Color_Main));
         }
 
         if (activity.xmppConnectionService.indicateReceived()) {
-- 
cgit v1.2.3