From b1889abb1b48bbde57b6b09f7f1d3c03f00e243c Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 28 Nov 2018 17:15:30 +0100
Subject: [PATCH] Add nice FAB animation & cleanups to layouts

---
 .../utils/FABAwareScrollingViewBehavior.java  | 73 ++++++++++++++
 .../main/res/layout/activity_magic_call.xml   | 15 ++-
 app/src/main/res/layout/activity_main.xml     |  9 +-
 app/src/main/res/layout/bottom_sheet.xml      | 15 ++-
 app/src/main/res/layout/call_item.xml         | 31 +++---
 .../controller_account_verification.xml       | 29 +++---
 app/src/main/res/layout/controller_call.xml   | 98 ++++++++-----------
 .../main/res/layout/controller_call_menu.xml  | 13 ++-
 .../layout/controller_call_notification.xml   | 31 +++---
 app/src/main/res/layout/controller_chat.xml   | 35 ++++---
 .../layout/controller_conversations_rv.xml    | 26 ++---
 .../main/res/layout/controller_entry_menu.xml | 23 +++--
 .../main/res/layout/controller_generic_rv.xml | 17 ++--
 .../res/layout/controller_operations_menu.xml | 35 ++++---
 .../layout/controller_server_selection.xml    | 33 +++----
 .../main/res/layout/controller_settings.xml   | 59 +++++------
 .../res/layout/controller_web_view_login.xml  | 19 ++--
 app/src/main/res/layout/fast_scroller.xml     | 34 +++----
 .../item_custom_incoming_preview_message.xml  |  4 +-
 .../item_custom_incoming_text_message.xml     | 18 ++--
 .../item_custom_outcoming_preview_message.xml |  2 +-
 .../item_custom_outcoming_text_message.xml    | 16 ++-
 .../main/res/layout/item_system_message.xml   | 19 ++--
 .../layout/library_fast_scroller_layout.xml   | 12 +--
 .../res/layout/notification_settings_item.xml |  5 +-
 app/src/main/res/layout/rv_item_app.xml       | 21 ++--
 .../main/res/layout/rv_item_call_header.xml   | 25 +++--
 app/src/main/res/layout/rv_item_contact.xml   | 19 ++--
 .../main/res/layout/rv_item_conversation.xml  | 30 +++---
 ...rv_item_conversation_with_last_message.xml | 33 +++----
 .../main/res/layout/rv_item_empty_footer.xml  |  9 +-
 app/src/main/res/layout/rv_item_mention.xml   | 21 ++--
 app/src/main/res/layout/rv_item_menu.xml      | 13 ++-
 .../res/layout/rv_item_notification_sound.xml | 18 ++--
 app/src/main/res/layout/rv_item_progress.xml  | 10 +-
 .../main/res/layout/rv_item_title_header.xml  | 19 ++--
 .../main/res/layout/view_message_input.xml    | 15 ++-
 37 files changed, 460 insertions(+), 444 deletions(-)
 create mode 100644 app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java

