Raise deployment target and migrate to AndroidX

5 years ago · 96736a8095
parent 6e2cbb23cc
commit 96736a8095
763 changed files with 1733 additions and 1848 deletions
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@ -589,7 +589,7 @@
            android:exported="false"
            android:grantUriPermissions="true" />
        <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
            android:authorities="network.loki.securesms.fileprovider"
            android:exported="false"
            android:grantUriPermissions="true">
--- a/build.gradle
+++ b/build.gradle
@ -77,21 +77,19 @@ configurations.all {
 }

 dependencies {
-    def supportVersion = '28.0.0'
-
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:support-v13:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:preference-v7:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:gridlayout-v7:$supportVersion"
-    implementation "com.android.support:exifinterface:$supportVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
-    implementation 'android.arch.lifecycle:common-java8:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0'

    implementation ("com.google.firebase:firebase-messaging:$firebase_messaging_version") {
        exclude group: 'com.google.firebase', module: 'firebase-core'
@ -112,9 +110,9 @@ dependencies {
    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
-    implementation 'com.github.bumptech.glide:glide:4.5.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
-    kapt 'com.github.bumptech.glide:compiler:4.5.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
    implementation 'com.makeramen:roundedimageview:2.1.0'
    implementation 'com.pnikosis:materialish-progress:1.5'
    implementation 'org.greenrobot:eventbus:3.0.0'
@ -163,8 +161,8 @@ dependencies {
    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'

    testImplementation 'androidx.test:core:1.1.1-alpha02'
-    androidTestImplementation 'com.android.support:multidex:1.0.3'
-    androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
@ -209,7 +207,7 @@ def abiPostFix = ['armeabi-v7a' : 1,

 android {
    flavorDimensions "none"
-    compileSdkVersion 28
+    compileSdkVersion 29
    buildToolsVersion '28.0.3'
    useLibrary 'org.apache.http.legacy'

@ -222,7 +220,7 @@ android {
        versionName canonicalVersionName

        minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
        multiDexEnabled true

        vectorDrawables.useSupportLibrary = true
--- a/gradle.properties
+++ b/gradle.properties
@ -1 +1,3 @@
+android.useAndroidX=true
+android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2048m
--- a/res/layout/activity_contact_name_edit.xml
+++ b/res/layout/activity_contact_name_edit.xml
@ -7,7 +7,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
--- a/res/layout/activity_contact_share_edit.xml
+++ b/res/layout/activity_contact_share_edit.xml
@ -4,14 +4,14 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/contact_share_edit_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:paddingBottom="80dp"
        android:clipToPadding="false"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
        android:id="@+id/contact_share_edit_send"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@ -27,7 +27,7 @@
            android:layout_height="1px"
            android:background="@color/separator" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
--- a/res/layout/activity_create_private_chat.xml
+++ b/res/layout/activity_create_private_chat.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@ -129,7 +129,7 @@
            android:layout_height="1px"
            android:background="@color/separator" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent"/>
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@ -8,7 +8,7 @@
    android:background="@drawable/default_session_background"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@ -58,7 +58,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <org.thoughtcrime.securesms.loki.views.SeedReminderView
        android:id="@+id/seedReminderView"
@ -69,7 +69,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/activity_join_public_chat.xml
+++ b/res/layout/activity_join_public_chat.xml
@ -5,18 +5,18 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/viewPager"
        android:layout_width="match_parent"
        android:layout_height="match_parent" >

-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
            style="@style/Session.DarkTabLayout"
            android:id="@+id/tabLayout"
            android:layout_width="match_parent"
            android:layout_height="@dimen/tab_bar_height" />

-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>

    <RelativeLayout
        android:id="@+id/loader"
--- a/res/layout/activity_link_device.xml
+++ b/res/layout/activity_link_device.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_linked_devices.xml
+++ b/res/layout/activity_linked_devices.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/recyclerView"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
--- a/res/layout/activity_qr_code.xml
+++ b/res/layout/activity_qr_code.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/viewPager"
    android:layout_width="match_parent"
    android:layout_height="match_parent" >

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
        style="@style/Session.DarkTabLayout"
        android:id="@+id/tabLayout"
        android:layout_width="match_parent"
        android:layout_height="@dimen/tab_bar_height" />

-</android.support.v4.view.ViewPager>
+</androidx.viewpager.widget.ViewPager>
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@ -11,7 +11,7 @@
        android:layout_height="match_parent"
        android:orientation="vertical">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerView"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@ -17,7 +17,7 @@
            android:orientation="vertical"
            android:gravity="center_horizontal">

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
@ -68,7 +68,7 @@

                </LinearLayout>

-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>

            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                android:id="@+id/profilePictureView"
--- a/res/layout/activity_shared_contact_details.xml
+++ b/res/layout/activity_shared_contact_details.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<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"
@ -7,11 +7,11 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:background="?attr/shared_contact_details_header_background">
@ -138,7 +138,7 @@

            </LinearLayout>

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
@ -146,14 +146,14 @@
                android:background="@color/transparent"
                app:layout_collapseMode="pin" />

-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/contact_details_fields"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/captcha_activity.xml
+++ b/res/layout/captcha_activity.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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"
@ -34,4 +34,4 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/registration_captcha_title" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@ -18,7 +18,7 @@
                      android:visibility="visible"
                      android:orientation="vertical">
                
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@ -30,9 +30,9 @@
                          android:hint="@string/change_passphrase_activity__old_passphrase"
                          android:singleLine="true"/>

-            </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">

@ -43,9 +43,9 @@
                          android:hint="@string/change_passphrase_activity__new_passphrase"
                          android:singleLine="true"/>

-            </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">

@ -56,7 +56,7 @@
                          android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
                          android:singleLine="true" />

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

            <LinearLayout android:orientation="horizontal"
                          android:layout_width="fill_parent"
--- a/res/layout/contact_selection_list_fragment.xml
+++ b/res/layout/contact_selection_list_fragment.xml
@ -25,12 +25,12 @@
        android:layout_height="match_parent"
        android:orientation="vertical">
    
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
            android:id="@+id/swipeRefreshLayout"
            android:layout_width="match_parent"
            android:layout_height="match_parent">

-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/recyclerView"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@ -46,7 +46,7 @@
                android:text="@string/contact_selection_group_activity__finding_contacts"
                android:textSize="@dimen/large_font_size" />

-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

    </LinearLayout>

--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@ -7,7 +7,7 @@
    android:layout_height="match_parent"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@ -74,7 +74,7 @@

        </LinearLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <org.thoughtcrime.securesms.components.InputAwareLayout
        android:id="@+id/layout_container"
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@ -5,7 +5,7 @@
             android:layout_width="fill_parent"
             android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@android:id/list"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@ -17,7 +17,7 @@
    android:clipChildren="false"
    android:clipToPadding="false">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/input_panel_sticker_suggestion"
        android:layout_width="match_parent"
        android:layout_height="90dp"
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@ -7,7 +7,7 @@
                android:layout_width="match_parent"
                android:layout_height="match_parent">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_alignParentTop="true"
            android:layout_width="match_parent"
@ -50,7 +50,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <FrameLayout android:id="@+id/fragment_container"
                 android:layout_below="@id/toolbar"
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:tools="http://schemas.android.com/tools"
        android:layout_width="fill_parent"
@ -56,7 +56,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/list"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@ -79,4 +79,4 @@
            android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>


-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@ -9,7 +9,7 @@
    android:background="@color/compose_view_background"
    android:visibility="gone"
    tools:visibility="visible"
-    tools:parentTag="android.support.constraint.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

    <TextView
        android:id="@+id/conversation_search_position"
--- a/res/layout/device_link_fragment.xml
+++ b/res/layout/device_link_fragment.xml
@ -14,7 +14,7 @@
            android:layout_marginBottom="25dp"
            android:contentDescription="@string/device_link_fragment__link_device"/>

-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="25dp"
@ -83,6 +83,6 @@
        </LinearLayout>


-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>

 </LinearLayout>
--- a/res/layout/emoji_grid_layout.xml
+++ b/res/layout/emoji_grid_layout.xml
@ -4,7 +4,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/emoji"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/enter_backup_passphrase_dialog.xml
+++ b/res/layout/enter_backup_passphrase_dialog.xml
@ -4,11 +4,11 @@
             android:layout_height="wrap_content"
             android:padding="16dp">

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/restore_passphrase_input"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -16,5 +16,5 @@
                android:imeOptions="actionDone"
                android:inputType="number" />

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </FrameLayout>
--- a/res/layout/experience_upgrade_activity.xml
+++ b/res/layout/experience_upgrade_activity.xml
@ -6,7 +6,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
        android:id="@+id/pager"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
--- a/res/layout/experience_upgrade_link_previews_fragment.xml
+++ b/res/layout/experience_upgrade_link_previews_fragment.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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"
@ -83,7 +83,7 @@

    </LinearLayout>

-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
        android:id="@+id/experience_ok_button"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
@ -98,4 +98,4 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/experience_upgrade_preference_fragment.xml
+++ b/res/layout/experience_upgrade_preference_fragment.xml
@ -50,7 +50,7 @@
                  android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
                  android:textColor="@android:color/white" />

-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                    android:id="@+id/preference"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
--- a/res/layout/experience_upgrade_typing_indicators_fragment.xml
+++ b/res/layout/experience_upgrade_typing_indicators_fragment.xml
@ -83,7 +83,7 @@
            android:textIsSelectable="false"
            android:textSize="@dimen/onboarding_subtitle_size" />

-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
            android:id="@+id/experience_yes_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -93,7 +93,7 @@
            android:textColor="@color/core_blue"
            app:backgroundTint="@color/core_white" />

-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
            android:id="@+id/experience_no_button"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@ -12,7 +12,7 @@
        android:background="?attr/search_background"
        android:visibility="gone" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/search_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"/>
--- a/res/layout/fragment_submit_log.xml
+++ b/res/layout/fragment_submit_log.xml
@ -43,7 +43,7 @@
        android:layout_height="0dp"
        android:layout_weight="1">

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/log_preview"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
--- a/res/layout/giphy_activity.xml
+++ b/res/layout/giphy_activity.xml
@ -5,13 +5,13 @@
                android:layout_width="match_parent"
                android:orientation="vertical">

-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_above="@+id/giphy_logo"
            android:orientation="vertical">

-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="?attr/colorPrimary">
@ -24,7 +24,7 @@
                    android:theme="?attr/actionBarStyle"
                    app:layout_scrollFlags="scroll|enterAlways"/>

-            <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"
@ -33,15 +33,15 @@
                    app:tabIndicatorColor="@color/accent"
                    android:scrollbars="horizontal"/>

-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>

-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
                android:id="@+id/giphy_pager"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>

    <ImageView android:id="@+id/giphy_logo"
               android:src="@drawable/poweredby_giphy"
--- a/res/layout/giphy_fragment.xml
+++ b/res/layout/giphy_fragment.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/giphy_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/image_editor_hud.xml
+++ b/res/layout/image_editor_hud.xml
@ -9,7 +9,7 @@
    tools:parentTag="android.widget.LinearLayout"
    tools:background="@color/core_grey_60">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:layout_weight="1"
@ -105,7 +105,7 @@
            app:pickerBorderWidth="3dp"
            app:pickerColors="@array/scribble_colors" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/scribble_color_palette"
            android:layout_width="wrap_content"
            android:layout_height="0dp"
@ -148,6 +148,6 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent" />

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/item_editable_contact.xml
+++ b/res/layout/item_editable_contact.xml
@ -39,7 +39,7 @@
        android:layout_height="1dp"
        android:src="@color/grey_400"/>
    
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/editable_contact_fields"
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/linkpreview_container"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
@ -99,6 +99,6 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent" />

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/media_keyboard.xml
+++ b/res/layout/media_keyboard.xml
@ -6,7 +6,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard">

-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="?emoji_drawer_background">
@ -66,7 +66,7 @@
            app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
            app:layout_constraintTop_toTopOf="@+id/media_keyboard_tabs" />

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_keyboard_tabs"
            android:layout_width="0dp"
            android:layout_height="40dp"
@ -104,6 +104,6 @@
            app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"
            tools:visibility="visible"/>

-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>

 </merge>
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_height="match_parent"
        android:layout_width="match_parent"
@ -7,11 +7,11 @@
        xmlns:tools="http://schemas.android.com/tools"
        xmlns:app="http://schemas.android.com/apk/res-auto">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?android:attr/actionBarSize"
@ -29,7 +29,7 @@
                app:tabIndicatorColor="@color/textsecure_primary"
                app:tabSelectedTextColor="@color/textsecure_primary"/>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

    <org.thoughtcrime.securesms.components.ControllableViewPager
            android:id="@+id/pager"
@ -37,4 +37,4 @@
            android:layout_height="match_parent"
            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/media_overview_documents_fragment.xml
@ -5,7 +5,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recycler_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/media_overview_gallery_fragment.xml
@ -5,7 +5,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_grid"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@ -47,7 +47,7 @@

        </org.thoughtcrime.securesms.components.MaxHeightScrollView>

-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/media_preview_album_rail"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@ -6,7 +6,7 @@
    android:orientation="vertical"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/mediapicker_toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@ -14,7 +14,7 @@
        android:background="@color/action_bar_background"
        android:theme="?attr/actionBarStyle" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/mediapicker_folder_list"
        android:background="@drawable/default_session_background"
        android:layout_width="match_parent"
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@ -6,7 +6,7 @@
    android:orientation="vertical"
    android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/mediapicker_toolbar"
        android:layout_width="match_parent"
        android:layout_height="?attr/actionBarSize"
@ -14,7 +14,7 @@
        android:background="@color/action_bar_background"
        android:theme="?attr/actionBarStyle" />

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/mediapicker_item_list"
        android:background="@drawable/default_session_background"
        android:layout_width="match_parent"
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@ -49,7 +49,7 @@
                android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
                android:background="@null"/>

-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                android:id="@+id/mediasend_media_rail"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@ -17,7 +17,7 @@
            android:layout_height="0dp"
            android:layout_weight="1">

-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">

@ -135,7 +135,7 @@
                    app:layout_constraintTop_toBottomOf="@+id/name"
                    app:layout_constraintVertical_bias="1.0" />

-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>

        </ScrollView>

--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@ -22,7 +22,7 @@

    </FrameLayout>

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
@ -34,7 +34,7 @@
            android:src="@drawable/ic_launcher_foreground"
            android:layout_gravity="center" />

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>

    <LinearLayout
            android:layout_width="match_parent"
--- a/res/layout/recent_photo_view.xml
+++ b/res/layout/recent_photo_view.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
        android:id="@+id/photo_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        xmlns:app="http://schemas.android.com/apk/res-auto"
        android:layout_width="match_parent"
@ -9,13 +9,13 @@
        android:background="@color/transparent"
        xmlns:tools="http://schemas.android.com/tools">

-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
            android:id="@+id/app_bar_layout"
            android:layout_width="match_parent"
            android:layout_height="300dp"
            android:background="@color/transparent">

-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
                android:id="@+id/collapsing_toolbar"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
@ -42,7 +42,7 @@
                    android:layout_alignBottom="@+id/image"
                    android:background="@drawable/recipient_preference_scrim_bottom"/>

-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                    android:id="@+id/toolbar"
                    android:layout_width="match_parent"
                    android:layout_height="?attr/actionBarSize"
@ -51,13 +51,13 @@
                    android:layout_marginTop="24dp"
                    app:layout_collapseMode="pin" >

-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>

-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>

-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>

-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
            android:id="@+id/scroll_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@ -94,6 +94,6 @@

        </LinearLayout>

-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/recipient_preference_photo_rail.xml
+++ b/res/layout/recipient_preference_photo_rail.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/photo_list"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/recording_container"
@ -101,4 +101,4 @@

    </FrameLayout>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@ -187,7 +187,7 @@

        </LinearLayout>

-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
            android:id="@+id/verification_container"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
@ -239,7 +239,7 @@
                android:layout_alignParentBottom="true"
                app:layout_constraintBottom_toBottomOf="parent" />

-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>


        <LinearLayout
@ -281,14 +281,14 @@
            </LinearLayout>


-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginTop="15dp"
                android:paddingStart="100dp"
                android:paddingEnd="100dp">

-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                    android:id="@+id/pin"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
@ -296,7 +296,7 @@
                    android:imeOptions="actionDone"
                    android:inputType="numberPassword" />

-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>

            <com.dd.CircularProgressButton
                android:id="@+id/pinButton"
--- a/res/layout/registration_lock_dialog_view.xml
+++ b/res/layout/registration_lock_dialog_view.xml
@ -15,12 +15,12 @@
            android:layout_marginTop="10dp"
            android:text="@string/registration_lock_dialog_view__the_pin_can_consist_of_four_or_more_digits_if_you_forget_your_pin_you_could_be_locked_out_of_your_account_for_up_to_seven_days"/>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_marginTop="15dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/pin"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -28,15 +28,15 @@
                android:imeOptions="actionNext"
                android:hint="@string/registration_lock_dialog_view__enter_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>


-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_marginTop="15dp"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/repeat"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -44,7 +44,7 @@
                android:imeOptions="actionDone"
                android:hint="@string/registration_lock_dialog_view__confirm_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>


    <ProgressBar android:id="@+id/progress"
--- a/res/layout/registration_lock_reminder_view.xml
+++ b/res/layout/registration_lock_reminder_view.xml
@ -23,21 +23,21 @@

    </LinearLayout>

-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingTop="40dp"
            android:paddingStart="80dp"
            android:paddingEnd="80dp">

-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/pin"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:inputType="numberPassword"
                android:hint="@string/registration_lock_reminder_view__enter_pin"/>

-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>

    <TextView android:id="@+id/reminder"
              android:layout_width="match_parent"
--- a/res/layout/registration_welcome_activity.xml
+++ b/res/layout/registration_welcome_activity.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="@color/loki_darkest_gray"
@ -85,4 +85,4 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent" />

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/scribble_select_sticker_activity.xml
+++ b/res/layout/scribble_select_sticker_activity.xml
@ -5,14 +5,14 @@
              android:layout_height="match_parent"
              android:orientation="vertical">

-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
            android:id="@+id/camera_sticker_tabs"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            app:tabBackground="@color/core_grey_90"
            app:tabMode="fixed"/>

-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
            android:id="@+id/camera_sticker_pager"
            android:layout_width="match_parent"
            android:layout_height="0px"
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/stickers_recycler_view"
    android:layout_width="match_parent"
--- a/res/layout/search_toolbar.xml
+++ b/res/layout/search_toolbar.xml
@ -6,7 +6,7 @@
       tools:parentTag="android.widget.LinearLayout"
       tools:orientation="vertical">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
            android:layout_height="?attr/actionBarSize"
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@ -8,7 +8,7 @@
                android:layout_height="match_parent"
                android:background="@drawable/default_session_background">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
            android:layout_alignParentTop="true"
            android:layout_width="match_parent"
@ -42,7 +42,7 @@

        </RelativeLayout>

-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>


    <fragment android:id="@+id/contact_selection_list_fragment"
--- a/res/layout/sticker_keyboard_page.xml
+++ b/res/layout/sticker_keyboard_page.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/sticker_keyboard_list"
    android:layout_width="match_parent"
--- a/res/layout/sticker_management_activity.xml
+++ b/res/layout/sticker_management_activity.xml
@ -5,7 +5,7 @@
    android:layout_height="match_parent"
    android:orientation="vertical">

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/sticker_management_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/res/layout/sticker_management_sticker_item.xml
+++ b/res/layout/sticker_management_sticker_item.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<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"
@ -124,4 +124,4 @@
        app:layout_constraintTop_toBottomOf="@id/sticker_management_cover"
        app:layout_constraintEnd_toEndOf="parent"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/sticker_preview_activity.xml
+++ b/res/layout/sticker_preview_activity.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
    android:layout_height="match_parent">

-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
        android:id="@+id/sticker_install_toolbar"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
@ -78,7 +78,7 @@
        app:layout_constraintEnd_toEndOf="@id/sticker_install_share_button"
        tools:visibility="visible"/>

-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
        android:id="@+id/sticker_install_list"
        android:layout_width="0dp"
        android:layout_height="0dp"
@ -125,11 +125,11 @@
        app:layout_constraintEnd_toEndOf="@id/sticker_install_list"
        app:layout_constraintStart_toStartOf="@id/sticker_install_list" />

-    <android.support.constraint.Barrier
+    <androidx.constraintlayout.widget.Barrier
        android:id="@+id/sticker_install_bottom_barrier"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        app:barrierDirection="top"
        app:constraint_referenced_ids="sticker_install_remove_button,sticker_install_button"/>

-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/res/layout/switch_compat_preference.xml
+++ b/res/layout/switch_compat_preference.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
                                        android:id="@android:id/checkbox"
                                        android:layout_width="wrap_content"
                                        android:layout_height="wrap_content"
--- a/res/layout/verify_display_fragment.xml
+++ b/res/layout/verify_display_fragment.xml
@ -161,7 +161,7 @@
                      android:layout_marginTop="10dp"
                      android:paddingStart="20dp">

-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                    android:id="@+id/verified_switch"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"/>
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@ -14,7 +14,7 @@
     limitations under the License.
 -->

-<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"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/incall_screen"
@ -212,7 +212,7 @@
            android:layout_height="match_parent"
            tools:visibility="invisible"/>

-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
            android:id="@+id/hangup_fab"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@ -233,4 +233,4 @@
            android:layout_height="wrap_content"
            android:layout_marginBottom="16dp"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@ -10,7 +10,7 @@

    <item android:title="@string/SearchToolbar_search"
          android:id="@+id/menu_search"
-          app:actionViewClass="android.support.v7.widget.SearchView"
+          app:actionViewClass="androidx.appcompat.widget.SearchView"
          app:showAsAction="collapseActionView"/>

    <item android:title="@string/conversation__menu_add_shortcut"
--- a/res/menu/conversation_list_search.xml
+++ b/res/menu/conversation_list_search.xml
@ -5,7 +5,7 @@
    <item
            android:id="@+id/action_filter_search"
            android:title=" "
-            app:actionViewClass="android.support.v7.widget.SearchView"
+            app:actionViewClass="androidx.appcompat.widget.SearchView"
            app:showAsAction="collapseActionView|always" />

 </menu>
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@ -16,17 +16,17 @@
 */
 package org.thoughtcrime.securesms;

-import android.arch.lifecycle.DefaultLifecycleObserver;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.multidex.MultiDexApplication;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.multidex.MultiDexApplication;

 import com.google.firebase.iid.FirebaseInstanceId;

--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@ -29,14 +29,14 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
 import android.util.Log;
 import android.widget.Toast;

--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@ -11,11 +11,11 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
--- a/src/org/thoughtcrime/securesms/BaseActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActivity.java
@ -7,8 +7,8 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import android.view.KeyEvent;

 import org.thoughtcrime.securesms.util.TextSecurePreferences;
--- a/src/org/thoughtcrime/securesms/BasicIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/BasicIntroFragment.java
@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;

 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/src/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/src/org/thoughtcrime/securesms/BindableConversationItem.java
@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms;

-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;

 import org.thoughtcrime.securesms.contactshare.Contact;
--- a/src/org/thoughtcrime/securesms/BindableConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/BindableConversationListItem.java
@ -1,8 +1,7 @@
 package org.thoughtcrime.securesms;

-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;

-import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;

--- a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
@ -4,12 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.cursoradapter.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
--- a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
+++ b/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;

 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;

 import network.loki.messenger.R;

--- a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
+++ b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
--- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms;

 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment;
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@ -25,9 +25,9 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.TooltipCompat;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.TooltipCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@ -53,7 +53,6 @@ import org.thoughtcrime.securesms.loki.utilities.ProfilePictureModifiedEvent;
 import org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.service.KeyCachingService;
--- a/src/org/thoughtcrime/securesms/ConversationListAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationListAdapter.java
@ -18,9 +18,9 @@ package org.thoughtcrime.securesms;

 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@ -30,18 +30,18 @@ import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@ -77,7 +77,6 @@ import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
 import org.thoughtcrime.securesms.loki.activities.CreatePrivateChatActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@ -22,8 +22,8 @@ import android.graphics.Typeface;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.style.StyleSpan;
 import android.util.AttributeSet;
 import android.view.View;
--- a/src/org/thoughtcrime/securesms/ConversationListItemAction.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItemAction.java
@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 import android.widget.TextView;
--- a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
@ -3,9 +3,9 @@ package org.thoughtcrime.securesms;

 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;

--- a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
+++ b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
@ -2,10 +2,10 @@ package org.thoughtcrime.securesms;

 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@ -12,8 +12,8 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@ -23,7 +23,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.view.View;
 import android.widget.ProgressBar;

@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.jobs.PushDecryptJob;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
--- a/src/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceActivity.java
@ -8,7 +8,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.MenuItem;
--- a/src/org/thoughtcrime/securesms/DeviceAddFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceAddFragment.java
@ -5,8 +5,8 @@ import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
--- a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceLinkFragment.java
@ -3,8 +3,8 @@ package org.thoughtcrime.securesms;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/src/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java
@ -4,11 +4,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
@ -2,7 +2,7 @@ package org.thoughtcrime.securesms;

 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.Window;

 import network.loki.messenger.R;
--- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
@ -7,11 +7,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;

 import com.melnykov.fab.FloatingActionButton;
--- a/src/org/thoughtcrime/securesms/ExpirationDialog.java
+++ b/src/org/thoughtcrime/securesms/ExpirationDialog.java
@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@ -23,8 +23,8 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
--- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java
+++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;

 import org.thoughtcrime.securesms.database.DatabaseFactory;
--- a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java
+++ b/src/org/thoughtcrime/securesms/IntroPagerAdapter.java
@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;

-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;

 import java.util.List;

--- a/Show More
+++ b/Show More