change order/icon of public conversation creation item

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

5 files changed, 8 insertions, 5 deletions

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index ecf9915c3..735d0b68a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -667,12 +667,12 @@ public class ContactsController extends BaseController implements SearchView.OnQ
 
         joinConversationViaLinkImageView
                 .getBackground()
-                .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null),
+                .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorBackgroundDarker, null),
                                 PorterDuff.Mode.SRC_IN);
 
         publicCallLinkImageView
                 .getBackground()
-                .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null),
+                .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorBackgroundDarker, null),
                                 PorterDuff.Mode.SRC_IN);
 
         disengageProgressBar();
diff --git a/app/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml
index e85dd4956..1a86acb33 100644
--- a/app/src/main/res/layout/controller_contacts_rv.xml
+++ b/app/src/main/res/layout/controller_contacts_rv.xml
@@ -62,11 +62,11 @@
     </LinearLayout>
 
     <include
-        layout="@layout/join_conversation_via_link"
+        layout="@layout/conversation_privacy_toggle"
         android:visibility="gone" />
 
     <include
-        layout="@layout/conversation_privacy_toggle"
+        layout="@layout/join_conversation_via_link"
         android:visibility="gone" />
 
     <include
diff --git a/app/src/main/res/layout/conversation_privacy_toggle.xml b/app/src/main/res/layout/conversation_privacy_toggle.xml
index 15f728b11..cf600dc0e 100644
--- a/app/src/main/res/layout/conversation_privacy_toggle.xml
+++ b/app/src/main/res/layout/conversation_privacy_toggle.xml
@@ -46,7 +46,7 @@
             android:background="@drawable/round_bgnd"
             android:contentDescription="@null"
             android:padding="@dimen/standard_half_padding"
-            android:src="@drawable/ic_public_black_24px"
+            android:src="@drawable/ic_contacts"
             app:tint="@color/white" />
 
         <TextView
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3c8e97869..12b249d12 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -51,6 +51,8 @@
 
     <color name="controller_chat_separator">#484848</color>
 
+    <color name="colorBackgroundDarker">#2C2C2C</color>
+
     <!-- Chat window incoming message text & informational -->
     <color name="bg_bottom_sheet">#121212</color>
     <color name="bg_message_list_incoming_bubble">#484848</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 588b5bb8a..f847fe189 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -57,6 +57,7 @@
     <color name="controller_call_incomingCallTextView">#E9FFFFFF</color>
     <color name="grey950">#111111</color>
     <color name="textColorMaxContrast">#767676</color>
+    <color name="colorBackgroundDarker">#DBDBDB</color>
 
     <!-- Emoji list in chat window -->
     <color name="emoji_icons">#61000000</color>