migrate to AndroidX

30 files changed, 111 insertions, 111 deletions

diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index e3f3d99e1..6c9c93955 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -48,7 +48,7 @@
                 android:textAppearance="@style/TextAppearance.Conversations.Body2" />
         </LinearLayout>
 
-        <android.support.v7.widget.SwitchCompat
+        <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/tgl_account_status"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 603a9d00c..cf812170b 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/LogoLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -37,9 +37,9 @@
                     android:layout_gravity="center_horizontal"
                     android:padding="8dp"
                     android:src="@drawable/main_logo" />
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/aboutLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -95,9 +95,9 @@
                         android:text="@string/show_termsofuse" />
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:id="@+id/libLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -128,7 +128,7 @@
                     android:textSize="?attr/TextSizeBody"
                     android:typeface="monospace" />
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </RelativeLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 1b0768d12..033b929eb 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -13,7 +13,7 @@
         android:layout_above="@+id/button_bar"
         android:layout_below="@id/toolbar">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -31,7 +31,7 @@
                 android:padding="@dimen/card_padding_regular">
 
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/current_password_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -49,9 +49,9 @@
                         android:layout_alignParentTop="true"
                         android:hint="@string/current_password"
                         android:inputType="textPassword" />
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/new_password_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -69,9 +69,9 @@
                         android:layout_alignParentTop="true"
                         android:hint="@string/new_password"
                         android:inputType="textPassword" />
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
     </ScrollView>
 
     <LinearLayout
diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml
index 5dd0f4be3..e28c39135 100644
--- a/src/main/res/layout/activity_channel_discovery.xml
+++ b/src/main/res/layout/activity_channel_discovery.xml
@@ -20,13 +20,13 @@
             android:layout_gravity="center_horizontal"
             app:layout_anchor="@+id/list" />
 
-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/color_background_secondary">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -34,8 +34,8 @@
                 android:orientation="vertical"
                 android:scrollbars="vertical"
                 android:visibility="gone"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
-        </android.support.design.widget.CoordinatorLayout>
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index 3a67e86fd..c8b57eae2 100644
--- a/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -22,7 +22,7 @@
                 android:divider="@android:color/transparent"
                 android:dividerHeight="0dp" />
 
-            <android.support.design.widget.FloatingActionButton
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/fab"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index ceb773e8b..9f6930ca5 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -178,9 +178,9 @@
                             </LinearLayout>
                         </RelativeLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -226,9 +226,9 @@
                             android:src="@drawable/ic_notifications_black_24dp" />
                     </RelativeLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/media_wrapper"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -245,7 +245,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/media"
                             android:layout_width="match_parent"
                             android:layout_height="100dp"
@@ -277,9 +277,9 @@
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/keys_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -338,7 +338,7 @@
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index f8965ee81..fd2cb6b3a 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -25,7 +25,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/editor"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
                                     android:layout_weight="0.8"
                                     android:orientation="vertical">
 
-                                    <android.support.design.widget.TextInputLayout
+                                    <com.google.android.material.textfield.TextInputLayout
                                         android:id="@+id/hostname_layout"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
                                             android:layout_width="fill_parent"
                                             android:layout_height="wrap_content"
                                             android:inputType="textWebEmailAddress" />
-                                    </android.support.design.widget.TextInputLayout>
+                                    </com.google.android.material.textfield.TextInputLayout>
                                 </LinearLayout>
 
                                 <LinearLayout
@@ -88,7 +88,7 @@
                                     android:layout_weight="0.2"
                                     android:orientation="vertical">
 
-                                    <android.support.design.widget.TextInputLayout
+                                    <com.google.android.material.textfield.TextInputLayout
                                         android:id="@+id/port_layout"
                                         android:layout_width="match_parent"
                                         android:layout_height="match_parent"
@@ -103,11 +103,11 @@
                                             android:layout_height="match_parent"
                                             android:inputType="number"
                                             android:maxLength="5" />
-                                    </android.support.design.widget.TextInputLayout>
+                                    </com.google.android.material.textfield.TextInputLayout>
                                 </LinearLayout>
                             </LinearLayout>
 
