From eeb87183a00aa4c25a311c0fe0757fdf77f2f348 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Thu, 22 Nov 2018 23:03:56 +0100
Subject: [PATCH] Clean up

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/src/gplay/AndroidManifest.xml             |   5 +-
 app/src/main/AndroidManifest.xml              |   3 +-
 .../talk/adapters/items/UserItem.java         |   6 +-
 .../layout/controller_conversation_info.xml   | 131 +++++++++---------
 4 files changed, 74 insertions(+), 71 deletions(-)

diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
index 1474521d4..2f388c5f5 100644
--- a/app/src/gplay/AndroidManifest.xml
+++ b/app/src/gplay/AndroidManifest.xml
@@ -11,11 +11,12 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="label, icon, theme, name, allowBackup">
+        tools:replace="label, icon, theme, name, allowBackup"
+        tools:ignore="UnusedAttribute, ExportedService">
 
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-        
+
         <service
             android:name=".services.firebase.MagicFirebaseMessagingService">
             <intent-filter>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 06906a3c3..196a9b162 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,8 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="label, icon, theme, name, allowBackup">
+        tools:replace="label, icon, theme, name, allowBackup"
+        tools:ignore="UnusedAttribute">
 
 
         <meta-data
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 45c2ec79b..703c4849b 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -20,16 +20,12 @@
 
 package com.nextcloud.talk.adapters.items;
 
-import android.content.Context;
 import android.content.res.Resources;
-import android.media.Image;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.amulyakhare.textdrawable.TextDrawable;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.LazyHeaders;
@@ -239,7 +235,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
             }
 
             holder.contactMentionId.setText(userType);
-            holder.contactMentionId.setTextColor(NextcloudTalkApplication.getSharedApplication().getColor(R.color.colorPrimary));
+            holder.contactMentionId.setTextColor(NextcloudTalkApplication.getSharedApplication().getResources().getColor(R.color.colorPrimary));
         }
     }
 
diff --git a/app/src/main/res/layout/controller_conversation_info.xml b/app/src/main/res/layout/controller_conversation_info.xml
index 69f6d5ab5..8b8218cd0 100644
--- a/app/src/main/res/layout/controller_conversation_info.xml
+++ b/app/src/main/res/layout/controller_conversation_info.xml
@@ -18,7 +18,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:apc="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -26,74 +26,79 @@
     android:background="@color/nc_white_color"
     android:orientation="vertical">
 
-    <RelativeLayout
+    <ProgressBar
+        android:id="@+id/progressBar"
+        android:layout_width="@dimen/item_height"
+        android:layout_height="@dimen/item_height"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:indeterminate="true"
+        android:indeterminateTint="@color/colorPrimary"
+        android:indeterminateTintMode="src_in" />
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="@dimen/item_height"
-            android:layout_height="@dimen/item_height"
-            android:layout_centerInParent="true"
-            android:layout_marginStart="@dimen/activity_horizontal_margin"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginEnd="@dimen/activity_horizontal_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:indeterminate="true"
-            android:indeterminateTint="@color/colorPrimary"
-            android:indeterminateTintMode="src_in" />
-
-        <com.yarolegovich.mp.MaterialPreferenceCategory
-            android:id="@+id/conversation_info_name"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            android:visibility="gone">
+            android:layout_height="wrap_content">
 
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:id="@+id/avatar_image"
-                    android:layout_width="@dimen/avatar_size_big"
-                    android:layout_height="@dimen/avatar_size_big"
-                    android:layout_centerHorizontal="true" />
-
-                <TextView
-                    android:id="@+id/display_name_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/avatar_image"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="@dimen/margin_between_elements" />
-
-            </RelativeLayout>
-        </com.yarolegovich.mp.MaterialPreferenceCategory>
-
-        <include
-            layout="@layout/notification_settings_item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/conversation_info_name"
-            android:visibility="gone" />
-
-        <com.yarolegovich.mp.MaterialPreferenceCategory
-            android:id="@+id/participants_list_category"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/notification_settings"
-            android:visibility="gone"
-            apc:mpc_title="@string/nc_participants"
-            apc:mpc_title_color="@color/colorPrimary">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_view"
+            <com.yarolegovich.mp.MaterialPreferenceCategory
+                android:id="@+id/conversation_info_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:listitem="@layout/rv_item_contact"></androidx.recyclerview.widget.RecyclerView>
+                android:animateLayoutChanges="true"
+                android:visibility="gone">
 
-        </com.yarolegovich.mp.MaterialPreferenceCategory>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-    </RelativeLayout>
-</ScrollView>
+                    <ImageView
+                        android:id="@+id/avatar_image"
+                        android:layout_width="@dimen/avatar_size_big"
+                        android:layout_height="@dimen/avatar_size_big"
+                        android:layout_centerHorizontal="true" />
+
+                    <TextView
+                        android:id="@+id/display_name_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/avatar_image"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginTop="@dimen/margin_between_elements" />
+
+                </RelativeLayout>
+            </com.yarolegovich.mp.MaterialPreferenceCategory>
+
+            <include
+                layout="@layout/notification_settings_item"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/conversation_info_name"
+                android:visibility="gone" />
+
+            <com.yarolegovich.mp.MaterialPreferenceCategory
+                android:id="@+id/participants_list_category"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/notification_settings"
+                android:visibility="gone"
+                apc:mpc_title="@string/nc_participants"
+                apc:mpc_title_color="@color/colorPrimary"
+                tools:ignore="UnknownIdInLayout">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:listitem="@layout/rv_item_contact"></androidx.recyclerview.widget.RecyclerView>
+
+            </com.yarolegovich.mp.MaterialPreferenceCategory>
+        </RelativeLayout>
+    </ScrollView>
+</RelativeLayout>