Migrate to AndroidX (jetpack)

app/build.gradle

@@ -15,7 +15,7 @@ android {
         targetSdkVersion versions.targetSdk
         versionCode 2020
         versionName "2.2.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
 
@@ -60,11 +60,11 @@ dependencies {
 
     implementation libraries.appCompat
     implementation libraries.recyclerview
-    implementation libraries.design
-    implementation libraries.constraintLayout
-    implementation libraries.cardView
+    implementation libraries.material
+    implementation libraries.constraintlayout
+    implementation libraries.cardview
     implementation libraries.flexbox
-    implementation libraries.customTabs
+    implementation libraries.browser
 
     implementation libraries.androidKtx
 
@@ -77,7 +77,6 @@ dependencies {
 
     implementation libraries.room
     kapt libraries.roomProcessor
-    implementation libraries.roomRxjava
     implementation libraries.lifecycleExtensions
     kapt libraries.lifecycleCompiler
 
@@ -109,7 +108,7 @@ dependencies {
 
     implementation libraries.aVLoadingIndicatorView
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
         transitive = true
     }
 

app/src/androidTest/java/chat/rocket/android/chatroom/ui/ChatRoomFragmentTest.kt

 package chat.rocket.android.chatroom.ui
 
 import android.content.Intent
-import android.support.test.espresso.intent.rule.IntentsTestRule
-import android.support.test.filters.LargeTest
+import androidx.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.filters.LargeTest
 import org.junit.Rule
 import org.junit.Test
 import android.app.Activity
 import android.app.Instrumentation.ActivityResult
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.Intents.intending
-import android.support.test.espresso.intent.matcher.IntentMatchers.*
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.Intents.intending
+import androidx.test.espresso.intent.matcher.IntentMatchers.*
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.not
 import org.junit.Before

app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt

 package chat.rocket.android.app
 
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.v4.content.ContextCompat
-import android.support.v4.graphics.drawable.DrawableCompat
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.DrawableCompat
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.common.model.UserStatus

app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt

@@ -3,19 +3,19 @@ package chat.rocket.android.app
 import android.app.Activity
 import android.app.Application
 import android.app.Service
-import android.arch.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
 import chat.rocket.android.BuildConfig
-import chat.rocket.android.app.migration.RealmMigration
+/*import chat.rocket.android.app.migration.RealmMigration
 import chat.rocket.android.app.migration.RocketChatLibraryModule
 import chat.rocket.android.app.migration.RocketChatServerModule
 import chat.rocket.android.app.migration.model.RealmBasedServerInfo
 import chat.rocket.android.app.migration.model.RealmPublicSetting
 import chat.rocket.android.app.migration.model.RealmSession
-import chat.rocket.android.app.migration.model.RealmUser
+import chat.rocket.android.app.migration.model.RealmUser*/
 import chat.rocket.android.authentication.domain.model.toToken
 import chat.rocket.android.dagger.DaggerAppComponent
 import chat.rocket.android.dagger.qualifier.ForMessages

app/src/main/java/chat/rocket/android/app/RocketChatDatabase.kt

-package chat.rocket.android.app
-
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
-
-import chat.rocket.android.server.infraestructure.ServerDao
-import chat.rocket.android.server.infraestructure.ServerEntity
-
-@Database(entities = arrayOf(ServerEntity::class), version = 1, exportSchema = false)
-abstract class RocketChatDatabase : RoomDatabase() {
-    abstract fun serverDao(): ServerDao
-}

app/src/main/java/chat/rocket/android/authentication/login/di/LoginFragmentModule.kt

 package chat.rocket.android.authentication.login.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.login.presentation.LoginView
 import chat.rocket.android.authentication.login.ui.LoginFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.style.ClickableSpan
 import android.view.LayoutInflater
 import android.view.View

app/src/main/java/chat/rocket/android/authentication/registerusername/di/RegisterUsernameFragmentModule.kt

 package chat.rocket.android.authentication.registerusername.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.registerusername.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/authentication/resetpassword/di/ResetPasswordFragmentModule.kt

 package chat.rocket.android.authentication.resetpassword.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
 import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.resetpassword.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/authentication/server/di/ServerFragmentModule.kt

 package chat.rocket.android.authentication.server.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.server.presentation.ServerView
 import chat.rocket.android.authentication.server.ui.ServerFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.server.ui
 import android.app.AlertDialog
 import android.net.Uri
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/authentication/signup/di/SignupFragmentModule.kt

 package chat.rocket.android.authentication.signup.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.signup.presentation.SignupView
 import chat.rocket.android.authentication.signup.ui.SignupFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt

@@ -3,10 +3,9 @@ package chat.rocket.android.authentication.signup.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.style.ClickableSpan
 import android.view.*
-import android.widget.Toast
 import chat.rocket.android.R
 import chat.rocket.android.authentication.signup.presentation.SignupPresenter
 import chat.rocket.android.authentication.signup.presentation.SignupView

app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentModule.kt

 package chat.rocket.android.authentication.twofactor.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.twofactor.presentation.TwoFAView
 import chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
 import chat.rocket.android.core.lifecycle.CancelStrategy

app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt

@@ -4,7 +4,7 @@ import DrawableHelper
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -3,8 +3,8 @@ package chat.rocket.android.authentication.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo

app/src/main/java/chat/rocket/android/chatroom/adapter/AutoCompleteType.kt

 package chat.rocket.android.chatroom.adapter
 
-import android.support.annotation.IntDef
+import androidx.annotation.IntDef
 
 const val PEOPLE = 0
 const val ROOMS = 1

app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt

 package chat.rocket.android.chatroom.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt

 package chat.rocket.android.chatroom.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import android.view.ViewGroup
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/chatroom/adapter/ColorAttachmentViewHolder.kt

 package chat.rocket.android.chatroom.adapter
 
 import android.graphics.drawable.Drawable
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.text.method.LinkMovementMethod
 import android.view.View
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/chatroom/adapter/ImageAttachmentViewHolder.kt

@@ -7,12 +7,11 @@ import android.graphics.Typeface
 import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Environment
-import android.support.design.widget.AppBarLayout
-import android.support.v7.widget.Toolbar
+import com.google.android.material.appbar.AppBarLayout
+import androidx.appcompat.widget.Toolbar
 import android.text.TextUtils
 import android.util.TypedValue
 import android.view.ContextThemeWrapper
-import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView

app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt

 package chat.rocket.android.chatroom.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt

 package chat.rocket.android.chatroom.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.chatroom.presentation.ChatRoomView
 import chat.rocket.android.chatroom.ui.ChatRoomActivity

app/src/main/java/chat/rocket/android/chatroom/ui/ActionSnackbar.kt

 package chat.rocket.android.chatroom.ui
 
-import android.support.design.widget.BaseTransientBottomBar
-import android.support.v4.view.ViewCompat
+import com.google.android.material.snackbar.BaseTransientBottomBar
+import androidx.core.view.ViewCompat
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.view.LayoutInflater

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt

@@ -4,8 +4,8 @@ import DrawableHelper
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -8,11 +8,11 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.support.annotation.DrawableRes
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.DrawableRes
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.SpannableStringBuilder
 import android.view.*
 import androidx.core.text.bold
@@ -497,7 +497,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onEmojiAdded(emoji: Emoji) {
         val cursorPosition = text_message.selectionStart
         if (cursorPosition > -1) {
-            text_message.text.insert(cursorPosition, EmojiParser.parse(emoji.shortname))
+            text_message.text?.insert(cursorPosition, EmojiParser.parse(emoji.shortname))
             text_message.setSelection(cursorPosition + emoji.unicode.length)
         }
     }
@@ -505,7 +505,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onNonEmojiKeyPressed(keyCode: Int) {
         when (keyCode) {
             KeyEvent.KEYCODE_BACK -> with(text_message) {
-                if (selectionStart > 0) text.delete(selectionStart - 1, selectionStart)
+                if (selectionStart > 0) text?.delete(selectionStart - 1, selectionStart)
             }
             else -> throw IllegalArgumentException("pressed key not expected")
         }

app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/BottomSheetMenu.kt

 package chat.rocket.android.chatroom.ui.bottomsheet
 
-import android.support.design.widget.BottomSheetDialog
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.MenuItem
 import ru.whalemare.sheetmenu.SheetMenu
 import ru.whalemare.sheetmenu.adapter.MenuAdapter

app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/adapter/ListBottomSheetAdapter.kt

 package chat.rocket.android.chatroom.ui.bottomsheet.adapter
 
 import android.graphics.Color
-import android.support.annotation.ColorInt
-import android.support.annotation.IdRes
+import androidx.annotation.ColorInt
+import androidx.annotation.IdRes
 import android.util.SparseIntArray
 import android.view.MenuItem
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -4,7 +4,7 @@ import DateTimeHelper
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt

 package chat.rocket.android.chatrooms.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatrooms.presentation.ChatRoomsView
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.dagger.scope.PerFragment

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -4,8 +4,8 @@ import DateTimeHelper
 import DrawableHelper
 import android.content.Context
 import android.graphics.Color
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import android.view.View

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -5,12 +5,12 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.util.DiffUtil
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SearchView
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.appcompat.widget.SearchView
 import android.view.*
 import android.widget.CheckBox
 import android.widget.RadioGroup

app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt

 package chat.rocket.android.chatrooms.ui
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View

app/src/main/java/chat/rocket/android/core/behaviours/MessageView.kt

 package chat.rocket.android.core.behaviours
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 import chat.rocket.common.util.ifNull
 
 interface MessageView {

app/src/main/java/chat/rocket/android/core/lifecycle/CancelStrategy.kt

 package chat.rocket.android.core.lifecycle
 
-import android.arch.lifecycle.Lifecycle
-import android.arch.lifecycle.LifecycleObserver
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.OnLifecycleEvent
 import kotlinx.coroutines.experimental.Job
 import javax.inject.Inject
 

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -4,13 +4,11 @@ import android.app.Application
 import android.app.NotificationManager
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
-import android.arch.persistence.room.Room
 import android.content.ComponentName
 import android.content.Context
 import android.content.SharedPreferences
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
-import chat.rocket.android.app.RocketChatDatabase
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
@@ -65,12 +63,6 @@ class AppModule {
         }
     }
 
-    @Provides
-    @Singleton
-    fun provideRocketChatDatabase(context: Application): RocketChatDatabase {
-        return Room.databaseBuilder(context.applicationContext, RocketChatDatabase::class.java, "rocketchat-db").build()
-    }
-
     @Provides
     fun provideJob(): Job {
         return Job()
@@ -82,12 +74,6 @@ class AppModule {
         return application
     }
 
-    @Provides
-    @Singleton
-    fun provideServerDao(database: RocketChatDatabase): ServerDao {
-        return database.serverDao()
-    }
-
     @Provides
     @Singleton
     fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor {

app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt

@@ -3,8 +3,8 @@ package chat.rocket.android.helper
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 
 object AndroidPermissionsHelper {
 

app/src/main/java/chat/rocket/android/helper/EndlessRecyclerViewScrollListener.kt

 package chat.rocket.android.helper
 
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.StaggeredGridLayoutManager
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
 
 /**
  * Info: https://github.com/codepath/android_guides/wiki/Endless-Scrolling-with-AdapterViews-and-RecyclerView
@@ -45,7 +45,7 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
     // This happens many times a second during a scroll, so be wary of the code you place here.
     // We are given a few useful parameters to help us work out if we need to load some more data,
     // but first we check if we are waiting for the previous load to finish.
-    override fun onScrolled(view: RecyclerView?, dx: Int, dy: Int) {
+    override fun onScrolled(view: RecyclerView, dx: Int, dy: Int) {
         var lastVisibleItemPosition = 0
         val totalItemCount = layoutManager.itemCount
 
@@ -106,5 +106,5 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
     }
 
     // Defines the process for actually loading more data based on page
-    abstract fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView?)
+    abstract fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -6,7 +6,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
 import android.net.Uri
-import android.support.v4.content.res.ResourcesCompat
+import androidx.core.content.res.ResourcesCompat
 import android.text.Spanned
 import android.text.style.ClickableSpan
 import android.text.style.ReplacementSpan

app/src/main/java/chat/rocket/android/main/adapter/AccountViewHolder.kt

 package chat.rocket.android.main.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import chat.rocket.android.server.domain.model.Account
 import kotlinx.android.synthetic.main.item_account.view.*

app/src/main/java/chat/rocket/android/main/adapter/AccountsAdapter.kt

 package chat.rocket.android.main.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import chat.rocket.android.R
 import chat.rocket.android.server.domain.model.Account

app/src/main/java/chat/rocket/android/main/adapter/AddAccountViewHolder.kt

 package chat.rocket.android.main.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 
 class AddAccountViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/adapter/StatusViewHolder.kt

 package chat.rocket.android.main.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import chat.rocket.common.model.UserStatus
 import kotlinx.android.synthetic.main.item_change_status.view.*

app/src/main/java/chat/rocket/android/main/di/MainModule.kt

 package chat.rocket.android.main.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import android.content.Context
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -3,9 +3,9 @@ package chat.rocket.android.main.ui
 import android.app.Activity
 import android.app.AlertDialog
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Gravity
 import android.view.MenuItem
 import android.view.View

app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt

 package chat.rocket.android.members.adapter
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt

 package chat.rocket.android.members.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment

app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt

 package chat.rocket.android.members.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -11,7 +11,11 @@ import chat.rocket.android.util.extensions.setVisible
 import chat.rocket.android.util.extensions.textContent
 import kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
 
-fun newInstance(avatarUri: String, realName: String, username: String, email: String, utcOffset: String): BottomSheetDialogFragment {
+fun newInstance(avatarUri: String,
+                realName: String,
+                username: String,
+                email: String,
+                utcOffset: String): BottomSheetDialogFragment {
     return MemberBottomSheetFragment().apply {
         arguments = Bundle(1).apply {
             putString(BUNDLE_AVATAR_URI, avatarUri)

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

 package chat.rocket.android.members.ui
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View

app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt

 package chat.rocket.android.chatroom.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

 package chat.rocket.android.pinnedmessages.ui
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -72,12 +71,12 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
             if (recycler_view_pinned.adapter == null){
                 adapter = ChatRoomAdapter(chatRoomType,"",null,false)
                 recycler_view_pinned.adapter = adapter
-                val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL,false)
+                val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
                 recycler_view_pinned.layoutManager = linearLayoutManager
                 recycler_view_pinned.itemAnimator = DefaultItemAnimator()
                 if (pinnedMessages.size > 10){
                     recycler_view_pinned.addOnScrollListener(object : EndlessRecyclerViewScrollListener(linearLayoutManager){
-                        override fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView?) {
+                        override fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView) {
                             presenter.loadPinnedMessages(chatRoomId)
                         }
 

app/src/main/java/chat/rocket/android/profile/di/ProfileFragmentModule.kt

 package chat.rocket.android.profile.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.profile.presentation.ProfileView
 import chat.rocket.android.profile.ui.ProfileFragment

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -3,8 +3,8 @@ package chat.rocket.android.profile.ui
 import DrawableHelper
 import android.os.Build
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.view.ActionMode
+import androidx.fragment.app.Fragment
+import androidx.appcompat.view.ActionMode
 import android.view.*
 import chat.rocket.android.R
 import chat.rocket.android.main.ui.MainActivity

app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt

@@ -4,8 +4,8 @@ import android.app.NotificationManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v4.app.RemoteInput
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
 import android.widget.Toast
 import chat.rocket.android.R
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -12,10 +12,10 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Parcel
 import android.os.Parcelable
-import android.support.annotation.RequiresApi
-import android.support.v4.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
-import android.support.v4.app.RemoteInput
+import androidx.annotation.RequiresApi
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.RemoteInput
 import android.text.Html
 import android.text.Spanned
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/server/di/ChangeServerModule.kt

 package chat.rocket.android.server.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import chat.rocket.android.server.presentation.ChangeServerNavigator

app/src/main/java/chat/rocket/android/server/infraestructure/ServerDao.kt

-package chat.rocket.android.server.infraestructure
-
-import android.arch.persistence.room.*
-import io.reactivex.Single
-
-@Dao
-interface ServerDao {
-
-    @Query("SELECT * FROM server")
-    fun getServers(): Single<List<ServerEntity>>
-
-    @Insert(onConflict = OnConflictStrategy.FAIL)
-    fun insertServer(serverEntity: ServerEntity)
-
-    @Update
-    fun updateServer(serverEntity: ServerEntity)
-
-    @Delete
-    fun deleteServer(serverEntity: ServerEntity)
-
-    @Query("SELECT * FROM server WHERE id = :serverId")
-    fun getServer(serverId: Long?): Single<ServerEntity>
-}

app/src/main/java/chat/rocket/android/server/infraestructure/ServerEntity.kt

-package chat.rocket.android.server.infraestructure
-
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
-
-@Entity(tableName = "server", indices = [(Index(value = ["host"], unique = true))])
-data class ServerEntity(
-    @PrimaryKey(autoGenerate = true)
-    val id: Long,
-    val name: String,
-    val host: String,
-    val avatar: String
-)
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/ServerEntityMapper.kt

-package chat.rocket.android.server.infraestructure
-
-import chat.rocket.android.server.domain.model.Server
-import chat.rocket.android.util.DataToDomain
-
-class ServerEntityMapper : DataToDomain<ServerEntity, Server> {
-    override fun translate(data: ServerEntity): Server {
-        return Server(data.id, data.name, data.host, data.avatar)
-    }
-}

app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt

@@ -4,7 +4,7 @@ import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.server.presentation.ChangeServerPresenter
 import chat.rocket.android.server.presentation.ChangeServerView
 import chat.rocket.android.util.extensions.showToast

app/src/main/java/chat/rocket/android/settings/about/ui/AboutActivity.kt

 package chat.rocket.android.settings.about.ui
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.util.extensions.textContent

app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt

 package chat.rocket.android.settings.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.settings.presentation.SettingsView

app/src/main/java/chat/rocket/android/settings/password/di/PasswordFragmentModule.kt

 package chat.rocket.android.settings.password.di
 
-import android.arch.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.settings.password.presentation.PasswordView

app/src/main/java/chat/rocket/android/settings/password/ui/PasswordActivity.kt

 package chat.rocket.android.settings.password.ui
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.R
 import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.util.extensions.addFragment

app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt

 package chat.rocket.android.settings.password.ui
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.*
 import android.widget.Toast
 import chat.rocket.android.R
@@ -10,7 +10,7 @@ import chat.rocket.android.settings.password.presentation.PasswordView
 import chat.rocket.android.util.extensions.asObservable
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.textContent
-import android.support.v7.view.ActionMode
+import androidx.appcompat.view.ActionMode
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
@@ -19,7 +19,7 @@ import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.fragment_password.*
 import javax.inject.Inject
 
-class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.ActionMode.Callback {
+class PasswordFragment: Fragment(), PasswordView, ActionMode.Callback {
     @Inject lateinit var presenter: PasswordPresenter
     private var actionMode: ActionMode? = null
     private val disposables = CompositeDisposable()

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -2,8 +2,8 @@ package chat.rocket.android.settings.ui
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/util/extensions/Animation.kt

@@ -8,7 +8,7 @@ import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.View
 import android.view.ViewAnimationUtils
 import android.view.animation.AccelerateInterpolator

app/src/main/java/chat/rocket/android/util/extensions/Fragment.kt

 package chat.rocket.android.util.extensions
 
 import android.os.Looper
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
 import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

@@ -2,12 +2,12 @@ package chat.rocket.android.util.extensions
 
 import android.app.Activity
 import android.content.Context
-import android.support.annotation.LayoutRes
-import android.support.annotation.StringRes
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/util/extensions/View.kt

 package chat.rocket.android.util.extensions
 
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v4.content.res.ResourcesCompat
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.res.ResourcesCompat
 import android.view.View
 import chat.rocket.android.R
 

app/src/main/java/chat/rocket/android/webview/cas/ui/CasWebViewActivity.kt

@@ -6,7 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt

@@ -5,7 +5,7 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.core.net.toUri

app/src/main/java/chat/rocket/android/webview/ui/WebViewActivity.kt

@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/widget/DividerItemDecoration.kt

@@ -3,9 +3,9 @@ package chat.rocket.android.widget
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.drawable.Drawable
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 
 /**
  * Adds a default or custom divider to specific item views from the adapter's data set.

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/BaseSuggestionViewHolder.kt

 package chat.rocket.android.widget.autocompletion.ui
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/PopupRecyclerView.kt

 package chat.rocket.android.widget.autocompletion.ui
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.AttributeSet
 import android.util.DisplayMetrics
 import android.view.WindowManager
@@ -11,9 +11,9 @@ import chat.rocket.android.R
 internal class PopupRecyclerView : RecyclerView {
 
     private var displayWidth: Int = 0
-    constructor(context: Context?) : this(context, null)
-    constructor(context: Context?, attrs: AttributeSet?) : this(context, attrs, 0)
-    constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle) {
         val wm = context!!.getSystemService(Context.WINDOW_SERVICE) as WindowManager
         val display = wm.defaultDisplay
         val size = DisplayMetrics()

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsAdapter.kt

 package chat.rocket.android.widget.autocompletion.ui
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 import chat.rocket.android.widget.autocompletion.strategy.CompletionStrategy
 import chat.rocket.android.widget.autocompletion.strategy.regex.StringMatchingCompletionStrategy

app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsView.kt

@@ -4,13 +4,13 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import android.support.annotation.DrawableRes
-import android.support.transition.Slide
-import android.support.transition.TransitionManager
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.DrawableRes
+import androidx.transition.Slide
+import androidx.transition.TransitionManager
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.text.Editable
 import android.text.InputType
 import android.text.TextWatcher

app/src/main/java/chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt

 package chat.rocket.android.widget.emoji
 
-import android.support.v4.view.PagerAdapter
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.viewpager.widget.PagerAdapter
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/chat/rocket/android/widget/emoji/ComposerEditText.kt

 package chat.rocket.android.widget.emoji
 
 import android.content.Context
-import android.support.v7.widget.AppCompatEditText
+import androidx.appcompat.widget.AppCompatEditText
 import android.util.AttributeSet
 import android.view.KeyEvent
 
@@ -16,7 +16,7 @@ class ComposerEditText : AppCompatEditText {
         isLongClickable = true
     }
 
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, android.support.v7.appcompat.R.attr.editTextStyle)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, androidx.appcompat.R.attr.editTextStyle)
 
     constructor(context: Context) : this(context, null)
 

app/src/main/java/chat/rocket/android/widget/emoji/EmojiCategory.kt

 package chat.rocket.android.widget.emoji
 
-import android.support.annotation.DrawableRes
+import androidx.annotation.DrawableRes
 import android.text.SpannableString
 import android.text.Spanned
 import chat.rocket.android.R

app/src/main/java/chat/rocket/android/widget/emoji/EmojiKeyboardPopup.kt

 package chat.rocket.android.widget.emoji
 
 import android.content.Context
-import android.support.design.widget.TabLayout
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
+import com.google.android.material.tabs.TabLayout
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.KeyEvent

app/src/main/java/chat/rocket/android/widget/emoji/EmojiPickerPopup.kt

@@ -3,8 +3,8 @@ package chat.rocket.android.widget.emoji
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
-import android.support.design.widget.TabLayout
-import android.support.v4.view.ViewPager
+import com.google.android.material.tabs.TabLayout
+import androidx.viewpager.widget.ViewPager
 import android.view.LayoutInflater
 import android.view.Window
 import android.view.WindowManager

app/src/main/res/layout/about_view.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -50,4 +50,4 @@
         android:layout_marginTop="8dp"
         android:textColor="@color/colorSecondaryText"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/activity_main.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.drawerlayout.widget.DrawerLayout 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/drawer_layout"
@@ -29,14 +29,14 @@
         android:layout_height="match_parent"
         android:layout_gravity="start">
 
-        <android.support.design.widget.NavigationView
+        <com.google.android.material.navigation.NavigationView
             android:id="@+id/view_navigation"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             app:headerLayout="@layout/nav_header"
             app:menu="@menu/navigation" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/accounts_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -47,4 +47,4 @@
             android:visibility="gone" />
     </FrameLayout>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file

app/src/main/res/layout/app_bar.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/colorPrimary"
     android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -14,4 +14,4 @@
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

app/src/main/res/layout/app_bar_chat_room.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout 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"
@@ -7,7 +7,7 @@
     android:background="@color/colorPrimary"
     android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -16,7 +16,7 @@
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/toolbar_content_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
                 android:textSize="18sp"
                 android:textStyle="bold"
                 tools:text="Developers" />
-        </android.support.constraint.ConstraintLayout>
-    </android.support.v7.widget.Toolbar>
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.appcompat.widget.Toolbar>
 
-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

app/src/main/res/layout/app_bar_password.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.appbar.AppBarLayout 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"
@@ -7,7 +7,7 @@
     android:background="@color/colorPrimary"
     android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -30,6 +30,6 @@
                 android:textStyle="bold"
                 tools:text="@string/title_password" />
         </RelativeLayout>
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

app/src/main/res/layout/avatar_profile.xml

 <?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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -14,4 +14,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:roundedCornerRadius="2dp" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/emoji_category_layout.xml

 <?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:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/emojiRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -25,4 +25,4 @@
         android:textSize="16sp"
         android:visibility="gone"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

app/src/main/res/layout/emoji_keyboard.xml

 <?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"
     android:id="@+id/emoji_keyboard_container"
     android:layout_width="match_parent"
@@ -59,4 +59,4 @@
             android:src="@drawable/ic_backspace_gray_24dp" />
     </RelativeLayout>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/emoji_picker.xml

@@ -7,7 +7,7 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         android:id="@+id/tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -16,7 +16,7 @@
         app:tabMaxWidth="48dp"
         app:tabMode="scrollable" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager_categories"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/fragment_authentication_log_in.xml

@@ -8,7 +8,7 @@
     android:fillViewport="true"
     tools:context=".authentication.login.ui.LoginFragment">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -208,7 +208,7 @@
                 tools:visibility="gone" />
         </LinearLayout>
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/button_fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -231,6 +231,6 @@
             android:text="@string/title_log_in"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent" />
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file

app/src/main/res/layout/fragment_chat_room.xml

 <?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/root_layout"
@@ -142,4 +142,4 @@
         tools:text="connected"
         tools:visibility="visible" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_chat_rooms.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".chatrooms.ui.ChatRoomsFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

app/src/main/res/layout/fragment_member_bottom_sheet.xml

 <?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/member_bottom_sheet"
@@ -85,4 +85,4 @@
         app:layout_constraintTop_toBottomOf="@+id/text_utc"
         tools:text="+01:00" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_members.xml

 <?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: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"
     tools:context=".members.ui.MembersFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -21,4 +21,4 @@
         app:indicatorColor="@color/black"
         app:indicatorName="BallPulseIndicator" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file