-                            <android.support.design.widget.TextInputLayout
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/account_jid_layout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -123,9 +123,9 @@
                                     android:imeOptions="actionNext"
                                     android:inputType="textEmailAddress"
                                     android:textColor="?attr/edit_text_color" />
-                            </android.support.design.widget.TextInputLayout>
+                            </com.google.android.material.textfield.TextInputLayout>
 
-                            <android.support.design.widget.TextInputLayout
+                            <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/account_password_layout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
                                     android:hint="@string/password"
                                     android:inputType="textPassword"
                                     android:textColor="?attr/edit_text_color" />
-                            </android.support.design.widget.TextInputLayout>
+                            </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
 
                         <LinearLayout
@@ -306,9 +306,9 @@
                             android:layout_marginTop="8dp"
                             android:text="@string/register_account" />
                     </RelativeLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/os_optimization"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -368,9 +368,9 @@
                                 android:textColor="@color/accent" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/stats"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
@@ -814,9 +814,9 @@
                             android:layout_width="match_parent"
                             android:layout_height="8dp" />
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/other_device_keys_card"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -858,7 +858,7 @@
                             android:text="@string/clear_other_devices"
                             android:textColor="@color/accent" />
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </ScrollView>
 
diff --git a/src/main/res/layout/activity_import_backup.xml b/src/main/res/layout/activity_import_backup.xml
index 996b9835a..f1eb37430 100644
--- a/src/main/res/layout/activity_import_backup.xml
+++ b/src/main/res/layout/activity_import_backup.xml
@@ -26,19 +26,19 @@
                 android:layout_gravity="center" />
         </LinearLayout>
 
-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/color_background_tertiary">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/color_background_tertiary"
                 android:orientation="vertical"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
             <TextView
                 android:id="@+id/hint"
@@ -50,7 +50,7 @@
                 android:textAlignment="center"
                 android:textAppearance="@style/TextAppearance.Conversations.Body1"
                 android:visibility="gone" />
-        </android.support.design.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_media_browser.xml b/src/main/res/layout/activity_media_browser.xml
index 809fc2911..fd6446d61 100644
--- a/src/main/res/layout/activity_media_browser.xml
+++ b/src/main/res/layout/activity_media_browser.xml
@@ -11,7 +11,7 @@
             android:id="@+id/toolbar"
             layout="@layout/toolbar" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/media"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 0aa9768e3..3dc518796 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -95,7 +95,7 @@
                                     android:orientation="vertical"
                                     android:visibility="gone">
 
-                                    <android.support.design.widget.TextInputLayout
+                                    <com.google.android.material.textfield.TextInputLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
@@ -107,9 +107,9 @@
                                             android:layout_height="wrap_content"
                                             android:hint="@string/group_chat_name"
                                             android:textAppearance="@style/Widget.Conversations.EditText" />
-                                    </android.support.design.widget.TextInputLayout>
+                                    </com.google.android.material.textfield.TextInputLayout>
 
-                                    <android.support.design.widget.TextInputLayout
+                                    <com.google.android.material.textfield.TextInputLayout
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
@@ -121,7 +121,7 @@
                                             android:layout_height="wrap_content"
                                             android:hint="@string/topic"
                                             android:textAppearance="@style/Widget.Conversations.EditText" />
-                                    </android.support.design.widget.TextInputLayout>
+                                    </com.google.android.material.textfield.TextInputLayout>
 
                                 </LinearLayout>
 
@@ -300,9 +300,9 @@
                                 android:visibility="gone" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -405,9 +405,9 @@
 
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/users_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -434,7 +434,7 @@
                             android:text="@string/no_users_hint_channel"
                             android:textAppearance="@style/TextAppearance.Conversations.Body2" />
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/users"
                             android:layout_width="fill_parent"
                             android:layout_height="0dp"
@@ -483,9 +483,9 @@
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/media_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -502,7 +502,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/media"
                             android:layout_width="fill_parent"
                             android:layout_height="0dp"