diff --git a/app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java b/app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java
new file mode 100644
index 000000000..77841302c
--- /dev/null
+++ b/app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.nextcloud.talk.utils;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
+import java.util.List;
+
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+
+public class FABAwareScrollingViewBehavior extends AppBarLayout.ScrollingViewBehavior {
+
+    public FABAwareScrollingViewBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
+        return super.layoutDependsOn(parent, child, dependency) ||
+                dependency instanceof FloatingActionButton;
+    }
+
+    @Override
+    public boolean onStartNestedScroll(final CoordinatorLayout coordinatorLayout, final View child,
+                                       final View directTargetChild, final View target, final int nestedScrollAxes) {
+        // Ensure we react to vertical scrolling
+        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL
+                || super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
+    }
+
+    @Override
+    public void onNestedScroll(final CoordinatorLayout coordinatorLayout, final View child,
+                               final View target, final int dxConsumed, final int dyConsumed,
+                               final int dxUnconsumed, final int dyUnconsumed) {
+        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
+        if (dyConsumed > 0) {
+            // User scrolled down -> hide the FAB
+            List<View> dependencies = coordinatorLayout.getDependencies(child);
+            for (View view : dependencies) {
+                if (view instanceof FloatingActionButton) {
+                    ((FloatingActionButton) view).hide();
+                }
+            }
+        } else if (dyConsumed < 0) {
+            // User scrolled up -> show the FAB
+            List<View> dependencies = coordinatorLayout.getDependencies(child);
+            for (View view : dependencies) {
+                if (view instanceof FloatingActionButton) {
+                    ((FloatingActionButton) view).show();
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_magic_call.xml b/app/src/main/res/layout/activity_magic_call.xml
index 672b8f9bd..342382ce4 100644
--- a/app/src/main/res/layout/activity_magic_call.xml
+++ b/app/src/main/res/layout/activity_magic_call.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,15 +19,15 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fitsSystemWindows="true"
-                tools:context=".activities.MagicCallActivity">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".activities.MagicCallActivity">
 
     <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
         android:id="@+id/controller_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3c42f40e0..ed8229431 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,8 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            />
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -25,7 +23,6 @@
         android:id="@+id/controller_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        />
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/bottom_sheet.xml b/app/src/main/res/layout/bottom_sheet.xml
index cb18a8c4d..33ad49ee0 100644
--- a/app/src/main/res/layout/bottom_sheet.xml
+++ b/app/src/main/res/layout/bottom_sheet.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,12 +19,12 @@
   -->
 
 <com.bluelinelabs.conductor.ChangeHandlerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                     android:id="@+id/bottom_sheet"
-                                                     android:layout_width="match_parent"
-                                                     android:layout_height="wrap_content"
-                                                     android:background="@color/white"
-                                                     app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/bottom_sheet"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 
 </com.bluelinelabs.conductor.ChangeHandlerFrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/call_item.xml b/app/src/main/res/layout/call_item.xml
index 4971a365a..641e484ad 100644
--- a/app/src/main/res/layout/call_item.xml
+++ b/app/src/main/res/layout/call_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,23 +19,23 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/relative_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:orientation="vertical">
+    android:id="@+id/relative_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_weight="1"
+    android:orientation="vertical">
 
     <org.webrtc.SurfaceViewRenderer
         android:id="@+id/surface_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="invisible"/>
+        android:visibility="invisible" />
 
     <ImageView
         android:id="@+id/avatarImageView"
         android:layout_width="80dp"
         android:layout_height="80dp"
-        android:layout_centerInParent="true"/>
+        android:layout_centerInParent="true" />
 
     <TextView
         android:id="@+id/peer_nick_text_view"
@@ -44,21 +43,21 @@
         android:layout_height="wrap_content"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginStart="8dp"
-        android:textColor="@android:color/white"/>
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:textColor="@android:color/white" />
 
     <ImageView
         android:id="@+id/remote_audio_off"
         android:layout_width="16dp"
         android:layout_height="16dp"
-        android:layout_alignParentStart="true"
         android:layout_below="@id/peer_nick_text_view"
-        android:layout_marginEnd="8dp"
+        android:layout_alignParentStart="true"
         android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
         android:src="@drawable/ic_mic_off_white_24px"
-        android:visibility="invisible"/>
+        android:visibility="invisible" />
 
     <ImageView
         android:id="@+id/remote_video_off"
@@ -68,6 +67,6 @@
         android:layout_marginStart="8dp"
         android:layout_toEndOf="@id/remote_audio_off"
         android:src="@drawable/ic_videocam_off_white_24px"
-        android:visibility="invisible"/>
+        android:visibility="invisible" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_account_verification.xml b/app/src/main/res/layout/controller_account_verification.xml
index 1ca51b0c9..5f633684d 100644
--- a/app/src/main/res/layout/controller_account_verification.xml
+++ b/app/src/main/res/layout/controller_account_verification.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,25 +19,25 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/nc_white_color"
-                android:keepScreenOn="true">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/nc_white_color"
+    android:keepScreenOn="true">
 
     <ProgressBar
         android:id="@+id/progress_bar"
         android:layout_width="@dimen/item_height"
         android:layout_height="@dimen/item_height"
         android:layout_centerInParent="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
         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"
-        android:keepScreenOn="true"/>
+        android:keepScreenOn="true" />
 
     <TextView
         android:id="@+id/progress_text"
@@ -47,13 +46,13 @@
         android:layout_below="@+id/progress_bar"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginTop="@dimen/padding_between_elements"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:textAlignment="center"
         android:textSize="18sp"
-        tools:text="Verifying..."/>
+        tools:text="Verifying..." />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_call.xml b/app/src/main/res/layout/controller_call.xml
index 31d84100a..850178d52 100644
--- a/app/src/main/res/layout/controller_call.xml
+++ b/app/src/main/res/layout/controller_call.xml
@@ -100,75 +100,63 @@
         </FrameLayout>
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/callControlsRelativeLayout"
+    <LinearLayout
+        android:id="@+id/callControlsLinearLayoutView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"
-        android:animateLayoutChanges="true">
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="16dp"
+        android:animateLayoutChanges="true"
+        android:background="@android:color/transparent"
+        android:gravity="center">
+
+        <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/call_control_microphone"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_margin="24dp"
+            android:alpha="0.7"
+            app:checked="false"
+            app:enableInitialAnimation="false"
+            app:frontBackgroundColor="@color/colorPrimary"
+            app:frontImage="@drawable/ic_mic_off_white_24px" />
 
         <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/callControlHangupView"
             android:layout_width="60dp"
             android:layout_height="60dp"
-            android:layout_above="@id/callControlsLinearLayoutView"
-            android:layout_centerHorizontal="true"
+            android:layout_margin="24dp"
             app:checked="false"
             app:enableInitialAnimation="false"
             app:frontBackgroundColor="@color/nc_darkRed"
             app:frontImage="@drawable/ic_call_end_white_24px" />
 
-        <LinearLayout
-            android:id="@+id/callControlsLinearLayoutView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="24dp"
-            android:animateLayoutChanges="true"
-            android:background="@android:color/transparent"
-            android:gravity="center">
+        <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/call_control_camera"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_margin="24dp"
+            android:alpha="0.7"
+            app:checked="false"
+            app:enableInitialAnimation="false"
+            app:frontBackgroundColor="@color/colorPrimary"
+            app:frontImage="@drawable/ic_videocam_off_white_24px" />
 
-            <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/call_control_microphone"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_marginStart="24dp"
-                android:alpha="0.7"
-                app:checked="false"
-                app:enableInitialAnimation="false"
-                app:frontBackgroundColor="@color/colorPrimary"
-                app:frontImage="@drawable/ic_mic_off_white_24px" />
+        <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/callControlEnableSpeaker"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_margin="24dp"
+            android:visibility="gone"
+            app:animateRearImage="false"
+            app:checked="false"
+            app:enableInitialAnimation="false"
+            app:frontBackgroundColor="@color/colorPrimary"
+            app:frontImage="@drawable/ic_volume_up_white_24dp"
+            app:rearBackgroundColor="@color/colorPrimaryDark"
+            app:rearImage="@drawable/ic_volume_up_white_24dp" />
 
-            <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/call_control_camera"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_marginStart="24dp"
-                android:layout_marginEnd="24dp"
-                android:alpha="0.7"
-                app:checked="false"
-                app:enableInitialAnimation="false"
-                app:frontBackgroundColor="@color/colorPrimary"
-                app:frontImage="@drawable/ic_videocam_off_white_24px" />
+    </LinearLayout>
 
-            <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:id="@+id/callControlEnableSpeaker"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
-                android:layout_marginStart="24dp"
-                android:layout_marginEnd="24dp"
-                android:visibility="gone"
-                app:animateRearImage="false"
-                app:checked="false"
-                app:enableInitialAnimation="false"
-                app:frontBackgroundColor="@color/colorPrimary"
-                app:frontImage="@drawable/ic_volume_up_white_24dp"
-                app:rearBackgroundColor="@color/colorPrimaryDark"
-                app:rearImage="@drawable/ic_volume_up_white_24dp" />
-
-        </LinearLayout>
-    </RelativeLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_call_menu.xml b/app/src/main/res/layout/controller_call_menu.xml
index 13a77f5a5..21c711e62 100644
--- a/app/src/main/res/layout/controller_call_menu.xml
+++ b/app/src/main/res/layout/controller_call_menu.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,16 +19,16 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/nc_white_color">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/nc_white_color">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:listitem="@layout/rv_item_conversation"/>
+        tools:listitem="@layout/rv_item_conversation" />
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml
index 8c52e0f41..53445c468 100644
--- a/app/src/main/res/layout/controller_call_notification.xml
+++ b/app/src/main/res/layout/controller_call_notification.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -19,17 +18,17 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             xmlns:app="http://schemas.android.com/apk/res-auto"
-                                             xmlns:tools="http://schemas.android.com/tools"
-                                             android:id="@+id/constraintLayout"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent"
-                                             android:background="@color/grey950">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/grey950">
 
     <RelativeLayout
+        android:id="@+id/incomingTextRelativeLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/incomingTextRelativeLayout">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/incomingCallTextView"
@@ -42,7 +41,7 @@
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/conversationNameTextView"
@@ -54,7 +53,7 @@
             android:textAlignment="center"
             android:textColor="@color/white"
             android:textSize="28sp"
-            tools:text="Victor Gregorius Magnus"/>
+            tools:text="Victor Gregorius Magnus" />
 
     </RelativeLayout>
 
@@ -67,7 +66,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.45"
-        tools:src="@color/white"/>
+        tools:src="@color/white" />
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -86,7 +85,7 @@
             app:checked="false"
             app:enableInitialAnimation="false"
             app:frontBackgroundColor="@color/colorPrimary"
-            app:frontImage="@drawable/ic_mic_white_24px"/>
+            app:frontImage="@drawable/ic_mic_white_24px" />
 
         <com.nextcloud.talk.utils.MagicFlipView
             android:id="@+id/callControlHangupView"
@@ -96,7 +95,7 @@
             app:checked="false"
             app:enableInitialAnimation="false"
             app:frontBackgroundColor="@color/nc_darkRed"
-            app:frontImage="@drawable/ic_call_end_white_24px"/>
+            app:frontImage="@drawable/ic_call_end_white_24px" />
 
         <com.nextcloud.talk.utils.MagicFlipView
             android:id="@+id/callAnswerCameraView"
@@ -107,7 +106,7 @@
             app:checked="false"
             app:enableInitialAnimation="false"
             app:frontBackgroundColor="@color/colorPrimary"
-            app:frontImage="@drawable/ic_videocam_white_24px"/>
+            app:frontImage="@drawable/ic_videocam_white_24px" />
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml
index da848fde5..9f2263dfb 100644
--- a/app/src/main/res/layout/controller_chat.xml
+++ b/app/src/main/res/layout/controller_chat.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,23 +19,23 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <ProgressBar
         android:id="@+id/progressBar"
         android:layout_width="@dimen/item_height"
         android:layout_height="@dimen/item_height"
         android:layout_centerInParent="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
         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"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <RelativeLayout
         android:id="@+id/emptyLayout"
@@ -51,7 +50,7 @@
             android:layout_centerInParent="true"
             android:text="👋"
             android:textAlignment="center"
-            android:textSize="72sp"/>
+            android:textSize="72sp" />
 
         <TextView
             android:id="@+id/sendHiTextView"
@@ -60,7 +59,7 @@
             android:layout_below="@+id/wawingTextView"
             android:layout_margin="8dp"
             android:textAlignment="center"
-            android:textSize="20sp"/>
+            android:textSize="20sp" />
     </RelativeLayout>
 
     <com.stfalcon.chatkit.messages.MessagesList
@@ -77,6 +76,7 @@
         app:incomingDefaultBubbleColor="@color/white_two"
         app:incomingDefaultBubblePressedColor="@color/white_two"
         app:incomingDefaultBubbleSelectedColor="@color/transparent"
+        app:incomingImageTimeTextSize="12sp"
         app:incomingTextColor="@color/nc_incoming_text_default"
         app:incomingTextLinkColor="@color/nc_incoming_text_default"
         app:incomingTextSize="@dimen/chat_text_size"
@@ -88,13 +88,12 @@
         app:outcomingDefaultBubbleColor="@color/colorPrimary"
         app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
         app:outcomingDefaultBubbleSelectedColor="@color/transparent"
+        app:outcomingImageTimeTextSize="12sp"
         app:outcomingTextColor="@color/nc_outcoming_text_default"
         app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
         app:outcomingTextSize="@dimen/chat_text_size"
         app:outcomingTimeTextSize="12sp"
-        app:outcomingImageTimeTextSize="12sp"
-        app:incomingImageTimeTextSize="12sp"
-        app:textAutoLink="all"/>
+        app:textAutoLink="all" />
 
     <com.webianks.library.PopupBubble
         android:id="@+id/popupBubbleView"
@@ -107,7 +106,7 @@
         app:pb_backgroundColor="@color/colorPrimary"
         app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
         app:pb_text="@string/nc_new_messages"
-        app:pb_textColor="@color/white"/>
+        app:pb_textColor="@color/white" />
 
     <View
         android:id="@+id/separator"
@@ -116,15 +115,15 @@
         android:layout_above="@+id/messageInputView"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:background="@color/nc_light_grey"/>
+        android:background="@color/nc_light_grey" />
 
     <com.stfalcon.chatkit.messages.MessageInput
         android:id="@+id/messageInputView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:maxLength="1000"
         android:inputType="textLongMessage|textAutoComplete"
+        android:maxLength="1000"
         app:inputButtonDefaultBgColor="@color/colorPrimary"
         app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
         app:inputButtonHeight="30dp"
@@ -132,6 +131,6 @@
         app:inputButtonWidth="30dp"
         app:inputHint="@string/nc_hint_enter_a_message"
         app:inputTextColor="@color/black"
-        app:inputTextSize="16sp"/>
+        app:inputTextSize="16sp" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml
index 6e6f58a69..2079b5d1c 100644
--- a/app/src/main/res/layout/controller_conversations_rv.xml
+++ b/app/src/main/res/layout/controller_conversations_rv.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,8 +19,8 @@
   -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/generic_rv_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -32,13 +31,13 @@
         android:layout_width="@dimen/item_height"
         android:layout_height="@dimen/item_height"
         android:layout_gravity="center"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
         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"/>
+        android:indeterminateTintMode="src_in" />
 
     <RelativeLayout
         android:id="@+id/emptyLayout"
@@ -51,7 +50,7 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_centerInParent="true"
-            android:background="@drawable/ic_logo_blue"/>
+            android:background="@drawable/ic_logo_blue" />
 
         <TextView
             android:id="@+id/sendHiTextView"
@@ -61,14 +60,15 @@
             android:layout_margin="8dp"
             android:text="@string/nc_conversations_empty"
             android:textAlignment="center"
-            android:textSize="20sp"/>
+            android:textSize="20sp" />
     </RelativeLayout>
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeRefreshLayoutView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone">
+        android:visibility="gone"
+        app:layout_behavior="com.nextcloud.talk.utils.FABAwareScrollingViewBehavior">
 
         <FrameLayout
             android:layout_width="match_parent"
@@ -78,13 +78,13 @@
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:listitem="@layout/rv_item_conversation"/>
+                tools:listitem="@layout/rv_item_conversation" />
 
         </FrameLayout>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <include layout="@layout/fast_scroller"/>
+    <include layout="@layout/fast_scroller" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/floatingActionButton"
@@ -92,6 +92,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_add_white_24px"/>
+        app:srcCompat="@drawable/ic_add_white_24px" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/controller_entry_menu.xml b/app/src/main/res/layout/controller_entry_menu.xml
index 2e3d198f9..cc3189f56 100644
--- a/app/src/main/res/layout/controller_entry_menu.xml
+++ b/app/src/main/res/layout/controller_entry_menu.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,17 +19,17 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/nc_white_color">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/nc_white_color">
 
     <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
         android:id="@+id/text_field_boxes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         app:errorColor="@color/nc_darkRed"
         app:helperText=" "
         app:panelBackgroundColor="@color/nc_white_color"
@@ -43,7 +42,7 @@
             android:imeOptions="actionDone"
             android:inputType="textUri"
             android:singleLine="true"
-            android:textColor="@color/colorPrimary"/>
+            android:textColor="@color/colorPrimary" />
 
     </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
@@ -51,15 +50,15 @@
         android:id="@+id/ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
         android:layout_below="@id/text_field_boxes"
-        android:layout_marginBottom="12dp"
-        android:layout_marginEnd="8dp"
+        android:layout_alignParentEnd="true"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp"
         android:alpha="0.7"
         android:background="#0000"
         android:enabled="false"
         android:text="@string/nc_proceed"
-        android:textColor="@color/colorPrimary"/>
+        android:textColor="@color/colorPrimary" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/controller_generic_rv.xml b/app/src/main/res/layout/controller_generic_rv.xml
index a364253cd..4d18cc970 100644
--- a/app/src/main/res/layout/controller_generic_rv.xml
+++ b/app/src/main/res/layout/controller_generic_rv.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,11 +19,11 @@
   -->
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                 xmlns:tools="http://schemas.android.com/tools"
-                                                 android:id="@+id/generic_rv_layout"
-                                                 android:layout_width="match_parent"
-                                                 android:layout_height="match_parent"
-                                                 android:background="@color/nc_white_color">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/generic_rv_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/nc_white_color">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
@@ -39,11 +38,11 @@
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                tools:listitem="@layout/rv_item_conversation"/>
+                tools:listitem="@layout/rv_item_conversation" />
 
         </FrameLayout>
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-    <include layout="@layout/fast_scroller"/>
+    <include layout="@layout/fast_scroller" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/controller_operations_menu.xml b/app/src/main/res/layout/controller_operations_menu.xml
index d3a963113..7ba701e1f 100644
--- a/app/src/main/res/layout/controller_operations_menu.xml
+++ b/app/src/main/res/layout/controller_operations_menu.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,33 +19,33 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/nc_white_color">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/nc_white_color">
 
     <ProgressBar
         android:id="@+id/progress_bar"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_centerInParent="true"
-        android:layout_marginBottom="24dp"
         android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
         android:indeterminate="true"
         android:indeterminateTint="@color/colorPrimary"
         android:indeterminateTintMode="src_in"
-        android:keepScreenOn="true"/>
+        android:keepScreenOn="true" />
 
     <ImageView
         android:id="@+id/result_image_view"
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="8dp"
         android:tintMode="src_in"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <TextView
         android:id="@+id/result_text_view"
@@ -54,38 +53,38 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/result_image_view"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="12dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="12dp"
         android:maxLines="3"
         android:textAlignment="center"
         android:textColor="@color/colorPrimary"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
         android:layout_below="@id/result_text_view"
-        android:layout_marginBottom="12dp"
+        android:layout_alignParentEnd="true"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp"
         android:background="#0000"
         android:text="@string/nc_ok"
         android:textColor="@color/colorPrimary"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/web_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/result_text_view"
-        android:layout_marginBottom="12dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="12dp"
         android:layout_toStartOf="@id/ok_button"
         android:background="#0000"
         android:text="@string/nc_join_via_web"
         android:textColor="@color/nc_darkGreen"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml
index b3ee60b8f..5e7b54fcd 100644
--- a/app/src/main/res/layout/controller_server_selection.xml
+++ b/app/src/main/res/layout/controller_server_selection.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,29 +19,29 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/colorPrimary"
-                android:fitsSystemWindows="true">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
+    android:fitsSystemWindows="true">
 
     <ImageView
         android:id="@+id/image_logo"
         android:layout_width="96dp"
         android:layout_height="96dp"
         android:layout_centerHorizontal="true"
-        android:layout_marginBottom="36dp"
         android:layout_marginTop="92dp"
+        android:layout_marginBottom="36dp"
         android:scaleType="fitXY"
-        app:srcCompat="@drawable/ic_logo"/>
+        app:srcCompat="@drawable/ic_logo" />
 
     <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
         android:id="@+id/text_field_boxes"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/image_logo"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         app:errorColor="@android:color/white"
         app:helperText=" "
         app:labelText="@string/nc_server_url"
@@ -56,7 +55,7 @@
             android:imeOptions="actionDone"
             android:inputType="textUri"
             android:singleLine="true"
-            android:textColor="@android:color/white"/>
+            android:textColor="@android:color/white" />
 
     </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
 
@@ -66,14 +65,14 @@
         android:layout_height="@dimen/small_item_height"
         android:layout_below="@id/text_field_boxes"
         android:layout_centerHorizontal="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginTop="24dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:indeterminate="true"
         android:indeterminateTint="@android:color/white"
         android:indeterminateTintMode="src_in"
         android:keepScreenOn="true"
-        android:visibility="invisible"/>
+        android:visibility="invisible" />
 
     <TextView
         android:id="@+id/helper_text_view"
@@ -81,14 +80,14 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/progress_bar"
         android:layout_centerHorizontal="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginTop="56dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:lines="2"
         android:text="@string/nc_get_from_provider"
         android:textAlignment="center"
         android:textAllCaps="true"
-        android:textColor="@color/nc_light_blue_color"/>
+        android:textColor="@color/nc_light_blue_color" />
 
     <TextView
         android:id="@+id/cert_text_view"
@@ -96,13 +95,13 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/helper_text_view"
         android:layout_centerHorizontal="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:lines="2"
         android:text="@string/nc_configure_cert_auth"
         android:textAlignment="center"
         android:textAllCaps="true"
-        android:textColor="@color/nc_light_blue_color"/>
+        android:textColor="@color/nc_light_blue_color" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/controller_settings.xml b/app/src/main/res/layout/controller_settings.xml
index 641e5512e..3875b355f 100644
--- a/app/src/main/res/layout/controller_settings.xml
+++ b/app/src/main/res/layout/controller_settings.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,10 +19,10 @@
   -->
 
 <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-                                              xmlns:apc="http://schemas.android.com/apk/res-auto"
-                                              android:id="@+id/settings_screen"
-                                              android:layout_width="match_parent"
-                                              android:layout_height="match_parent">
+    xmlns:apc="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/settings_screen"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <com.yarolegovich.mp.MaterialPreferenceCategory
         android:id="@+id/message_view"
@@ -35,7 +34,7 @@
             android:id="@+id/message_text"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center"/>
+            android:gravity="center" />
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 
     <com.yarolegovich.mp.MaterialPreferenceCategory
@@ -51,7 +50,7 @@
                 android:id="@+id/avatar_image"
                 android:layout_width="@dimen/avatar_size_big"
                 android:layout_height="@dimen/avatar_size_big"
-                android:layout_centerHorizontal="true"/>
+                android:layout_centerHorizontal="true" />
 
             <TextView
                 android:id="@+id/display_name_text"
@@ -59,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/avatar_image"
                 android:layout_centerHorizontal="true"
-                android:layout_marginTop="@dimen/margin_between_elements"/>
+                android:layout_marginTop="@dimen/margin_between_elements" />
 
             <TextView
                 android:id="@+id/base_url_text"
@@ -67,7 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/display_name_text"
                 android:layout_centerHorizontal="true"
-                android:layout_margin="4dp"/>
+                android:layout_margin="4dp" />
 
 
             <com.yarolegovich.mp.MaterialStandardPreference
@@ -76,35 +75,35 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/base_url_text"
                 android:tag="switchAccountButton"
-                apc:mp_title="@string/nc_settings_switch_account"/>
+                apc:mp_title="@string/nc_settings_switch_account" />
 
             <com.yarolegovich.mp.MaterialStandardPreference
                 android:id="@+id/settings_reauthorize"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/settings_switch"
-                apc:mp_title="@string/nc_settings_reauthorize"/>
+                apc:mp_title="@string/nc_settings_reauthorize" />
 
             <com.yarolegovich.mp.MaterialStandardPreference
                 android:id="@+id/settings_client_cert"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/settings_reauthorize"
-                apc:mp_title="@string/nc_client_cert_setup"/>
+                apc:mp_title="@string/nc_client_cert_setup" />
 
             <com.yarolegovich.mp.MaterialStandardPreference
                 android:id="@+id/settings_remove_account"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/settings_client_cert"
-                apc:mp_title="@string/nc_settings_remove_account"/>
+                apc:mp_title="@string/nc_settings_remove_account" />
 
             <com.yarolegovich.mp.MaterialStandardPreference
                 android:id="@+id/settings_add_account"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/settings_remove_account"
-                apc:mp_title="@string/nc_settings_add_account"/>
+                apc:mp_title="@string/nc_settings_add_account" />
 
         </RelativeLayout>
 
@@ -122,23 +121,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_call_ringtone_key"
-            apc:mp_title="@string/nc_settings_call_ringtone"/>
+            apc:mp_title="@string/nc_settings_call_ringtone" />
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_message_sound"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_message_ringtone_key"
-            apc:mp_title="@string/nc_settings_other_notifications_ringtone"/>
+            apc:mp_title="@string/nc_settings_other_notifications_ringtone" />
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/settings_always_vibrate"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            apc:mp_default_value="true"
             apc:mp_key="@string/nc_settings_vibrate_key"
-            apc:mp_title="@string/nc_settings_vibrate"
             apc:mp_summary="@string/nc_settings_vibrate_desc"
-            apc:mp_default_value="true"/>
+            apc:mp_title="@string/nc_settings_vibrate" />
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 
@@ -158,8 +157,7 @@
             apc:mp_entry_descriptions="@array/proxy_type_descriptions"
             apc:mp_key="@string/nc_settings_proxy_type_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_settings_proxy_type_title">
-        </com.yarolegovich.mp.MaterialChoicePreference>
+            apc:mp_title="@string/nc_settings_proxy_type_title"></com.yarolegovich.mp.MaterialChoicePreference>
 
         <com.yarolegovich.mp.MaterialEditTextPreference
             android:id="@+id/settings_proxy_host_edit"
@@ -167,7 +165,7 @@
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_proxy_host_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_settings_proxy_host_title"/>
+            apc:mp_title="@string/nc_settings_proxy_host_title" />
 
         <com.yarolegovich.mp.MaterialEditTextPreference
             android:id="@+id/settings_proxy_port_edit"
@@ -175,7 +173,7 @@
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_proxy_port_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_settings_proxy_port_title"/>
+            apc:mp_title="@string/nc_settings_proxy_port_title" />
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/settings_proxy_use_credentials"
@@ -194,7 +192,7 @@
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_proxy_username_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_username"/>
+            apc:mp_title="@string/nc_username" />
 
         <com.yarolegovich.mp.MaterialEditTextPreference
             android:id="@+id/settings_proxy_password_edit"
@@ -202,7 +200,7 @@
             android:layout_height="wrap_content"
             apc:mp_key="@string/nc_settings_proxy_password_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_password"/>
+            apc:mp_title="@string/nc_password" />
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 
@@ -217,30 +215,27 @@
             android:id="@+id/settings_privacy"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            apc:mp_title="@string/nc_privacy"/>
+            apc:mp_title="@string/nc_privacy" />
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_source_code"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            apc:mp_title="@string/nc_get_source_code">
-        </com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_get_source_code"></com.yarolegovich.mp.MaterialStandardPreference>
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_licence"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_summary="@string/nc_license_summary"
-            apc:mp_title="@string/nc_license_title">
-        </com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_license_title"></com.yarolegovich.mp.MaterialStandardPreference>
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_summary="v0.1"
-            apc:mp_title="@string/nc_app_name">
-        </com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_app_name"></com.yarolegovich.mp.MaterialStandardPreference>
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 
diff --git a/app/src/main/res/layout/controller_web_view_login.xml b/app/src/main/res/layout/controller_web_view_login.xml
index 3d672a60c..9f6fb6255 100644
--- a/app/src/main/res/layout/controller_web_view_login.xml
+++ b/app/src/main/res/layout/controller_web_view_login.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,23 +19,23 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:keepScreenOn="true"
-                android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:keepScreenOn="true"
+    android:orientation="vertical">
 
     <ProgressBar
         android:id="@+id/progress_bar"
         android:layout_width="@dimen/item_height"
         android:layout_height="@dimen/item_height"
         android:layout_centerInParent="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
         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"/>
+        android:indeterminateTintMode="src_in" />
 
     <WebView
         android:id="@+id/webview"
diff --git a/app/src/main/res/layout/fast_scroller.xml b/app/src/main/res/layout/fast_scroller.xml
index 4ed7dd8bb..4a3246d44 100644
--- a/app/src/main/res/layout/fast_scroller.xml
+++ b/app/src/main/res/layout/fast_scroller.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,19 +19,18 @@
   -->
 
 <eu.davidea.fastscroller.FastScroller xmlns:android="http://schemas.android.com/apk/res/android"
-                                      xmlns:app="http://schemas.android.com/apk/res-auto"
-                                      xmlns:tools="http://schemas.android.com/tools"
-                                      android:id="@+id/fast_scroller"
-                                      android:layout_width="wrap_content"
-                                      android:layout_height="match_parent"
-                                      android:layout_alignBottom="@+id/swipe_refresh_layout"
-                                      android:layout_alignParentEnd="true"
-                                      android:layout_alignTop="@+id/swipe_refresh_layout"
-                                      android:layout_centerHorizontal="true"
-                                      app:fastScrollerAutoHideDelayInMillis="1000"
-                                      app:fastScrollerAutoHideEnabled="true"
-                                      app:fastScrollerBubbleEnabled="true"
-                                      app:fastScrollerBubblePosition="adjacent"
-                                      app:fastScrollerIgnoreTouchesOutsideHandle="false"
-                                      tools:visibility="visible">
-</eu.davidea.fastscroller.FastScroller>
\ No newline at end of file
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/fast_scroller"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_alignTop="@+id/swipe_refresh_layout"
+    android:layout_alignBottom="@+id/swipe_refresh_layout"
+    android:layout_alignParentEnd="true"
+    android:layout_centerHorizontal="true"
+    app:fastScrollerAutoHideDelayInMillis="1000"
+    app:fastScrollerAutoHideEnabled="true"
+    app:fastScrollerBubbleEnabled="true"
+    app:fastScrollerBubblePosition="adjacent"
+    app:fastScrollerIgnoreTouchesOutsideHandle="false"
+    tools:visibility="visible"></eu.davidea.fastscroller.FastScroller>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_custom_incoming_preview_message.xml b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
index 1c5261ce2..56ae9fd27 100644
--- a/app/src/main/res/layout/item_custom_incoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_preview_message.xml
@@ -22,8 +22,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
     android:layout_marginTop="2dp"
+    android:layout_marginEnd="16dp"
     android:layout_marginBottom="2dp">
 
     <com.stfalcon.chatkit.utils.ShapeImageView
@@ -71,7 +71,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/messageText"
-                android:layout_alignParentEnd="true"/>
+                android:layout_alignParentEnd="true" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml
index 7f1a0212e..1cb56d31c 100644
--- a/app/src/main/res/layout/item_custom_incoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -19,22 +18,21 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="2dp"
     android:layout_marginLeft="16dp"
+    android:layout_marginTop="2dp"
     android:layout_marginRight="16dp"
-    android:layout_marginTop="2dp">
+    android:layout_marginBottom="2dp">
 
     <com.stfalcon.chatkit.utils.ShapeImageView
         android:id="@id/messageUserAvatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_alignParentTop="true"
-        android:layout_marginEnd="8dp"/>
+        android:layout_marginEnd="8dp" />
 
     <com.google.android.flexbox.FlexboxLayout
         android:id="@id/bubble"
@@ -53,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/colorPrimary"
-            android:textSize="12sp"/>
+            android:textSize="12sp" />
 
         <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
             android:id="@id/messageText"
@@ -62,7 +60,7 @@
             android:textIsSelectable="true"
             app:layout_alignSelf="flex_start"
             app:layout_flexGrow="1"
-            app:layout_wrapBefore="true"/>
+            app:layout_wrapBefore="true" />
 
 
         <TextView
@@ -71,7 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
-            app:layout_alignSelf="center"/>
+            app:layout_alignSelf="center" />
 
     </com.google.android.flexbox.FlexboxLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
index 84b0d28f2..19bb330af 100644
--- a/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_preview_message.xml
@@ -65,7 +65,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/messageText"
                 android:layout_alignParentEnd="true"
-                android:textColor="@color/white60"/>
+                android:textColor="@color/white60" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
index 14d30c046..40b41c5f3 100644
--- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml
+++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -19,15 +18,14 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="2dp"
     android:layout_marginLeft="16dp"
+    android:layout_marginTop="2dp"
     android:layout_marginRight="16dp"
-    android:layout_marginTop="2dp">
+    android:layout_marginBottom="2dp">
 
     <com.google.android.flexbox.FlexboxLayout
         android:id="@id/bubble"
@@ -44,10 +42,10 @@
             android:id="@id/messageText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textIsSelectable="true"
+            android:layout_alignWithParentIfMissing="true"
             android:textColorHighlight="@color/nc_grey"
 
-            android:layout_alignWithParentIfMissing="true"/>
+            android:textIsSelectable="true" />
 
         <TextView
             android:id="@id/messageTime"
@@ -55,7 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/messageText"
             android:layout_marginStart="8dp"
-            app:layout_alignSelf="center"/>
+            app:layout_alignSelf="center" />
 
     </com.google.android.flexbox.FlexboxLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_system_message.xml b/app/src/main/res/layout/item_system_message.xml
index 899b91f24..26c5ef568 100644
--- a/app/src/main/res/layout/item_system_message.xml
+++ b/app/src/main/res/layout/item_system_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,17 +19,17 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="8dp">
 
     <RelativeLayout
+        android:id="@id/bubble"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@id/bubble"
         android:layout_centerHorizontal="true">
 
         <TextView
@@ -41,7 +40,7 @@
             android:gravity="center_horizontal"
             android:textAlignment="center"
             android:textColor="@color/colorPrimary"
-            android:textSize="12sp"/>
+            android:textSize="12sp" />
 
     </RelativeLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/library_fast_scroller_layout.xml b/app/src/main/res/layout/library_fast_scroller_layout.xml
index c4df6bede..452cb0d8a 100644
--- a/app/src/main/res/layout/library_fast_scroller_layout.xml
+++ b/app/src/main/res/layout/library_fast_scroller_layout.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:tools="http://schemas.android.com/tools"
-       android:layout_width="wrap_content"
-       android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
 
     <View
         android:id="@+id/fast_scroller_bar"
         android:layout_width="7dp"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:background="@color/transparent"/>
+        android:background="@color/transparent" />
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
             android:textSize="38sp"
             android:visibility="gone"
             tools:text="A"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <ImageView
             android:id="@+id/fast_scroller_handle"
@@ -40,7 +40,7 @@
             android:alpha="0.5"
             android:contentDescription="@null"
             android:paddingStart="6dp"
-            android:src="@drawable/fast_scroller_handle"/>
+            android:src="@drawable/fast_scroller_handle" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/notification_settings_item.xml b/app/src/main/res/layout/notification_settings_item.xml
index fb74b9936..057adf97b 100644
--- a/app/src/main/res/layout/notification_settings_item.xml
+++ b/app/src/main/res/layout/notification_settings_item.xml
@@ -40,15 +40,14 @@
             apc:mp_entry_values="@array/message_notification_levels_entry_values"
             apc:mp_key="message_notification_level"
             apc:mp_show_value="onBottom"
-            apc:mp_title="@string/nc_plain_old_messages">
-        </com.yarolegovich.mp.MaterialChoicePreference>
+            apc:mp_title="@string/nc_plain_old_messages"></com.yarolegovich.mp.MaterialChoicePreference>
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/conversation_info_mute_calls"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            apc:mp_key="mute_calls"
             apc:mp_default_value="false"
+            apc:mp_key="mute_calls"
             apc:mp_summary="@string/nc_mute_calls_description"
             apc:mp_title="@string/nc_mute_calls" />
 
diff --git a/app/src/main/res/layout/rv_item_app.xml b/app/src/main/res/layout/rv_item_app.xml
index e290a1037..ef72a3e7c 100644
--- a/app/src/main/res/layout/rv_item_app.xml
+++ b/app/src/main/res/layout/rv_item_app.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,12 +19,12 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:paddingBottom="16dp"
-                android:paddingTop="16dp">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
     <ImageView
         android:id="@+id/icon_image_view"
@@ -35,20 +34,20 @@
         android:layout_marginStart="16dp"
         android:focusable="false"
         android:focusableInTouchMode="false"
-        tools:src="@drawable/ic_add_grey600_24px"/>
+        tools:src="@drawable/ic_add_grey600_24px" />
 
     <TextView
         android:id="@+id/app_title_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:layout_toEndOf="@id/icon_image_view"
         android:focusable="false"
         android:focusableInTouchMode="false"
         android:textColor="@color/black"
         android:textSize="16sp"
-        tools:text="Start a new conversation"/>
+        tools:text="Start a new conversation" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_call_header.xml b/app/src/main/res/layout/rv_item_call_header.xml
index 6fbdbae4c..6f3edb4e0 100644
--- a/app/src/main/res/layout/rv_item_call_header.xml
+++ b/app/src/main/res/layout/rv_item_call_header.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,11 +19,11 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/call_header_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/call_header_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/initial_relative_layout"
@@ -36,25 +35,25 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginEnd="8dp"
             android:contentDescription="@null"
             android:src="@drawable/ic_public_black_24px"
-            android:tint="@color/colorPrimary"/>
+            android:tint="@color/colorPrimary" />
 
         <TextView
             android:id="@+id/description_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
+            android:layout_marginEnd="@dimen/activity_horizontal_margin"
             android:layout_toEndOf="@id/public_call_link"
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/nc_public_call"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="@string/nc_public_call"/>
+            tools:text="@string/nc_public_call" />
 
     </RelativeLayout>
 
@@ -71,12 +70,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:layout_marginEnd="24dp"
             android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
             android:text="@string/nc_public_call_explanation"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="@string/nc_public_call_explanation"/>
+            tools:text="@string/nc_public_call_explanation" />
 
     </RelativeLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_contact.xml b/app/src/main/res/layout/rv_item_contact.xml
index 4d3becac2..007cc9e54 100644
--- a/app/src/main/res/layout/rv_item_contact.xml
+++ b/app/src/main/res/layout/rv_item_contact.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -22,22 +21,22 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
-                android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:orientation="vertical">
 
     <com.nextcloud.talk.utils.MagicFlipView
         android:id="@+id/avatar_flip_view"
         android:layout_width="@dimen/avatar_size"
         android:layout_height="@dimen/avatar_size"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="48dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         app:animationDuration="170"
         app:enableInitialAnimation="true"
-        app:rearBackgroundColor="@color/colorPrimary"/>
+        app:rearBackgroundColor="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/name_text"
@@ -48,6 +47,6 @@
         android:layout_toEndOf="@id/avatar_flip_view"
         android:ellipsize="end"
         android:textAppearance="?android:attr/textAppearanceListItem"
-        tools:text="Contact item text"/>
+        tools:text="Contact item text" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_conversation.xml b/app/src/main/res/layout/rv_item_conversation.xml
index b15f6d801..39ca0efff 100644
--- a/app/src/main/res/layout/rv_item_conversation.xml
+++ b/app/src/main/res/layout/rv_item_conversation.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -22,9 +21,9 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height">
 
 
     <FrameLayout
@@ -34,25 +33,24 @@
         android:layout_centerVertical="true"
         android:layout_marginStart="@dimen/activity_horizontal_margin">
 
-        <com.nextcloud.talk.utils.MagicFlipView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
+        <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar_image"
             android:layout_width="@dimen/avatar_size"
             android:layout_height="@dimen/avatar_size"
             app:animationDuration="170"
             app:checked="false"
             app:enableInitialAnimation="true"
-            app:rearBackgroundColor="@color/colorPrimary"/>
+            app:rearBackgroundColor="@color/colorPrimary" />
 
         <ImageView
             android:id="@+id/password_protected_image_view"
             android:layout_width="10dp"
             android:layout_height="10dp"
             android:layout_gravity="bottom|end"
-            android:layout_marginBottom="6dp"
             android:layout_marginEnd="6dp"
+            android:layout_marginBottom="6dp"
             android:src="@drawable/ic_lock_white_24px"
-            android:visibility="visible"/>
+            android:visibility="visible" />
 
     </FrameLayout>
 
@@ -62,8 +60,8 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:layout_marginStart="@dimen/margin_between_elements"
-        android:layout_toEndOf="@id/frame_layout"
         android:layout_toStartOf="@+id/more_menu"
+        android:layout_toEndOf="@id/frame_layout"
         android:orientation="vertical">
 
         <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
@@ -73,7 +71,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="Call item text"/>
+            tools:text="Call item text" />
 
         <TextView
             android:id="@+id/secondary_text"
@@ -81,7 +79,7 @@
             android:layout_height="wrap_content"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
-            tools:text="A week ago"/>
+            tools:text="A week ago" />
 
     </LinearLayout>
 
@@ -91,12 +89,12 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="@dimen/margin_between_elements"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:background="?android:attr/selectableItemBackground"
-        android:paddingEnd="8dp"
         android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         android:scaleType="center"
-        android:src="@drawable/ic_more_horiz_black_24dp"/>
+        android:src="@drawable/ic_more_horiz_black_24dp" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index ccc918409..db3da57ce 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -24,9 +23,9 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
 
     <RelativeLayout
@@ -42,24 +41,24 @@
 
             <ImageView
                 android:id="@id/dialogAvatar"
-                android:contentDescription="@null"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
-                tools:src="@drawable/ic_call_black_24dp"/>
+                android:contentDescription="@null"
+                tools:src="@drawable/ic_call_black_24dp" />
 
             <ImageView
                 android:id="@+id/passwordProtectedRoomImageView"
                 android:layout_width="12dp"
                 android:layout_height="12dp"
                 android:layout_gravity="bottom|end"
-                android:background="@drawable/shape_lock_bubble"/>
+                android:background="@drawable/shape_lock_bubble" />
 
             <ImageView
                 android:id="@+id/favoriteConversationImageView"
                 android:layout_width="12dp"
                 android:layout_height="12dp"
                 android:layout_gravity="top|end"
-                android:background="@drawable/shape_favorite_bubble"/>
+                android:background="@drawable/shape_favorite_bubble" />
         </FrameLayout>
 
         <TextView
@@ -68,14 +67,14 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/dialogAvatarFrameLayout"
             android:layout_marginStart="8dp"
-            android:layout_toEndOf="@id/dialogAvatarFrameLayout"
             android:layout_toStartOf="@id/dialogDate"
+            android:layout_toEndOf="@id/dialogAvatarFrameLayout"
             android:ellipsize="end"
             android:includeFontPadding="false"
             android:maxLines="1"
             android:textColor="@color/nc_incoming_text_default"
             android:textSize="16sp"
-            tools:text="Best conversation"/>
+            tools:text="Best conversation" />
 
         <TextView
             android:id="@id/dialogDate"
@@ -84,7 +83,7 @@
             android:layout_alignParentEnd="true"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="@color/warm_grey_two"/>
+            android:textColor="@color/warm_grey_two" />
 
         <RelativeLayout
             android:id="@+id/dialogLastMessageLayout"
@@ -97,25 +96,25 @@
 
             <ImageView
                 android:id="@id/dialogLastMessageUserAvatar"
-                android:contentDescription="@null"
                 android:layout_width="@dimen/small_item_height"
                 android:layout_height="@dimen/small_item_height"
                 android:layout_marginEnd="8dp"
-                tools:src="@drawable/ic_call_black_24dp"/>
+                android:contentDescription="@null"
+                tools:src="@drawable/ic_call_black_24dp" />
 
             <TextView
                 android:id="@id/dialogLastMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
                 android:layout_toStartOf="@id/dialogUnreadBubble"
+                android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
                 android:ellipsize="end"
                 android:gravity="top"
                 android:lines="2"
                 android:singleLine="false"
                 android:textColor="@color/warm_grey_four"
-                tools:text="This is the last message\nof an incredibly long two line  conversation text"/>
+                tools:text="This is the last message\nof an incredibly long two line  conversation text" />
 
             <TextView
                 android:id="@id/dialogUnreadBubble"
@@ -128,7 +127,7 @@
                 android:lines="1"
                 android:textAlignment="center"
                 android:textColor="@color/white"
-                tools:text="1"/>
+                tools:text="1" />
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/rv_item_empty_footer.xml b/app/src/main/res/layout/rv_item_empty_footer.xml
index e9b0f8991..4ea256c53 100644
--- a/app/src/main/res/layout/rv_item_empty_footer.xml
+++ b/app/src/main/res/layout/rv_item_empty_footer.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,8 +19,8 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="48dp"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:orientation="vertical">
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rv_item_mention.xml b/app/src/main/res/layout/rv_item_mention.xml
index a52fe39dc..4866a5af0 100644
--- a/app/src/main/res/layout/rv_item_mention.xml
+++ b/app/src/main/res/layout/rv_item_mention.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -22,11 +21,11 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
-                android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:orientation="vertical">
 
     <FrameLayout
         android:id="@+id/frame_layout"
@@ -42,7 +41,7 @@
             app:animationDuration="170"
             app:checked="false"
             app:enableInitialAnimation="false"
-            app:rearBackgroundColor="@color/colorPrimary"/>
+            app:rearBackgroundColor="@color/colorPrimary" />
 
     </FrameLayout>
 
@@ -51,8 +50,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_marginEnd="@dimen/margin_between_elements"
         android:layout_marginStart="@dimen/margin_between_elements"
+        android:layout_marginEnd="@dimen/margin_between_elements"
         android:layout_toEndOf="@id/frame_layout"
         android:orientation="vertical">
 
@@ -63,7 +62,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceListItem"
-            tools:text="Call item text"/>
+            tools:text="Call item text" />
 
         <TextView
             android:id="@+id/secondary_text"
@@ -72,7 +71,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
-            tools:text="A week ago"/>
+            tools:text="A week ago" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/rv_item_menu.xml b/app/src/main/res/layout/rv_item_menu.xml
index a685a3c3c..460565583 100644
--- a/app/src/main/res/layout/rv_item_menu.xml
+++ b/app/src/main/res/layout/rv_item_menu.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -22,10 +21,10 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white">
 
     <TextView
         android:id="@+id/menu_text"
@@ -39,5 +38,5 @@
         android:textSize="16sp"
         tools:drawableLeft="@drawable/ic_add_grey600_24px"
         tools:drawablePadding="16dp"
-        tools:text="Start a new conversation"/>
+        tools:text="Start a new conversation" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_notification_sound.xml b/app/src/main/res/layout/rv_item_notification_sound.xml
index 716f9d5a2..231d6167f 100644
--- a/app/src/main/res/layout/rv_item_notification_sound.xml
+++ b/app/src/main/res/layout/rv_item_notification_sound.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,25 +19,24 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
-                android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:orientation="vertical">
 
 
-    <com.nextcloud.talk.utils.MagicFlipView
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/magicFlipView"
         android:layout_width="@dimen/avatar_size"
         android:layout_height="@dimen/avatar_size"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         android:layout_marginStart="24dp"
+        android:layout_marginEnd="@dimen/activity_horizontal_margin"
         app:animationDuration="170"
         app:checked="false"
         app:enableInitialAnimation="true"
         app:frontBackgroundColor="@color/colorPrimary"
         app:frontImage="@drawable/ic_play_circle_outline_white_24dp"
-        app:rearBackgroundColor="@color/colorPrimary"/>
+        app:rearBackgroundColor="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/notificationNameTextView"
@@ -48,6 +46,6 @@
         android:layout_margin="8dp"
         android:layout_toEndOf="@id/magicFlipView"
         android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceListItem"/>
+        android:textAppearance="?android:attr/textAppearanceListItem" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/rv_item_progress.xml b/app/src/main/res/layout/rv_item_progress.xml
index 081bb67db..334e0fb9d 100644
--- a/app/src/main/res/layout/rv_item_progress.xml
+++ b/app/src/main/res/layout/rv_item_progress.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -19,8 +18,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -31,7 +29,7 @@
         style="@style/Widget.AppCompat.ProgressBar"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_gravity="center"/>
+        android:layout_gravity="center" />
 
     <TextView
         android:id="@+id/progress_message"
@@ -40,6 +38,6 @@
         android:layout_gravity="center"
         android:text="@string/nc_no_more_load_retry"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rv_item_title_header.xml b/app/src/main/res/layout/rv_item_title_header.xml
index 6d4c8ba6d..6bfb9d77d 100644
--- a/app/src/main/res/layout/rv_item_title_header.xml
+++ b/app/src/main/res/layout/rv_item_title_header.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -20,25 +19,25 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1px"
-        android:background="?android:attr/listDivider"/>
+        android:background="?android:attr/listDivider" />
 
     <TextView
         android:id="@+id/title_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
         android:textColor="@color/colorPrimary"
-        tools:text="A"/>
+        tools:text="A" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml
index 6f823952f..d05fc3dba 100644
--- a/app/src/main/res/layout/view_message_input.xml
+++ b/app/src/main/res/layout/view_message_input.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -19,8 +18,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<merge
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -29,20 +27,19 @@
         android:id="@id/attachmentButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerVertical="true"/>
+        android:layout_centerVertical="true" />
 
     <androidx.legacy.widget.Space
         android:id="@id/attachmentButtonSpace"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_toEndOf="@id/attachmentButton"/>
+        android:layout_toEndOf="@id/attachmentButton" />
 
     <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonEditText
         android:id="@id/messageInput"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_toEndOf="@id/attachmentButtonSpace"
         android:layout_toStartOf="@id/sendButtonSpace"
         android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/>
 
@@ -50,13 +47,13 @@
         android:id="@id/sendButtonSpace"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_toStartOf="@id/messageSendButton"/>
+        android:layout_toStartOf="@id/messageSendButton" />
 
     <ImageButton
         android:id="@id/messageSendButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"/>
+        android:layout_centerVertical="true" />
 
 </merge>