@@ -536,7 +536,7 @@
                                 android:textColor="?attr/colorAccent" />
                         </LinearLayout>
                     </LinearLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </ScrollView>
     </LinearLayout>
diff --git a/src/main/res/layout/activity_muc_users.xml b/src/main/res/layout/activity_muc_users.xml
index 4601c262b..783d27ec7 100644
--- a/src/main/res/layout/activity_muc_users.xml
+++ b/src/main/res/layout/activity_muc_users.xml
@@ -14,21 +14,21 @@
             layout="@layout/toolbar" />
 
 
-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:id="@+id/coordinator"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="?attr/color_background_tertiary">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="?attr/color_background_tertiary"
                 android:orientation="vertical"
                 android:scrollbars="vertical"
-                app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
-        </android.support.design.widget.CoordinatorLayout>
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 11ffac7c1..e04f77a4c 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -19,7 +19,7 @@
             android:layout_above="@id/button_bar"
             android:layout_below="@id/toolbar">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -79,7 +79,7 @@
                         android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </ScrollView>
 
         <LinearLayout
diff --git a/src/main/res/layout/activity_set_settings.xml b/src/main/res/layout/activity_set_settings.xml
index 5560b6106..313092c41 100644
--- a/src/main/res/layout/activity_set_settings.xml
+++ b/src/main/res/layout/activity_set_settings.xml
@@ -63,7 +63,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/forbid_screenshots"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -94,7 +94,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/show_links"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -124,7 +124,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/show_mappreview"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -154,7 +154,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/chat_states"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -184,7 +184,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/confirm_messages"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
@@ -214,7 +214,7 @@
                                 android:padding="@dimen/image_button_padding"
                                 android:src="@drawable/ic_help_circle_outline_black_24dp" />
 
-                            <android.support.v7.widget.AppCompatCheckBox
+                            <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/last_seen"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml
index 23fe1a4d1..493be34b7 100644
--- a/src/main/res/layout/activity_share_locaction.xml
+++ b/src/main/res/layout/activity_share_locaction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.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:tools="http://schemas.android.com/tools"
     android:id="@+id/snackbarCoordinator"
     android:layout_width="match_parent"
@@ -63,4 +63,4 @@
             </LinearLayout>
         </RelativeLayout>
     </RelativeLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_share_with.xml b/src/main/res/layout/activity_share_with.xml
index dec67bd81..24552ed70 100644
--- a/src/main/res/layout/activity_share_with.xml
+++ b/src/main/res/layout/activity_share_with.xml
@@ -7,7 +7,7 @@
 
     <include layout="@layout/toolbar" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/choose_conversation_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml
index ffd62fe91..731e41472 100644
--- a/src/main/res/layout/activity_show_locaction.xml
+++ b/src/main/res/layout/activity_show_locaction.xml
@@ -21,7 +21,7 @@
             android:layout_height="match_parent" />
     </LinearLayout>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index 2a77e6654..85eb641ab 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -10,7 +10,7 @@
             android:id="@+id/toolbar"
             layout="@layout/toolbar" />
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -24,7 +24,7 @@
             app:tabSelectedTextColor="@color/white"
             app:tabTextColor="@color/white70" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/start_conversation_view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index fb00f6611..178cd04c8 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/key_error_message_card"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
@@ -96,9 +96,9 @@
                         </LinearLayout>
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:id="@+id/own_keys_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -131,7 +131,7 @@
                             android:orientation="vertical" />
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
                 <LinearLayout
                     android:id="@+id/foreign_keys"
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 0b6f85f23..e607ab7d8 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -73,7 +73,7 @@
                 android:src="@drawable/ic_verified_fingerprint"
                 android:visibility="gone" />
 
-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/tgl_trust"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml
index fc4aefaf5..66aeee066 100644
--- a/src/main/res/layout/create_conference_dialog.xml
+++ b/src/main/res/layout/create_conference_dialog.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
@@ -40,6 +40,6 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/create_dialog_group_chat_name"
                 android:imeOptions="actionNext|flagNoExtractUi" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/create_public_channel_dialog.xml b/src/main/res/layout/create_public_channel_dialog.xml
index 457f9c010..7fa853599 100644
--- a/src/main/res/layout/create_public_channel_dialog.xml
+++ b/src/main/res/layout/create_public_channel_dialog.xml
@@ -20,7 +20,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/name_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -34,9 +34,9 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/create_dialog_channel_name"
                 android:imeOptions="actionNext|flagNoExtractUi" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/xmpp_address_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -52,6 +52,6 @@
                 android:layout_height="wrap_content"
                 android:imeOptions="actionDone|flagNoExtractUi"
                 android:inputType="textEmailAddress" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_enter_password.xml b/src/main/res/layout/dialog_enter_password.xml
index 935ebad6c..8a3e40061 100644
--- a/src/main/res/layout/dialog_enter_password.xml
+++ b/src/main/res/layout/dialog_enter_password.xml
@@ -22,7 +22,7 @@
             android:text="@string/restore_warning"
             android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/account_password_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,6 +42,6 @@
                 android:inputType="textPassword"
                 android:textColor="?attr/edit_text_color" />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_join_conference.xml b/src/main/res/layout/dialog_join_conference.xml
index 3d8478a34..6f1511102 100644
--- a/src/main/res/layout/dialog_join_conference.xml
+++ b/src/main/res/layout/dialog_join_conference.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/account_jid_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:imeOptions="actionDone|flagNoExtractUi"
                 android:inputType="textEmailAddress" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <CheckBox
             android:id="@+id/bookmark"
diff --git a/src/main/res/layout/dialog_presence.xml b/src/main/res/layout/dialog_presence.xml
index 4eff08a37..cef46e74a 100644
--- a/src/main/res/layout/dialog_presence.xml
+++ b/src/main/res/layout/dialog_presence.xml
@@ -48,7 +48,7 @@
                 android:text="@string/presence_dnd" />
         </RadioGroup>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
@@ -63,7 +63,7 @@
                 android:hint="@string/status_message"
                 android:inputType="textShortMessage"
                 android:textColor="?attr/text_Color_Main" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_quickedit.xml b/src/main/res/layout/dialog_quickedit.xml
index b309bc173..26b0d4c54 100644
--- a/src/main/res/layout/dialog_quickedit.xml
+++ b/src/main/res/layout/dialog_quickedit.xml
@@ -8,7 +8,7 @@
         android:orientation="vertical"
         android:padding="?dialogPreferredPadding">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -27,6 +27,6 @@
                 <requestFocus />
             </de.pixart.messenger.ui.widget.EmojiWrapperEditText>
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 0a0b462c5..aa14ae129 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/jid_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
                 android:imeOptions="actionDone|flagNoExtractUi"
                 android:inputType="textEmailAddress"
                 android:textColor="?attr/text_Color_Main" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index c3f42855d..46019a289 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -24,7 +24,7 @@
             android:transcriptMode="normal"
             tools:listitem="@layout/message_sent" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/scroll_to_bottom_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
                         android:textAppearance="@style/TextAppearance.Conversations.Caption.Highlight"
                         android:visibility="gone" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/media_preview"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
                         android:paddingTop="8dp"
                         android:requiresFadingEdge="horizontal"
                         android:visibility="gone"
-                        app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         tools:listitem="@layout/media_preview" />
 
                     <de.pixart.messenger.ui.widget.EditMessage
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 3085fccf7..693a746fb 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -1,11 +1,11 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/color_background_secondary">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -15,12 +15,12 @@
             android:scrollbars="vertical" />
 
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|bottom"
             android:layout_margin="16dp"
             android:src="@drawable/ic_chat_white_24dp" />
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 126d06b1f..b53f7d30e 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/foreign_keys_card"
 
         android:layout_width="fill_parent"
@@ -40,5 +40,5 @@
                 android:text="@string/no_keys_just_confirm"
                 android:textAppearance="@style/TextAppearance.Conversations.Body1" />
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index e9782393f..77d98bd91 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"