diff --git a/app/build.gradle b/app/build.gradle
index 64b29df2ae..f7de2b4b4d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@ android {
         versionName "1.3.0"
         vectorDrawables.useSupportLibrary = true
         // for unit test
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
                 YOUTUBE_API_KEY: YOUTUBE_API_KEY
         ]
@@ -119,14 +119,14 @@ androidExtensions {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    implementation "com.android.support:appcompat-v7:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:exifinterface:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:recyclerview-v7:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:design:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:cardview-v7:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:support-v4:${rootConfiguration.supportLibraryVersion}"
-    implementation "com.android.support:customtabs:${rootConfiguration.supportLibraryVersion}"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation "androidx.exifinterface:exifinterface:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "com.google.android.material:material:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.browser:browser:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //piechart
     implementation "com.github.PhilJay:MPAndroidChart:${rootConfiguration.mpAndroidChartVersion}"
@@ -158,10 +158,10 @@ dependencies {
     //Unit Test
     testImplementation "junit:junit:${rootConfiguration.jUnitVersion}"
     testImplementation "org.mockito:mockito-core:${rootConfiguration.mockitoCoreVersion}"
-    androidTestImplementation "com.android.support:support-annotations:${rootConfiguration.supportLibraryVersion}"
-    androidTestImplementation "com.android.support.test:runner:${rootConfiguration.testVersion}"
-    androidTestImplementation "com.android.support.test:rules:${rootConfiguration.testVersion}"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:${rootConfiguration.espressoVersion}"
+    androidTestImplementation "androidx.annotation:annotation:1.0.0"
+    androidTestImplementation "androidx.test:runner:1.1.0"
+    androidTestImplementation "androidx.test:rules:1.1.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.1.0"
 
     //realm adapter
     implementation "io.realm:android-adapters:${rootConfiguration.realmVersion}"
@@ -182,6 +182,8 @@ dependencies {
     implementation "com.google.android.gms:play-services-auth:${rootConfiguration.playServiceAuthVersion}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootConfiguration.kotlinVersion}"
 
+    implementation "org.jetbrains.kotlin:kotlin-reflect:1.1.0"
+
     //Stetho
     debugImplementation "com.facebook.stetho:stetho:${rootConfiguration.stethoVersion}"
 
diff --git a/app/config.gradle b/app/config.gradle
index d743e20f2e..7bfa55798d 100644
--- a/app/config.gradle
+++ b/app/config.gradle
@@ -7,7 +7,7 @@ ext {
     supportLibraryVersion = '28.0.0'
     leakCanaryVersion = '1.6.2'
     mpAndroidChartVersion = 'v3.0.3'
-    butterKnifeVersion = '9.0.0-rc1'
+    butterKnifeVersion = '10.1.0'
     retrofitVersion = '2.4.0'
     okHttpVersion = '3.12.0'
     linkPreviewVersion = '1.0.9'
diff --git a/app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt b/app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt
index a78dfdcbfb..482ac2a805 100644
--- a/app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt
+++ b/app/src/androidTest/java/org/fossasia/susi/ai/chat/ChatActivityTest.kt
@@ -1,15 +1,15 @@
 package org.fossasia.susi.ai.chat
 
 import android.Manifest
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.filters.LargeTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.rule.GrantPermissionRule
-import android.support.test.runner.AndroidJUnit4
 import android.view.WindowManager
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
 import java.io.IOException
 import org.fossasia.susi.ai.R
 import org.junit.Before
@@ -25,7 +25,7 @@ import timber.log.Timber
  * Created by collinx on 22-10-2017.
  */
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 @LargeTest
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 class ChatActivityTest {
diff --git a/app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt b/app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt
index bb98c51750..ab15f358bd 100644
--- a/app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt
+++ b/app/src/androidTest/java/org/fossasia/susi/ai/login/LoginActivityTest.kt
@@ -1,16 +1,16 @@
 package org.fossasia.susi.ai.login
 
 import android.Manifest
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.scrollTo
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.rule.GrantPermissionRule
-import android.support.test.runner.AndroidJUnit4
 import android.view.WindowManager
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.MediumTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
+import androidx.test.rule.GrantPermissionRule
 import java.io.IOException
 import org.fossasia.susi.ai.R
 import org.junit.Before
@@ -24,7 +24,7 @@ import timber.log.Timber
  * Created by collinx on 22-10-2017.
  */
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 @MediumTest
 class LoginActivityTest {
 
diff --git a/app/src/androidTest/java/org/fossasia/susi/ai/login/WelcomeActivityTest.kt b/app/src/androidTest/java/org/fossasia/susi/ai/login/WelcomeActivityTest.kt
index 1c31e2e5fb..081979bd7a 100644
--- a/app/src/androidTest/java/org/fossasia/susi/ai/login/WelcomeActivityTest.kt
+++ b/app/src/androidTest/java/org/fossasia/susi/ai/login/WelcomeActivityTest.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.login
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
 import android.view.WindowManager
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.MediumTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
 import java.io.IOException
 import org.fossasia.susi.ai.R
 import org.junit.Before
@@ -20,7 +20,7 @@ import timber.log.Timber
  * Created by collinx on 22-10-2017.
  */
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 @MediumTest
 class WelcomeActivityTest {
     @Rule
diff --git a/app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt b/app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt
index 8733b08e9a..a99b22ab58 100644
--- a/app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt
+++ b/app/src/androidTest/java/org/fossasia/susi/ai/signup/SignUpActivityTest.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.signup
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.scrollTo
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
 import android.view.WindowManager
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.MediumTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
 import java.io.IOException
 import org.fossasia.susi.ai.R
 import org.junit.Before
@@ -21,7 +21,7 @@ import timber.log.Timber
  * Created by collinx on 22-10-2017.
  */
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 @MediumTest
 class SignUpActivityTest {
 
diff --git a/app/src/androidTest/java/org/fossasia/susi/ai/skills/SkillsActivityTest.kt b/app/src/androidTest/java/org/fossasia/susi/ai/skills/SkillsActivityTest.kt
index f959435e41..3aede19b7c 100644
--- a/app/src/androidTest/java/org/fossasia/susi/ai/skills/SkillsActivityTest.kt
+++ b/app/src/androidTest/java/org/fossasia/susi/ai/skills/SkillsActivityTest.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.skills
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.filters.LargeTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
 import android.view.WindowManager
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.filters.LargeTest
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import androidx.test.rule.ActivityTestRule
 import java.io.IOException
 import org.fossasia.susi.ai.R
 import org.junit.Before
@@ -20,7 +20,7 @@ import timber.log.Timber
  * Created by collinx on 16-10-2017.
  */
 
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 @LargeTest
 class SkillsActivityTest {
 
diff --git a/app/src/main/java/kotterknife/ButterKnife.kt b/app/src/main/java/kotterknife/ButterKnife.kt
index 90b900dae6..64ef13eeb8 100644
--- a/app/src/main/java/kotterknife/ButterKnife.kt
+++ b/app/src/main/java/kotterknife/ButterKnife.kt
@@ -1,13 +1,15 @@
+@file:Suppress("DEPRECATION", "RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "UNUSED_ANONYMOUS_PARAMETER")
+
 package kotterknife
 
 import android.app.Activity
 import android.app.Dialog
 import android.app.DialogFragment
 import android.app.Fragment
-import android.support.v4.app.DialogFragment as SupportDialogFragment
-import android.support.v4.app.Fragment as SupportFragment
-import android.support.v7.widget.RecyclerView.ViewHolder
 import android.view.View
+import androidx.fragment.app.DialogFragment as SupportDialogFragment
+import androidx.fragment.app.Fragment as SupportFragment
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import kotlin.properties.ReadOnlyProperty
 import kotlin.reflect.KProperty
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/MainApplication.kt b/app/src/main/java/org/fossasia/susi/ai/MainApplication.kt
index ad6657c34e..b355cf36b4 100644
--- a/app/src/main/java/org/fossasia/susi/ai/MainApplication.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/MainApplication.kt
@@ -2,8 +2,8 @@ package org.fossasia.susi.ai
 
 import android.annotation.SuppressLint
 import android.app.Application
-import android.support.v7.app.AppCompatDelegate
 import android.util.Log
+import androidx.appcompat.app.AppCompatDelegate
 import com.facebook.stetho.Stetho
 import com.squareup.leakcanary.LeakCanary
 import io.realm.Realm
@@ -24,7 +24,6 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-
         if (LeakCanary.isInAnalyzerProcess(this)) {
             // This process is dedicated to LeakCanary for heap analysis.
             // You should not init your app in this process.
@@ -34,7 +33,7 @@ class MainApplication : Application() {
 
         instance = this
         // The Realm file will be located in Context.getFilesDir() with name "default.realm"
-        Realm.init(this)
+        Realm.init(applicationContext)
         val config = RealmConfiguration.Builder().deleteRealmIfMigrationNeeded().build()
         Realm.setDefaultConfiguration(config)
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt b/app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt
index 8bed4744f1..5f97dbf92e 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UNUSED_ANONYMOUS_PARAMETER")
+
 package org.fossasia.susi.ai.chat
 
 import ai.kitt.snowboy.MsgEnum
@@ -21,13 +23,6 @@ import android.os.Message
 import android.speech.RecognizerIntent
 import android.speech.tts.TextToSpeech
 import android.speech.tts.UtteranceProgressListener
-import android.support.design.widget.Snackbar
-import android.support.v4.app.ActivityCompat
-import android.support.v4.view.GestureDetectorCompat
-import android.support.v4.view.ViewCompat
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.text.Editable
 import android.text.InputType
 import android.text.TextWatcher
@@ -40,6 +35,11 @@ import android.view.animation.OvershootInterpolator
 import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.view.GestureDetectorCompat
+import androidx.core.view.ViewCompat
+import com.google.android.material.snackbar.Snackbar
 import io.realm.RealmResults
 import java.util.Locale
 import kotlinx.android.synthetic.main.activity_chat.*
@@ -88,6 +88,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
         }
     }
 
+    @SuppressLint("RestrictedApi")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_chat)
@@ -312,7 +313,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
     }
 
     override fun setupAdapter(chatMessageDatabaseList: RealmResults<ChatMessage>) {
-        val linearLayoutManager = LinearLayoutManager(this)
+        val linearLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
         linearLayoutManager.stackFromEnd = true
 
         rv_chat_feed.layoutManager = linearLayoutManager
@@ -337,9 +338,9 @@ class ChatActivity : AppCompatActivity(), IChatView {
             }
         }
 
-        rv_chat_feed.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        rv_chat_feed.addOnScrollListener(object : androidx.recyclerview.widget.RecyclerView.OnScrollListener() {
             @SuppressLint("RestrictedApi")
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+            override fun onScrolled(recyclerView: androidx.recyclerview.widget.RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
 
                 if (linearLayoutManager.findLastCompletelyVisibleItemPosition() < rv_chat_feed.adapter?.itemCount!!.minus(5)) {
@@ -365,6 +366,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
     }
 
     // Take user's speech as input and send the message
+    @SuppressLint("RestrictedApi")
     override fun promptSpeechInput() {
         if (recordingThread != null) {
             chatPresenter.stopHotwordDetection()
@@ -380,6 +382,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
     }
 
     // Replies user with Speech
+    @SuppressLint("RestrictedApi")
     override fun voiceReply(reply: String, language: String) {
         searchChat.visibility = View.VISIBLE
         fabsetting.visibility = View.VISIBLE
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt b/app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt
index 5eaecc639d..ddc9db650a 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt
@@ -8,13 +8,13 @@ import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
 import android.speech.tts.TextToSpeech
-import android.support.annotation.NonNull
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.NonNull
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import java.util.Locale
 import kotlinx.android.synthetic.main.activity_chat.*
 import kotlinx.android.synthetic.main.fragment_sttframe.*
@@ -28,7 +28,7 @@ import timber.log.Timber
 /**
  * Created by meeera on 17/8/17.
  */
-class STTFragment : Fragment() {
+class STTFragment : androidx.fragment.app.Fragment() {
     lateinit var recognizer: SpeechRecognizer
     lateinit var chatPresenter: IChatPresenter
     private val thisActivity = activity
@@ -85,7 +85,7 @@ class STTFragment : Fragment() {
     private fun setupCommands(rootView: View) {
         var voiceCommand = getResources().getStringArray(R.array.voiceCommands)
         var voiceCommandsList = voiceCommand.toCollection(ArrayList())
-        rootView.clickableCommands.layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+        rootView.clickableCommands.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
         rootView.clickableCommands.adapter = VoiceCommandsAdapter(voiceCommandsList, activity)
     }
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/ChatFeedRecyclerAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/ChatFeedRecyclerAdapter.kt
index 6d6ff39fb7..411a7329b0 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/ChatFeedRecyclerAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/ChatFeedRecyclerAdapter.kt
@@ -4,7 +4,6 @@ import android.app.AlertDialog
 import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Drawable
-import android.support.v7.widget.RecyclerView
 import android.text.method.LinkMovementMethod
 import android.util.Pair
 import android.util.Patterns
@@ -14,6 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.OrderedRealmCollection
 import io.realm.Realm
 import io.realm.RealmChangeListener
@@ -44,11 +44,11 @@ class ChatFeedRecyclerAdapter(
     private val currContext: Context,
     data: OrderedRealmCollection<ChatMessage>?,
     autoUpdate: Boolean
-) : RealmRecyclerViewAdapter<ChatMessage, RecyclerView.ViewHolder>(data, autoUpdate),
+) : RealmRecyclerViewAdapter<ChatMessage, androidx.recyclerview.widget.RecyclerView.ViewHolder>(data, autoUpdate),
     MessageViewHolder.ClickListener {
     private var realm: Realm? = null
     private var lastMsgCount: Int = 0
-    private var recyclerView: RecyclerView? = null
+    private var recyclerView: androidx.recyclerview.widget.RecyclerView? = null
     private val clickListener: MessageViewHolder.ClickListener
     // For typing dots from Susi
     private val dotsHolder: TypingDotsHolder
@@ -87,21 +87,21 @@ class ChatFeedRecyclerAdapter(
         isSusiTyping = false
     }
 
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
+    override fun onAttachedToRecyclerView(recyclerView: androidx.recyclerview.widget.RecyclerView) {
         super.onAttachedToRecyclerView(recyclerView)
 
         this.recyclerView = recyclerView
         realm = Realm.getDefaultInstance()
     }
 
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
+    override fun onDetachedFromRecyclerView(recyclerView: androidx.recyclerview.widget.RecyclerView) {
         super.onDetachedFromRecyclerView(recyclerView)
 
         this.recyclerView = null
         realm?.close()
     }
 
-    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
 
         val inflater = LayoutInflater.from(viewGroup.context)
         val view: View
@@ -243,7 +243,7 @@ class ChatFeedRecyclerAdapter(
         } else null
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
         if (holder is ChatViewHolder) {
             holder.setView(data?.get(position), getItemViewType(position), currContext)
             holder.chatTextView.movementMethod = LinkMovementMethod()
@@ -319,7 +319,7 @@ class ChatFeedRecyclerAdapter(
     }
 
     @Suppress("DEPRECATION")
-    private fun setBackGroundColor(holder: RecyclerView.ViewHolder, isSelected: Boolean, isUserMessage: Boolean) {
+    private fun setBackGroundColor(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, isSelected: Boolean, isUserMessage: Boolean) {
         if (holder is ChatViewHolder) {
             if (isUserMessage)
                 holder.backgroundLayout.setBackgroundDrawable(if (isSelected)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/SearchResultsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/SearchResultsAdapter.kt
index 8b0c4915bc..c35fd78363 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/SearchResultsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/SearchResultsAdapter.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.chat.adapters.recycleradapters
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
 import android.text.Html
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.adapters.viewholders.RssViewHolder
 import org.fossasia.susi.ai.rest.responses.susi.Datum
@@ -15,7 +15,7 @@ import org.fossasia.susi.ai.rest.responses.susi.Datum
  */
 
 class SearchResultsAdapter(context: Context, private val datumList: List<Datum?>?) :
-    RecyclerView.Adapter<RssViewHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<RssViewHolder>() {
     private val inflater: LayoutInflater = LayoutInflater.from(context)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RssViewHolder {
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/TableAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/TableAdapter.kt
index ab4ddc7a19..2e84f592a8 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/TableAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/TableAdapter.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.chat.adapters.recycleradapters
 
 import android.content.Context
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import java.util.ArrayList
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.adapters.viewholders.TabViewHolder
@@ -17,7 +17,7 @@ class TableAdapter(
     private val column: List<String?>,
     private val data: List<String?>
 ) :
-    RecyclerView.Adapter<TabViewHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<TabViewHolder>() {
     private lateinit var context: Context
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TabViewHolder {
@@ -32,7 +32,7 @@ class TableAdapter(
             smallData.add(data[column.size * position + columnFlag])
         }
 
-        val manager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        val manager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         holder.view.layoutManager = manager
         val verticalRecyclerAdapter = VerticalRecyclerAdapter(context, column, smallData)
         holder.view.adapter = verticalRecyclerAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VerticalRecyclerAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VerticalRecyclerAdapter.kt
index f6eb2efb21..e508746e03 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VerticalRecyclerAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VerticalRecyclerAdapter.kt
@@ -2,13 +2,13 @@ package org.fossasia.susi.ai.chat.adapters.recycleradapters
 
 import android.content.Context
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v7.widget.RecyclerView
 import android.text.Html
 import android.util.Patterns
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.adapters.viewholders.VerticalCellViewHolder
 import timber.log.Timber
@@ -21,7 +21,7 @@ class VerticalRecyclerAdapter(
     private val cols: List<String?>,
     private val data: List<String?>
 ) :
-    RecyclerView.Adapter<VerticalCellViewHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<VerticalCellViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VerticalCellViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.table_recylcer_item, parent, false)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VoiceCommandsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VoiceCommandsAdapter.kt
index 16e046c050..4e6dbb8c25 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VoiceCommandsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VoiceCommandsAdapter.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.chat.adapters.recycleradapters
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.activity_chat.btnSpeak
 import kotlinx.android.synthetic.main.activity_chat.fabsetting
 import kotlinx.android.synthetic.main.activity_chat.searchChat
@@ -16,7 +16,7 @@ import org.fossasia.susi.ai.chat.ChatActivity
 import org.fossasia.susi.ai.chat.ChatPresenter
 import org.fossasia.susi.ai.chat.contract.IChatPresenter
 
-class VoiceCommandsAdapter(val items: ArrayList<String>, val context: Context?) : RecyclerView.Adapter<VoiceCommandsAdapter.ViewHolder>() {
+class VoiceCommandsAdapter(val items: ArrayList<String>, val context: Context?) : androidx.recyclerview.widget.RecyclerView.Adapter<VoiceCommandsAdapter.ViewHolder>() {
     lateinit var chatPresenter: IChatPresenter
 
     override fun onCreateViewHolder(parent: ViewGroup, p1: Int): ViewHolder {
@@ -33,7 +33,7 @@ class VoiceCommandsAdapter(val items: ArrayList<String>, val context: Context?)
         return items.size
     }
 
-    inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    inner class ViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
         val voiceCommand: TextView = view.voiceCommand
 
         init {
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/WebSearchAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/WebSearchAdapter.kt
index 7f00b0ca58..0f53b43ff3 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/WebSearchAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/WebSearchAdapter.kt
@@ -2,11 +2,11 @@ package org.fossasia.susi.ai.chat.adapters.recycleradapters
 
 import android.content.Context
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.adapters.viewholders.SearchResultHolder
@@ -20,7 +20,7 @@ class WebSearchAdapter(
     private val context: Context,
     private val searchResults: List<WebSearchModel?>?
 ) :
-    RecyclerView.Adapter<SearchResultHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<SearchResultHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/DateViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/DateViewHolder.kt
index 572a4487c7..97809c55b3 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/DateViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/DateViewHolder.kt
@@ -1,12 +1,12 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class DateViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class DateViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val textDate: TextView by bindView(R.id.date)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ImageViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ImageViewHolder.kt
index 70ba6a47a1..d04eb11b30 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ImageViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ImageViewHolder.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v4.content.ContextCompat
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.ContextCompat
 import butterknife.ButterKnife
 import com.squareup.picasso.Picasso
 import kotterknife.bindView
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/LinkPreviewViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/LinkPreviewViewHolder.kt
index 66de64f630..8ad0539f6b 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/LinkPreviewViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/LinkPreviewViewHolder.kt
@@ -3,7 +3,6 @@ package org.fossasia.susi.ai.chat.adapters.viewholders
 import android.content.Context
 import android.net.Uri
 import android.os.Build
-import android.support.customtabs.CustomTabsIntent
 import android.text.Html
 import android.text.Spanned
 import android.text.TextUtils
@@ -12,6 +11,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.browser.customtabs.CustomTabsIntent
 import butterknife.ButterKnife
 import com.squareup.picasso.Picasso
 import io.github.ponnamkarthik.richlinkpreview.MetaData
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MapViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MapViewHolder.kt
index bec2f634d8..a70bae0172 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MapViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MapViewHolder.kt
@@ -3,10 +3,10 @@ package org.fossasia.susi.ai.chat.adapters.viewholders
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.support.customtabs.CustomTabsIntent
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
@@ -16,7 +16,7 @@ import org.fossasia.susi.ai.helper.AndroidHelper
 import org.fossasia.susi.ai.helper.MapHelper
 import timber.log.Timber
 
-class MapViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class MapViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val mapImage: ImageView by bindView(R.id.map_image)
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MessageViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MessageViewHolder.kt
index 8dd543ef7f..8d516d99e7 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MessageViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/MessageViewHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.Toast
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.Realm
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
@@ -19,7 +19,7 @@ import retrofit2.Response
 import timber.log.Timber
 
 abstract class MessageViewHolder(itemView: View, private val listener: ClickListener?) :
-        RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener {
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener, View.OnLongClickListener {
 
     init {
         itemView.setOnClickListener(this)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/RssViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/RssViewHolder.kt
index db9d8c28c8..89b1dd2e21 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/RssViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/RssViewHolder.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class RssViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class RssViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
     val linkTextView: TextView by bindView(R.id.link)
     val titleTextView: TextView by bindView(R.id.title)
     val descriptionTextView: TextView by bindView(R.id.description)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultHolder.kt
index 4a3c0c7bb2..c6c26e7100 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultHolder.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class SearchResultHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class SearchResultHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val previewImageView: ImageView by bindView(R.id.link_preview_image)
     val titleTextView: TextView by bindView(R.id.link_preview_title)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultsListHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultsListHolder.kt
index b31a9b5fed..089aa17400 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultsListHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/SearchResultsListHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
 import android.content.Context
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.LinearLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.Realm
 import io.realm.RealmList
 import kotterknife.bindView
@@ -21,9 +21,9 @@ import retrofit2.Callback
 import retrofit2.Response
 import timber.log.Timber
 
-class SearchResultsListHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class SearchResultsListHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
-    val recyclerView: RecyclerView by bindView(R.id.recycler_view)
+    val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recycler_view)
     val backgroundLayout: LinearLayout by bindView(R.id.background_layout)
     private var webquery: String? = null
     private val realm: Realm = Realm.getDefaultInstance()
@@ -89,8 +89,8 @@ class SearchResultsListHolder(itemView: View) : RecyclerView.ViewHolder(itemView
                                     webSearch.url = null
                                     searchResults.add(webSearch)
                                 }
-                                val layoutManager = LinearLayoutManager(currContext,
-                                        LinearLayoutManager.HORIZONTAL, false)
+                                val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(currContext,
+                                        androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
                                 recyclerView.layoutManager = layoutManager
                                 val resultsAdapter = WebSearchAdapter(currContext, searchResults)
                                 recyclerView.adapter = resultsAdapter
@@ -108,8 +108,8 @@ class SearchResultsListHolder(itemView: View) : RecyclerView.ViewHolder(itemView
                         }
                     })
                 } else {
-                    val layoutManager = LinearLayoutManager(currContext,
-                            LinearLayoutManager.HORIZONTAL, false)
+                    val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(currContext,
+                            androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
                     recyclerView.layoutManager = layoutManager
                     val resultsAdapter = WebSearchAdapter(currContext, webSearchList)
                     recyclerView.adapter = resultsAdapter
@@ -120,8 +120,8 @@ class SearchResultsListHolder(itemView: View) : RecyclerView.ViewHolder(itemView
             }
         } else {
             if (model != null) {
-                val layoutManager = LinearLayoutManager(currContext,
-                        LinearLayoutManager.HORIZONTAL, false)
+                val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(currContext,
+                        androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
                 recyclerView.layoutManager = layoutManager
                 val resultsAdapter = SearchResultsAdapter(currContext, model.datumRealmList)
                 recyclerView.adapter = resultsAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TabViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TabViewHolder.kt
index b57d7a76d0..dad6e8ea27 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TabViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TabViewHolder.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class TabViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class TabViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
-    val view: RecyclerView by bindView(R.id.parentLayout)
+    val view: androidx.recyclerview.widget.RecyclerView by bindView(R.id.parentLayout)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TableViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TableViewHolder.kt
index 11f87cdeb9..0142852a15 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TableViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TableViewHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import butterknife.ButterKnife
 import java.util.ArrayList
 import kotterknife.bindView
@@ -19,7 +19,7 @@ import timber.log.Timber
  */
 class TableViewHolder(itemView: View, clickListener: ClickListener) : MessageViewHolder(itemView, clickListener) {
 
-    val recyclerView: RecyclerView by bindView(R.id.recyclerView)
+    val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
     val timeStamp: TextView by bindView(R.id.timestamp)
 
     init {
@@ -52,7 +52,7 @@ class TableViewHolder(itemView: View, clickListener: ClickListener) : MessageVie
                 }
 
                 // Set the layout manager for the recyclerview and and call the TableAdapter to attach the recyclerview elements
-                val layoutManager = LinearLayoutManager(itemView.context, LinearLayoutManager.HORIZONTAL,
+                val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(itemView.context, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL,
                         false)
                 recyclerView.layoutManager = layoutManager
                 val tableAdapter = TableAdapter(column, data)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TypingDotsHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TypingDotsHolder.kt
index 0409e4f2af..201fa9e9eb 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TypingDotsHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/TypingDotsHolder.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.LinearLayout
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 import pl.tajchert.waitingdots.DotsTextView
 
-class TypingDotsHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class TypingDotsHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val dotsTextView: DotsTextView by bindView(R.id.dots)
     val backgroundLayout: LinearLayout by bindView(R.id.background_layout)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/VerticalCellViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/VerticalCellViewHolder.kt
index 22a51c6331..aff0eb5be6 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/VerticalCellViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/VerticalCellViewHolder.kt
@@ -1,12 +1,12 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class VerticalCellViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class VerticalCellViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val column: TextView by bindView(R.id.column)
     val data: TextView by bindView(R.id.data_item)
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/YoutubeVideoViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/YoutubeVideoViewHolder.kt
index df01fe580c..8cdb61c2d7 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/YoutubeVideoViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/YoutubeVideoViewHolder.kt
@@ -1,8 +1,8 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v4.content.ContextCompat
 import android.view.View
 import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import com.squareup.picasso.Picasso
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ZeroHeightHolder.kt b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ZeroHeightHolder.kt
index a3a0200e12..7bd6ad9629 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ZeroHeightHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/adapters/viewholders/ZeroHeightHolder.kt
@@ -1,12 +1,12 @@
 package org.fossasia.susi.ai.chat.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.RelativeLayout
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class ZeroHeightHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class ZeroHeightHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val chatMessage: RelativeLayout by bindView(R.id.chatMessageView)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/search/ChatSearchActivity.kt b/app/src/main/java/org/fossasia/susi/ai/chat/search/ChatSearchActivity.kt
index cc591351aa..943cb17bd6 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/search/ChatSearchActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/search/ChatSearchActivity.kt
@@ -2,11 +2,11 @@ package org.fossasia.susi.ai.chat.search
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.Realm
 import kotlinx.android.synthetic.main.activity_chat_search.search_not_found
 import org.fossasia.susi.ai.R
@@ -21,8 +21,8 @@ class ChatSearchActivity : AppCompatActivity() {
     private var query: String = ""
 
     val searchChat: ArrayList<SearchDataFormat> = ArrayList()
-    private var chatSearchRecyclerView: RecyclerView? = null
-    private var chatSearchAdapter: RecyclerView.Adapter<*>? = null
+    private var chatSearchRecyclerView: androidx.recyclerview.widget.RecyclerView? = null
+    private var chatSearchAdapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,7 +38,7 @@ class ChatSearchActivity : AppCompatActivity() {
     // Initialise the recylerview and sends the array list to it.
     fun viewQueryString() {
         chatSearchRecyclerView = findViewById(R.id.search_chat_feed)
-        var mLayoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+        var mLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(this, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         chatSearchRecyclerView?.layoutManager = mLayoutManager
         chatSearchAdapter = ChatSearchAdapter(searchChat)
         chatSearchRecyclerView?.adapter = chatSearchAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/chat/search/adapters/ChatSearchAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/chat/search/adapters/ChatSearchAdapter.kt
index 9fae0f376a..c103b44304 100644
--- a/app/src/main/java/org/fossasia/susi/ai/chat/search/adapters/ChatSearchAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/chat/search/adapters/ChatSearchAdapter.kt
@@ -1,15 +1,15 @@
 package org.fossasia.susi.ai.chat.search.adapters
 
 import android.graphics.Color
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.search.SearchDataFormat
 
-class ChatSearchAdapter(private val searchDataList: ArrayList<SearchDataFormat>) : RecyclerView.Adapter<ChatSearchAdapter.ViewHolder>() {
+class ChatSearchAdapter(private val searchDataList: ArrayList<SearchDataFormat>) : androidx.recyclerview.widget.RecyclerView.Adapter<ChatSearchAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.item_chat_search, viewGroup, false)
@@ -32,7 +32,7 @@ class ChatSearchAdapter(private val searchDataList: ArrayList<SearchDataFormat>)
         holder.user_message_date.text = searchDataList[p1].date
     }
 
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         internal var user_message: TextView
         internal var user_message_date: TextView
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/DeviceActivity.kt b/app/src/main/java/org/fossasia/susi/ai/device/DeviceActivity.kt
index 73b6146c3c..de1e820588 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/DeviceActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/DeviceActivity.kt
@@ -3,8 +3,8 @@ package org.fossasia.susi.ai.device
 import android.content.Context
 import android.net.wifi.WifiManager
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.connecteddevices.ConnectedDeviceFragment
 import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectFragment
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDeviceFragment.kt b/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDeviceFragment.kt
index 3ce0398893..527c378685 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDeviceFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/ConnectedDeviceFragment.kt
@@ -2,12 +2,12 @@ package org.fossasia.susi.ai.device.connecteddevices
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_connected_device.deviceStatus
 import kotlinx.android.synthetic.main.fragment_connected_device.refresh_device_layout
 import org.fossasia.susi.ai.R
@@ -21,11 +21,11 @@ import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDevicePre
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDeviceView
 import org.fossasia.susi.ai.rest.responses.susi.Device
 
-class ConnectedDeviceFragment : Fragment(), IConnectedDeviceView {
+class ConnectedDeviceFragment : androidx.fragment.app.Fragment(), IConnectedDeviceView {
 
-    private lateinit var connectedDeviceRecyclerView: RecyclerView
+    private lateinit var connectedDeviceRecyclerView: androidx.recyclerview.widget.RecyclerView
     private lateinit var connectedDevicePresenter: IConnectedDevicePresenter
-    private var connectedDevicesAdapter: RecyclerView.Adapter<*>? = null
+    private var connectedDevicesAdapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>? = null
     private val connectedDeviceList: ArrayList<Device> = ArrayList()
     private val macIdList: MutableList<String> = ArrayList()
 
@@ -78,7 +78,7 @@ class ConnectedDeviceFragment : Fragment(), IConnectedDeviceView {
     }
 
     fun showDevices() {
-        val layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         connectedDeviceRecyclerView.layoutManager = layoutManager
         connectedDevicesAdapter = ConnectedDevicesAdapter(connectedDeviceList, connectedDevicePresenter)
         connectedDeviceRecyclerView.adapter = connectedDevicesAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/adapters/ConnectedDevicesAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/adapters/ConnectedDevicesAdapter.kt
index 1a86731159..69562984cc 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/adapters/ConnectedDevicesAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/connecteddevices/adapters/ConnectedDevicesAdapter.kt
@@ -1,15 +1,15 @@
 package org.fossasia.susi.ai.device.connecteddevices.adapters
 
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.connecteddevices.contract.IConnectedDevicePresenter
 import org.fossasia.susi.ai.rest.responses.susi.Device
 
-class ConnectedDevicesAdapter(private val connectedDevicesList: ArrayList<Device>, val connectedDevicePresenter: IConnectedDevicePresenter) : RecyclerView.Adapter<ConnectedDevicesAdapter.ViewHolder>() {
+class ConnectedDevicesAdapter(private val connectedDevicesList: ArrayList<Device>, val connectedDevicePresenter: IConnectedDevicePresenter) : androidx.recyclerview.widget.RecyclerView.Adapter<ConnectedDevicesAdapter.ViewHolder>() {
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(viewGroup.context).inflate(R.layout.item_speaker, viewGroup, false)
@@ -24,7 +24,7 @@ class ConnectedDevicesAdapter(private val connectedDevicesList: ArrayList<Device
         holder.speaker_room.text = connectedDevicesList[p1].room.toString().trim() + " Speaker"
     }
 
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         internal var speaker_room: TextView
 
         init {
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt
index 92db1f77d5..9f26dd236b 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/DeviceConnectFragment.kt
@@ -1,6 +1,7 @@
 package org.fossasia.susi.ai.device.deviceconnect
 
 import android.Manifest
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.DialogInterface
@@ -13,17 +14,17 @@ import android.net.wifi.WifiManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.Realm
 import kotlinx.android.synthetic.main.connect_susiai_speaker.cancel_susiai_connection
 import kotlinx.android.synthetic.main.connect_susiai_speaker.cannot_connect_susiai
@@ -83,7 +84,7 @@ import timber.log.Timber
  * Created on 11/07/18
  * Fragment that displays the UI to connect to the device
  */
-class DeviceConnectFragment : Fragment(), IDeviceConnectView {
+class DeviceConnectFragment : androidx.fragment.app.Fragment(), IDeviceConnectView {
 
     lateinit var deviceConnectPresenter: IDeviceConnectPresenter
     lateinit var mainWifi: WifiManager
@@ -96,8 +97,8 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
     private var checkDevice: Boolean = false
     private lateinit var realm: Realm
     private val availableRoomsList: ArrayList<AvailableRoomsFormat> = ArrayList()
-    private lateinit var availableRoomsRecyclerView: RecyclerView
-    private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
+    private lateinit var availableRoomsRecyclerView: androidx.recyclerview.widget.RecyclerView
+    private var availableRoomsAdapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>? = null
     private var roomNameSelected: String? = null
     private lateinit var rootView: View
     private var showWifiList: Boolean = false
@@ -133,6 +134,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
         context?.registerReceiver(receiverWifi, filter)
     }
 
+    @SuppressLint("RestrictedApi")
     override fun connectionMainScreen() {
         connection_susiai_main_screen.visibility = View.VISIBLE
         showWifi.visibility = View.GONE
@@ -195,6 +197,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
     }
 
     // Prompt password for selected wifi
+    @SuppressLint("RestrictedApi")
     override fun selectedWifi(wifiName: String) {
         addDeviceButton.visibility = View.GONE
         deviceList.visibility = View.GONE
@@ -217,6 +220,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
     }
 
     // Function to show available rooms in the 3rd step
+    @SuppressLint("RestrictedApi")
     override fun rooms() {
         stopProgress()
         room.visibility = View.VISIBLE
@@ -368,7 +372,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
                 availableRoomsList.add(roomsAvailable)
             }
         }
-        var layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         availableRoomsRecyclerView.layoutManager = layoutManager
         availableRoomsAdapter = RoomsAdapter(availableRoomsList, requireContext(), deviceConnectPresenter)
         availableRoomsRecyclerView.adapter = availableRoomsAdapter
@@ -433,7 +437,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
         wifiList.visibility = View.GONE
         scanHelp.visibility = View.GONE
         deviceList.visibility = View.VISIBLE
-        deviceList.layoutManager = LinearLayoutManager(context)
+        deviceList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
         deviceList.setHasFixedSize(true)
         recyclerAdapter = DevicesAdapter(scanList, deviceConnectPresenter, VIEW_AVAILABLE_DEVICES)
         deviceList.adapter = recyclerAdapter
@@ -539,6 +543,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
         }
     }
 
+    @SuppressLint("RestrictedApi")
     override fun setupWiFiAdapter(scanList: ArrayList<String>) {
         if (showWifiList) {
             Timber.d("Setup Wifi adapter")
@@ -550,7 +555,7 @@ class DeviceConnectFragment : Fragment(), IDeviceConnectView {
             addDeviceButton.visibility = View.GONE
             wifiList.visibility = View.VISIBLE
             showWifi.visibility = View.VISIBLE
-            wifiList.layoutManager = LinearLayoutManager(context)
+            wifiList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context)
             wifiList.setHasFixedSize(true)
             recyclerAdapter = DevicesAdapter(scanList, deviceConnectPresenter, VIEW_AVAILABLE_WIFI)
             wifiList.adapter = recyclerAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/DevicesAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/DevicesAdapter.kt
index e13052dd7f..e940980f17 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/DevicesAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/DevicesAdapter.kt
@@ -1,17 +1,17 @@
 package org.fossasia.susi.ai.device.deviceconnect.adapters.recycleradapters
 
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectPresenter
 import org.fossasia.susi.ai.device.deviceconnect.adapters.viewholders.DeviceViewHolder
 import org.fossasia.susi.ai.device.deviceconnect.adapters.viewholders.WifiViewHolder
 import org.fossasia.susi.ai.device.deviceconnect.contract.IDeviceConnectPresenter
 
-class DevicesAdapter(private val itemList: List<String>, private val devicePresenter: IDeviceConnectPresenter, private val viewCode: Int) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class DevicesAdapter(private val itemList: List<String>, private val devicePresenter: IDeviceConnectPresenter, private val viewCode: Int) : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
         return if (viewCode == 1) {
             val deviceLayout = LayoutInflater.from(parent.context).inflate(R.layout.device_layout, parent, false)
             DeviceViewHolder(deviceLayout, devicePresenter as DeviceConnectPresenter)
@@ -21,7 +21,7 @@ class DevicesAdapter(private val itemList: List<String>, private val devicePrese
         }
     }
 
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
         if (holder is DeviceViewHolder) {
             val ssid = itemList[position]
             holder.speakerName.text = ssid
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/RoomsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/RoomsAdapter.kt
index 89e326aed5..57ff90ada6 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/RoomsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/recycleradapters/RoomsAdapter.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.device.deviceconnect.adapters.recycleradapters
 
 import android.content.Context
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.room_recycler_layout.view.delete_room
 import kotlinx.android.synthetic.main.room_recycler_layout.view.image_tick
 import kotlinx.android.synthetic.main.room_recycler_layout.view.room_text
@@ -13,7 +13,7 @@ import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectFragment
 import org.fossasia.susi.ai.device.deviceconnect.contract.IDeviceConnectPresenter
 
-class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragment.AvailableRoomsFormat>, val context: Context, private val deviceConnectPresenter: IDeviceConnectPresenter) : RecyclerView.Adapter<RoomsAdapter.ViewHolder>() {
+class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragment.AvailableRoomsFormat>, val context: Context, private val deviceConnectPresenter: IDeviceConnectPresenter) : androidx.recyclerview.widget.RecyclerView.Adapter<RoomsAdapter.ViewHolder>() {
 
     private var selectedIndex: Int = -1
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
@@ -36,7 +36,7 @@ class RoomsAdapter(private val availableRoomsList: ArrayList<DeviceConnectFragme
         holder.itemView.room_text.text = availableRoomsList[p1].room
     }
 
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
         init {
             var roomNameClicked: String? = null
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/DeviceViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/DeviceViewHolder.kt
index 42e5fda3ba..b8633f9b60 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/DeviceViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/DeviceViewHolder.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.device.deviceconnect.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectPresenter
 
-class DeviceViewHolder(itemView: View, private var devicePresenter: DeviceConnectPresenter) : RecyclerView.ViewHolder(itemView) {
+class DeviceViewHolder(itemView: View, private var devicePresenter: DeviceConnectPresenter) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val speakerName: TextView by bindView(R.id.speakerName)
     val setUp: TextView by bindView(R.id.speakerSetUp)
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/WifiViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/WifiViewHolder.kt
index ca6831d25c..91839608d6 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/WifiViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/deviceconnect/adapters/viewholders/WifiViewHolder.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.device.deviceconnect.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.device.deviceconnect.DeviceConnectPresenter
 
-class WifiViewHolder(itemView: View, private var devicePresenter: DeviceConnectPresenter) : RecyclerView.ViewHolder(itemView) {
+class WifiViewHolder(itemView: View, private var devicePresenter: DeviceConnectPresenter) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val wifiName: TextView by bindView(R.id.wifi_name)
     val layout: LinearLayout by bindView(R.id.layout_wifi)
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/managedevices/ManageDeviceActivity.kt b/app/src/main/java/org/fossasia/susi/ai/device/managedevices/ManageDeviceActivity.kt
index ab8fe0f54e..717ee99bb2 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/managedevices/ManageDeviceActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/managedevices/ManageDeviceActivity.kt
@@ -1,8 +1,8 @@
 package org.fossasia.susi.ai.device.managedevices
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
 import org.fossasia.susi.ai.R
 
 class ManageDeviceActivity : AppCompatActivity() {
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/managedevices/MusicServersFragment.kt b/app/src/main/java/org/fossasia/susi/ai/device/managedevices/MusicServersFragment.kt
index 029159f0f5..7e416e5f50 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/managedevices/MusicServersFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/managedevices/MusicServersFragment.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.device.managedevices
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import org.fossasia.susi.ai.R
 
-class MusicServersFragment : Fragment() {
+class MusicServersFragment : androidx.fragment.app.Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDeviceFragment.kt b/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDeviceFragment.kt
index a76294d72d..5a8653532b 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDeviceFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/ViewDeviceFragment.kt
@@ -3,13 +3,13 @@ package org.fossasia.susi.ai.device.viewdevice
 import android.app.ProgressDialog
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import io.realm.Realm
 import kotlinx.android.synthetic.main.edit_name_layout.name_cancel
 import kotlinx.android.synthetic.main.edit_name_layout.name_new
@@ -37,7 +37,7 @@ import org.fossasia.susi.ai.helper.Constant
 import org.fossasia.susi.ai.helper.PrefManager
 import org.fossasia.susi.ai.rest.responses.susi.Device
 
-class ViewDeviceFragment : Fragment(), IViewDeviceView {
+class ViewDeviceFragment : androidx.fragment.app.Fragment(), IViewDeviceView {
 
     private lateinit var macId: String
     private lateinit var name: String
@@ -46,8 +46,8 @@ class ViewDeviceFragment : Fragment(), IViewDeviceView {
     private lateinit var longitude: String
     private lateinit var realm: Realm
     private val availableRoomsList: ArrayList<AvailableRoomsFormat> = ArrayList()
-    private lateinit var availableRoomsRecyclerView: RecyclerView
-    private var availableRoomsAdapter: RecyclerView.Adapter<*>? = null
+    private lateinit var availableRoomsRecyclerView: androidx.recyclerview.widget.RecyclerView
+    private var availableRoomsAdapter: androidx.recyclerview.widget.RecyclerView.Adapter<*>? = null
     private var roomNameSelected: String? = null
     private lateinit var viewDevicePresenter: ViewDevicePresenter
     private lateinit var progressDialog: ProgressDialog
@@ -159,7 +159,7 @@ class ViewDeviceFragment : Fragment(), IViewDeviceView {
                 availableRoomsList.add(roomsAvailable)
             }
         }
-        var layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        var layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         availableRoomsRecyclerView.layoutManager = layoutManager
         availableRoomsAdapter = ShowRoomsAdapter(availableRoomsList, requireContext(), viewDevicePresenter)
         availableRoomsRecyclerView.adapter = availableRoomsAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/adapters/ShowRoomsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/adapters/ShowRoomsAdapter.kt
index 7d304e1da7..2efde0b58d 100644
--- a/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/adapters/ShowRoomsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/device/viewdevice/adapters/ShowRoomsAdapter.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.device.viewdevice.adapters
 
 import android.content.Context
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.room_recycler_layout.view.delete_room
 import kotlinx.android.synthetic.main.room_recycler_layout.view.image_tick
 import kotlinx.android.synthetic.main.room_recycler_layout.view.room_text
@@ -18,7 +18,7 @@ class ShowRoomsAdapter(
     val context: Context,
     private val viewDevicePresenter: IViewDevicePresenter
 ) :
-    RecyclerView.Adapter<ShowRoomsAdapter.ViewHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<ShowRoomsAdapter.ViewHolder>() {
 
     private var selectedIndex: Int = -1
 
@@ -42,7 +42,7 @@ class ShowRoomsAdapter(
         return availableRoomsList.size
     }
 
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
         init {
             itemView.delete_room.setOnClickListener {
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/AlertboxHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/AlertboxHelper.kt
index da92f29ed3..339f6dac8f 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/AlertboxHelper.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/AlertboxHelper.kt
@@ -2,7 +2,7 @@ package org.fossasia.susi.ai.helper
 
 import android.app.Activity
 import android.content.DialogInterface
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 
 /**
  * <h1>Helper class to display alert dialog boxes</h1>
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/ConstraintsHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/ConstraintsHelper.kt
index bd8926bc4c..00239bd566 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/ConstraintsHelper.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/ConstraintsHelper.kt
@@ -2,20 +2,20 @@ package org.fossasia.susi.ai.helper
 
 import android.content.Context
 import android.graphics.Rect
-import android.support.v7.widget.RecyclerView
 import android.util.TypedValue
 import android.view.View
+import androidx.recyclerview.widget.RecyclerView
 
 /**
  * Created by mayanktripathi on 22/06/17.
  */
 
-class ConstraintsHelper(dimension: Int, context: Context) : RecyclerView.ItemDecoration() {
+class ConstraintsHelper(dimension: Int, context: Context) : androidx.recyclerview.widget.RecyclerView.ItemDecoration() {
 
     private val space: Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dimension.toFloat(),
             context.resources.displayMetrics).toInt()
 
-    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: androidx.recyclerview.widget.RecyclerView, state: androidx.recyclerview.widget.RecyclerView.State) {
         super.getItemOffsets(outRect, view, parent, state)
         if (parent.getChildAdapterPosition(view) == state.itemCount - 1 && outRect.right < space) {
             outRect.right = space
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt
index 31a9b79a44..6f7fff3af0 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/CredentialHelper.kt
@@ -1,9 +1,9 @@
 package org.fossasia.susi.ai.helper
 
 import android.content.Context
-import android.support.design.widget.TextInputLayout
 import android.text.TextUtils
 import android.util.Patterns
+import com.google.android.material.textfield.TextInputLayout
 import java.net.URL
 import java.util.regex.Pattern
 import org.fossasia.susi.ai.R
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/LocationHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/LocationHelper.kt
index 548c143ee6..9129e6c7dd 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/LocationHelper.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/LocationHelper.kt
@@ -10,7 +10,7 @@ import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
 import android.os.IBinder
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
 import java.lang.ref.WeakReference
 import timber.log.Timber
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/MediaUtil.kt b/app/src/main/java/org/fossasia/susi/ai/helper/MediaUtil.kt
index c99ba65126..8d28379f91 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/MediaUtil.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/MediaUtil.kt
@@ -6,7 +6,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.media.MediaRecorder
 import android.speech.RecognizerIntent
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
 import java.io.File
 import java.io.IOException
 import timber.log.Timber
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/SimpleDividerItemDecoration.kt b/app/src/main/java/org/fossasia/susi/ai/helper/SimpleDividerItemDecoration.kt
index 3d23fdcfdc..f443e421d0 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/SimpleDividerItemDecoration.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/SimpleDividerItemDecoration.kt
@@ -2,14 +2,14 @@ package org.fossasia.susi.ai.helper
 
 import android.content.Context
 import android.graphics.Canvas
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.RecyclerView
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 
-class SimpleDividerItemDecoration(context: Context, private val drawDividerFromIndex: Int) : RecyclerView.ItemDecoration() {
+class SimpleDividerItemDecoration(context: Context, private val drawDividerFromIndex: Int) : androidx.recyclerview.widget.RecyclerView.ItemDecoration() {
     private val divider = ContextCompat.getDrawable(context, R.drawable.rv_divider)
 
-    override fun onDrawOver(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+    override fun onDrawOver(canvas: Canvas, parent: androidx.recyclerview.widget.RecyclerView, state: androidx.recyclerview.widget.RecyclerView.State) {
         val left = parent.paddingLeft
         val right = parent.width - parent.paddingRight
 
@@ -17,7 +17,7 @@ class SimpleDividerItemDecoration(context: Context, private val drawDividerFromI
         for (i in drawDividerFromIndex until childCount) {
             val child = parent.getChildAt(i)
 
-            val params = child.layoutParams as RecyclerView.LayoutParams
+            val params = child.layoutParams as androidx.recyclerview.widget.RecyclerView.LayoutParams
 
             val top = child.bottom + params.bottomMargin
             val bottom = top + (divider?.intrinsicHeight ?: 0)
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/SnackbarBehavior.kt b/app/src/main/java/org/fossasia/susi/ai/helper/SnackbarBehavior.kt
index 96fcfe18ca..281d6c2363 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/SnackbarBehavior.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/SnackbarBehavior.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.helper
 
 import android.content.Context
-import android.support.design.widget.CoordinatorLayout
-import android.support.design.widget.Snackbar
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.google.android.material.snackbar.Snackbar
 
 /**
  * <h1>Helper class for snackbar behaviour.</h1>
@@ -20,22 +20,22 @@ class SnackbarBehavior
  * *
  * @param attrs the attrs
  */
-(context: Context, attrs: AttributeSet) : CoordinatorLayout.Behavior<ViewGroup>(context, attrs) {
+(context: Context, attrs: AttributeSet) : androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior<ViewGroup>(context, attrs) {
 
-    override fun layoutDependsOn(parent: CoordinatorLayout, child: ViewGroup, dependency: View): Boolean {
+    override fun layoutDependsOn(parent: androidx.coordinatorlayout.widget.CoordinatorLayout, child: ViewGroup, dependency: View): Boolean {
         return dependency is Snackbar.SnackbarLayout
     }
 
-    override fun onDependentViewChanged(parent: CoordinatorLayout, child: ViewGroup, dependency: View): Boolean {
-        val params = child.layoutParams as CoordinatorLayout.LayoutParams
+    override fun onDependentViewChanged(parent: androidx.coordinatorlayout.widget.CoordinatorLayout, child: ViewGroup, dependency: View): Boolean {
+        val params = child.layoutParams as androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams
         params.bottomMargin = parent.height - dependency.y.toInt()
         child.layoutParams = params
         return true
     }
 
-    override fun onDependentViewRemoved(parent: CoordinatorLayout, child: ViewGroup, dependency: View) {
+    override fun onDependentViewRemoved(parent: androidx.coordinatorlayout.widget.CoordinatorLayout, child: ViewGroup, dependency: View) {
         val params = child.layoutParams
-        if (params is CoordinatorLayout.LayoutParams) params.bottomMargin = 0
+        if (params is androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams) params.bottomMargin = 0
         child.layoutParams = params
     }
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/helper/StartSnapHelper.kt b/app/src/main/java/org/fossasia/susi/ai/helper/StartSnapHelper.kt
index 44ee3668be..2945947455 100644
--- a/app/src/main/java/org/fossasia/susi/ai/helper/StartSnapHelper.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/helper/StartSnapHelper.kt
@@ -1,27 +1,27 @@
 package org.fossasia.susi.ai.helper
 
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.LinearSnapHelper
-import android.support.v7.widget.OrientationHelper
-import android.support.v7.widget.RecyclerView
 import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearSnapHelper
+import androidx.recyclerview.widget.OrientationHelper
+import androidx.recyclerview.widget.RecyclerView
 
 /**
  * Created by robinkamboj on 04/01/18.
  */
 
-class StartSnapHelper : LinearSnapHelper() {
+class StartSnapHelper : androidx.recyclerview.widget.LinearSnapHelper() {
 
-    private var verticalHelper: OrientationHelper? = null
-    private var horizontalHelper: OrientationHelper? = null
+    private var verticalHelper: androidx.recyclerview.widget.OrientationHelper? = null
+    private var horizontalHelper: androidx.recyclerview.widget.OrientationHelper? = null
 
     @Throws(IllegalStateException::class)
-    override fun attachToRecyclerView(recyclerView: RecyclerView?) {
+    override fun attachToRecyclerView(recyclerView: androidx.recyclerview.widget.RecyclerView?) {
         super.attachToRecyclerView(recyclerView)
     }
 
     override fun calculateDistanceToFinalSnap(
-        layoutManager: RecyclerView.LayoutManager,
+        layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager,
         targetView: View
     ): IntArray? {
         val out = IntArray(2)
@@ -40,9 +40,9 @@ class StartSnapHelper : LinearSnapHelper() {
         return out
     }
 
-    override fun findSnapView(layoutManager: RecyclerView.LayoutManager): View? {
+    override fun findSnapView(layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager): View? {
 
-        return if (layoutManager is LinearLayoutManager) {
+        return if (layoutManager is androidx.recyclerview.widget.LinearLayoutManager) {
 
             if (layoutManager.canScrollHorizontally()) {
                 getStartView(layoutManager, getHorizontalHelper(layoutManager))
@@ -52,22 +52,22 @@ class StartSnapHelper : LinearSnapHelper() {
         } else super.findSnapView(layoutManager)
     }
 
-    private fun distanceToStart(targetView: View, helper: OrientationHelper): Int {
+    private fun distanceToStart(targetView: View, helper: androidx.recyclerview.widget.OrientationHelper): Int {
         return helper.getDecoratedStart(targetView) - helper.startAfterPadding
     }
 
     private fun getStartView(
-        layoutManager: RecyclerView.LayoutManager,
-        helper: OrientationHelper
+        layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager,
+        helper: androidx.recyclerview.widget.OrientationHelper
     ): View? {
 
-        if (layoutManager is LinearLayoutManager) {
+        if (layoutManager is androidx.recyclerview.widget.LinearLayoutManager) {
             val firstChild = layoutManager.findFirstVisibleItemPosition()
 
             val isLastItem = layoutManager
                     .findLastCompletelyVisibleItemPosition() == layoutManager.getItemCount() - 1
 
-            if (firstChild == RecyclerView.NO_POSITION || isLastItem) {
+            if (firstChild == androidx.recyclerview.widget.RecyclerView.NO_POSITION || isLastItem) {
                 return null
             }
 
@@ -87,16 +87,16 @@ class StartSnapHelper : LinearSnapHelper() {
         return super.findSnapView(layoutManager)
     }
 
-    private fun getVerticalHelper(layoutManager: RecyclerView.LayoutManager): OrientationHelper {
+    private fun getVerticalHelper(layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager): androidx.recyclerview.widget.OrientationHelper {
         if (verticalHelper == null) {
-            verticalHelper = OrientationHelper.createVerticalHelper(layoutManager)
+            verticalHelper = androidx.recyclerview.widget.OrientationHelper.createVerticalHelper(layoutManager)
         }
         return verticalHelper!!
     }
 
-    private fun getHorizontalHelper(layoutManager: RecyclerView.LayoutManager): OrientationHelper {
+    private fun getHorizontalHelper(layoutManager: androidx.recyclerview.widget.RecyclerView.LayoutManager): androidx.recyclerview.widget.OrientationHelper {
         if (horizontalHelper == null) {
-            horizontalHelper = OrientationHelper.createHorizontalHelper(layoutManager)
+            horizontalHelper = androidx.recyclerview.widget.OrientationHelper.createHorizontalHelper(layoutManager)
         }
         return horizontalHelper!!
     }
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/ForgotPass.kt b/app/src/main/java/org/fossasia/susi/ai/login/ForgotPass.kt
index 997ac9c73d..9ed4a23396 100644
--- a/app/src/main/java/org/fossasia/susi/ai/login/ForgotPass.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/login/ForgotPass.kt
@@ -1,7 +1,7 @@
 package org.fossasia.susi.ai.login
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import org.fossasia.susi.ai.R
 
 class ForgotPass : AppCompatActivity() {
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt
index 2bd5447893..a5b4516c82 100644
--- a/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/login/LoginActivity.kt
@@ -6,11 +6,11 @@ import android.app.ProgressDialog
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.auth.api.credentials.Credential
 import kotlinx.android.synthetic.main.activity_login.*
 import org.fossasia.susi.ai.R
diff --git a/app/src/main/java/org/fossasia/susi/ai/login/WelcomeActivity.kt b/app/src/main/java/org/fossasia/susi/ai/login/WelcomeActivity.kt
index 67b010a25d..a27b0bcc1e 100644
--- a/app/src/main/java/org/fossasia/susi/ai/login/WelcomeActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/login/WelcomeActivity.kt
@@ -4,26 +4,26 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import android.support.design.widget.TabLayout
-import android.support.v4.view.PagerAdapter
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.helper.PrefManager
 
 class WelcomeActivity : AppCompatActivity() {
 
-    private var imageViewPager: ViewPager? = null
+    private var imageViewPager: androidx.viewpager.widget.ViewPager? = null
     private var layouts: IntArray? = null
     private var skip: Button? = null
     private var next: Button? = null
 
-    private val viewPagerPageChangeListener = object : ViewPager.OnPageChangeListener {
+    private val viewPagerPageChangeListener = object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
 
         override fun onPageSelected(position: Int) {
             if (position == layouts?.size?.minus(1)) {
@@ -61,7 +61,7 @@ class WelcomeActivity : AppCompatActivity() {
                 WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_welcome)
 
-        imageViewPager = findViewById<View>(R.id.pager) as ViewPager
+        imageViewPager = findViewById<View>(R.id.pager) as androidx.viewpager.widget.ViewPager
         val tabLayout = findViewById<View>(R.id.tabDots) as TabLayout
         tabLayout.setupWithViewPager(imageViewPager, true)
         skip = findViewById(R.id.btn_skip)
@@ -98,7 +98,7 @@ class WelcomeActivity : AppCompatActivity() {
         finish()
     }
 
-    inner class MyViewPagerAdapter : PagerAdapter() {
+    inner class MyViewPagerAdapter : androidx.viewpager.widget.PagerAdapter() {
         private var layoutInflater: LayoutInflater? = null
 
         override fun instantiateItem(container: ViewGroup, position: Int): Any {
diff --git a/app/src/main/java/org/fossasia/susi/ai/signup/SignUpActivity.kt b/app/src/main/java/org/fossasia/susi/ai/signup/SignUpActivity.kt
index 567afc2b02..cbb87961c2 100644
--- a/app/src/main/java/org/fossasia/susi/ai/signup/SignUpActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/signup/SignUpActivity.kt
@@ -7,10 +7,10 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_sign_up.*
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.ChatActivity
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt b/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
index 612db10bce..15d8e60d06 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/SkillsActivity.kt
@@ -5,15 +5,15 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.speech.RecognizerIntent
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
 import java.util.Locale
 import kotlin.collections.ArrayList
 import org.fossasia.susi.ai.R
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/aboutus/AboutUsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/aboutus/AboutUsFragment.kt
index eaa099d3c9..9c9e5e2f99 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/aboutus/AboutUsFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/aboutus/AboutUsFragment.kt
@@ -2,19 +2,19 @@ package org.fossasia.susi.ai.skills.aboutus
 
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.NonNull
-import android.support.v4.app.Fragment
 import android.text.Html
 import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.fragment.app.Fragment
 import kotlinx.android.synthetic.main.fragment_about_us.*
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.skills.SkillsActivity
 
-class AboutUsFragment : Fragment() {
+class AboutUsFragment : androidx.fragment.app.Fragment() {
 
     @NonNull
     override fun onCreateView(
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/FeedbackActivity.kt b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/FeedbackActivity.kt
index 61da507cc8..43264085c2 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/FeedbackActivity.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/FeedbackActivity.kt
@@ -1,9 +1,9 @@
 package org.fossasia.susi.ai.skills.feedback
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
 import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_feedback.rvAllFeedback
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.rest.responses.susi.Feedback
@@ -24,7 +24,7 @@ class FeedbackActivity : AppCompatActivity() {
         if (feedbackResponse != null) {
             title = feedbackResponse.skillName.capitalize() + " " + getString(R.string.reviews)
             if (!arrangedFeedbackList.isEmpty()) {
-                val layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+                val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
                 rvAllFeedback.setHasFixedSize(true)
                 rvAllFeedback.layoutManager = layoutManager
                 rvAllFeedback.adapter = AllReviewsAdapter(this, arrangedFeedbackList)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/recycleradapters/AllReviewsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/recycleradapters/AllReviewsAdapter.kt
index 1277f05325..f00a28b764 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/recycleradapters/AllReviewsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/recycleradapters/AllReviewsAdapter.kt
@@ -1,11 +1,11 @@
 package org.fossasia.susi.ai.skills.feedback.adapters.recycleradapters
 
 import android.content.Context
-import android.support.annotation.NonNull
-import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.helper.Utils
 import org.fossasia.susi.ai.rest.responses.susi.Feedback
@@ -19,7 +19,7 @@ class AllReviewsAdapter(
     val context: Context,
     private val feedbackList: List<Feedback>?
 ) :
-    RecyclerView.Adapter<AllReviewsViewHolder>() {
+    androidx.recyclerview.widget.RecyclerView.Adapter<AllReviewsViewHolder>() {
 
     @NonNull
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AllReviewsViewHolder {
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/viewholders/AllReviewsViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/viewholders/AllReviewsViewHolder.kt
index aae6f5d942..82d97e7995 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/viewholders/AllReviewsViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/feedback/adapters/viewholders/AllReviewsViewHolder.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.skills.feedback.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class AllReviewsViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class AllReviewsViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val itemFeedback: LinearLayout by bindView(R.id.itemFeedback)
     val avatar: ImageView by bindView(R.id.avatar)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsFragment.kt
index 5f35f3e4b2..ae398e18e5 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/GroupWiseSkillsFragment.kt
@@ -1,17 +1,18 @@
 package org.fossasia.susi.ai.skills.groupwiseskills
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.NonNull
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SnapHelper
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.NonNull
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.SnapHelper
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.shimmer.ShimmerFrameLayout
 import kotlin.collections.ArrayList
 import kotlinx.android.synthetic.main.fragment_group_wise_skill_listing.*
@@ -31,8 +32,8 @@ import timber.log.Timber
  *
  * Created by arundhati24 on 16/07/2018.
  */
-class GroupWiseSkillsFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLayout.OnRefreshListener {
-    private lateinit var skillAdapterSnapHelper: SnapHelper
+class GroupWiseSkillsFragment : androidx.fragment.app.Fragment(), IGroupWiseSkillsView, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
+    private lateinit var skillAdapterSnapHelper: androidx.recyclerview.widget.SnapHelper
     private lateinit var groupWiseSkillsPresenter: IGroupWiseSkillsPresenter
     private var skills = GroupWiseSkills("", ArrayList())
     private lateinit var skillsAdapter: SkillsListAdapter
@@ -63,6 +64,7 @@ class GroupWiseSkillsFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLa
         return rootView
     }
 
+    @SuppressLint("RestrictedApi")
     @NonNull
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         activity?.title = this.skills.group
@@ -82,8 +84,8 @@ class GroupWiseSkillsFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLa
 
     private fun setUPAdapter() {
         skillAdapterSnapHelper = StartSnapHelper()
-        val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
         groupWiseSkills.layoutManager = layoutManager
         skillsAdapter = SkillsListAdapter(requireContext(), skills, skillCallback)
         groupWiseSkills.adapter = skillsAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/recycleradapters/SkillsListAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/recycleradapters/SkillsListAdapter.kt
index 584feea69c..00b45dee2e 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/recycleradapters/SkillsListAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/recycleradapters/SkillsListAdapter.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.skills.groupwiseskills.adapters.recycleradapters
 
 import android.content.Context
-import android.support.annotation.NonNull
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.dataclasses.GroupWiseSkills
@@ -22,7 +22,7 @@ class SkillsListAdapter(
     private val skillDetails: GroupWiseSkills,
     private val skillCallback: SkillFragmentCallback
 ) :
-        RecyclerView.Adapter<SkillViewHolder>(), SkillViewHolder.ClickListener {
+        androidx.recyclerview.widget.RecyclerView.Adapter<SkillViewHolder>(), SkillViewHolder.ClickListener {
 
     private val DEFAULT_AUTHOR = "<author_name>"
     private val DEFAULT_EXAMPLE = "<The question that should be shown in public skill displays>"
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/viewholders/SkillViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/viewholders/SkillViewHolder.kt
index 2222a4f2a7..2bd47b2cfa 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/viewholders/SkillViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/groupwiseskills/adapters/viewholders/SkillViewHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.skills.groupwiseskills.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.RatingBar
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
@@ -15,7 +15,7 @@ class SkillViewHolder(
     itemView: View,
     private val listener: ClickListener?
 ) :
-    RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
     val skillImage: ImageView by bindView(R.id.skill_image)
     val skillName: TextView by bindView(R.id.skill_name)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/help/HelpFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/help/HelpFragment.kt
index f49c472cc7..5412d05ad7 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/help/HelpFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/help/HelpFragment.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.skills.help
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import org.fossasia.susi.ai.R
 
-class HelpFragment : Fragment() {
+class HelpFragment : androidx.fragment.app.Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
     }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/privacy/PrivacyFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/privacy/PrivacyFragment.kt
index 81b8e465a6..aee6e22e2e 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/privacy/PrivacyFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/privacy/PrivacyFragment.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.skills.privacy
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import org.fossasia.susi.ai.R
 
-class PrivacyFragment : Fragment() {
+class PrivacyFragment : androidx.fragment.app.Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt
index c6733bf54e..d5cf752a43 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/settings/ChatSettingsFragment.kt
@@ -8,17 +8,17 @@ import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.net.Uri
 import android.os.Bundle
-import android.support.design.widget.TextInputEditText
-import android.support.design.widget.TextInputLayout
-import android.support.v14.preference.SwitchPreference
-import android.support.v4.app.ActivityCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.preference.ListPreference
-import android.support.v7.preference.Preference
-import android.support.v7.widget.AppCompatCheckBox
 import android.view.View
 import android.view.WindowManager
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.widget.AppCompatCheckBox
+import androidx.core.app.ActivityCompat
+import androidx.preference.ListPreference
+import androidx.preference.Preference
+import androidx.preference.SwitchPreference
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
 import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompat
 import java.util.Locale
 import org.fossasia.susi.ai.R
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skillSearch/SearchSkillFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skillSearch/SearchSkillFragment.kt
index 358e649d8d..bf48cc5bb0 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skillSearch/SearchSkillFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skillSearch/SearchSkillFragment.kt
@@ -2,14 +2,14 @@ package org.fossasia.susi.ai.skills.skillSearch
 
 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.NonNull
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SnapHelper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.SnapHelper
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import kotlinx.android.synthetic.main.fragment_group_wise_skill_listing.*
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.dataclasses.GroupWiseSkills
@@ -26,11 +26,11 @@ import timber.log.Timber
  *
  * Created by naman653 on 28/03/2019.
  */
-class SearchSkillFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLayout.OnRefreshListener {
+class SearchSkillFragment : androidx.fragment.app.Fragment(), IGroupWiseSkillsView, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
     private lateinit var query: String
     private lateinit var skillSet: List<SkillData>
-    private lateinit var skillAdapterSnapHelper: SnapHelper
+    private lateinit var skillAdapterSnapHelper: androidx.recyclerview.widget.SnapHelper
     private lateinit var searchSkillPresenter: IGroupWiseSkillsPresenter
     private lateinit var skills: GroupWiseSkills
     private lateinit var skillsAdapter: SkillsListAdapter
@@ -71,8 +71,8 @@ class SearchSkillFragment : Fragment(), IGroupWiseSkillsView, SwipeRefreshLayout
 
     private fun setUPAdapter() {
         skillAdapterSnapHelper = StartSnapHelper()
-        val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
         groupWiseSkills.layoutManager = layoutManager
         skillsAdapter = SkillsListAdapter(requireContext(), skills, skillCallback)
         Timber.d(skills.toString())
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt
index bd092098f2..8bae139363 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/SkillDetailsFragment.kt
@@ -7,12 +7,6 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.support.annotation.NonNull
-import android.support.customtabs.CustomTabsIntent
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
 import android.text.Html
 import android.text.TextUtils
 import android.view.LayoutInflater
@@ -20,6 +14,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.Toast
+import androidx.annotation.NonNull
+import androidx.appcompat.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.github.mikephil.charting.charts.HorizontalBarChart
 import com.github.mikephil.charting.components.Description
 import com.github.mikephil.charting.components.XAxis
@@ -45,7 +45,7 @@ import org.fossasia.susi.ai.skills.skilldetails.adapters.recycleradapters.SkillE
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsPresenter
 import org.fossasia.susi.ai.skills.skilldetails.contract.ISkillDetailsView
 
-class SkillDetailsFragment : Fragment(), ISkillDetailsView {
+class SkillDetailsFragment : androidx.fragment.app.Fragment(), ISkillDetailsView {
 
     private lateinit var skillDetailsPresenter: ISkillDetailsPresenter
     private lateinit var loginLogoutModulePresenter: ILoginLogoutModulePresenter
@@ -228,7 +228,7 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
     private fun setExamples() {
         if (skillData.examples.isNotEmpty() && skillData.examples.isNotEmpty()) {
             skillDetailExamples.setHasFixedSize(true)
-            val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+            val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
             skillDetailExamples.layoutManager = layoutManager
             skillDetailExamples.adapter = SkillExamplesAdapter(requireContext(), skillData.examples)
         } else {
@@ -552,7 +552,7 @@ class SkillDetailsFragment : Fragment(), ISkillDetailsView {
      * @param feedbackResponse : Contains the list of Feedback objects received from the getSkillFeedback.json API
      */
     override fun updateFeedbackList(feedbackResponse: GetSkillFeedbackResponse) {
-        val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.VERTICAL, false)
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity, androidx.recyclerview.widget.LinearLayoutManager.VERTICAL, false)
         rvFeedback.setHasFixedSize(true)
         rvFeedback.layoutManager = layoutManager
         rvFeedback.adapter = FeedbackAdapter(requireContext(), feedbackResponse)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/FeedbackAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/FeedbackAdapter.kt
index 8087173ade..f5e0fde800 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/FeedbackAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/FeedbackAdapter.kt
@@ -3,12 +3,12 @@ package org.fossasia.susi.ai.skills.skilldetails.adapters.recycleradapters
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.support.annotation.NonNull
-import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.helper.Constant
 import org.fossasia.susi.ai.helper.PrefManager
@@ -27,7 +27,7 @@ class FeedbackAdapter(
     val context: Context,
     private val feedbackResponse: GetSkillFeedbackResponse
 ) :
-        RecyclerView.Adapter<FeedbackViewHolder>(), FeedbackViewHolder.ClickListener {
+        androidx.recyclerview.widget.RecyclerView.Adapter<FeedbackViewHolder>(), FeedbackViewHolder.ClickListener {
 
     private val clickListener: FeedbackViewHolder.ClickListener = this
     private val arrangedFeedbackList: ArrayList<Feedback> = ArrayList()
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/SkillExamplesAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/SkillExamplesAdapter.kt
index 1bba4544cd..fc956dee3d 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/SkillExamplesAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/recycleradapters/SkillExamplesAdapter.kt
@@ -3,10 +3,10 @@ package org.fossasia.susi.ai.skills.skilldetails.adapters.recycleradapters
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.support.annotation.NonNull
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.ChatActivity
 import org.fossasia.susi.ai.skills.skilldetails.adapters.viewholders.SkillExampleViewHolder
@@ -19,7 +19,7 @@ class SkillExamplesAdapter(
     val context: Context,
     val examples: List<String>
 ) :
-    RecyclerView.Adapter<SkillExampleViewHolder>(),
+    androidx.recyclerview.widget.RecyclerView.Adapter<SkillExampleViewHolder>(),
         SkillExampleViewHolder.ClickListener {
 
     private val clickListener: SkillExampleViewHolder.ClickListener = this
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/FeedbackViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/FeedbackViewHolder.kt
index cf82fcf8ef..925176eaac 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/FeedbackViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/FeedbackViewHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.skills.skilldetails.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import butterknife.ButterKnife
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
@@ -16,7 +16,7 @@ class FeedbackViewHolder(
     itemView: View,
     private val listener: FeedbackViewHolder.ClickListener?
 ) :
-    RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
     val itemFeedback: LinearLayout by bindView(R.id.itemFeedback)
     val avatar: ImageView by bindView(R.id.avatar)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/SkillExampleViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/SkillExampleViewHolder.kt
index 9ca4a7c5cb..e0ef7fcbb3 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/SkillExampleViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilldetails/adapters/viewholders/SkillExampleViewHolder.kt
@@ -1,8 +1,8 @@
 package org.fossasia.susi.ai.skills.skilldetails.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
@@ -13,7 +13,7 @@ class SkillExampleViewHolder(
     itemView: View,
     private val listener: SkillExampleViewHolder.ClickListener?
 ) :
-    RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
     val example: TextView by bindView(R.id.text)
 
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/SkillListingFragment.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/SkillListingFragment.kt
index f23c6cd8c4..fee322e906 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/SkillListingFragment.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/SkillListingFragment.kt
@@ -2,14 +2,14 @@ package org.fossasia.susi.ai.skills.skilllisting
 
 import android.content.Context
 import android.os.Bundle
-import android.support.annotation.NonNull
-import android.support.v4.app.Fragment
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SnapHelper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.SnapHelper
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.facebook.shimmer.ShimmerFrameLayout
 import kotlinx.android.synthetic.main.fragment_skill_listing.errorSkillFetch
 import kotlinx.android.synthetic.main.fragment_skill_listing.shimmer_view_container
@@ -30,9 +30,10 @@ import timber.log.Timber
  *
  * Created by chiragw15 on 15/8/17.
  */
-class SkillListingFragment : Fragment(), ISkillListingView, SwipeRefreshLayout.OnRefreshListener {
+@Suppress("NAME_SHADOWING")
+class SkillListingFragment : androidx.fragment.app.Fragment(), ISkillListingView, androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener {
 
-    private lateinit var skillAdapterSnapHelper: SnapHelper
+    private lateinit var skillAdapterSnapHelper: androidx.recyclerview.widget.SnapHelper
     private lateinit var skillListingPresenter: ISkillListingPresenter
     var skills: ArrayList<Pair<String, List<SkillData>>> = ArrayList()
     private var metrics = SkillsBasedOnMetrics(ArrayList(), ArrayList(), ArrayList())
@@ -60,8 +61,8 @@ class SkillListingFragment : Fragment(), ISkillListingView, SwipeRefreshLayout.O
 
     private fun setUPAdapter() {
         skillAdapterSnapHelper = StartSnapHelper()
-        val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
+        layoutManager.orientation = androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
         skillMetrics.layoutManager = layoutManager
         skillMetricsAdapter = SkillMetricsAdapter(requireContext(), metrics, skillCallback)
         skillMetrics.adapter = skillMetricsAdapter
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
index 4deb160bcf..09b39c5b2d 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillListAdapter.kt
@@ -1,18 +1,18 @@
 package org.fossasia.susi.ai.skills.skilllisting.adapters.recycleradapters
 
 import android.content.Context
-import android.support.annotation.NonNull
-import android.support.v7.widget.RecyclerView
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.RecyclerView
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.helper.Utils
 import org.fossasia.susi.ai.rest.responses.susi.SkillData
 import org.fossasia.susi.ai.skills.SkillFragmentCallback
 import org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders.SkillViewHolder
 
-class SkillListAdapter(val context: Context, private val skillDetails: List<SkillData>?, val skillCallback: SkillFragmentCallback) : RecyclerView.Adapter<SkillViewHolder>(),
+class SkillListAdapter(val context: Context, private val skillDetails: List<SkillData>?, val skillCallback: SkillFragmentCallback) : androidx.recyclerview.widget.RecyclerView.Adapter<SkillViewHolder>(),
         SkillViewHolder.ClickListener {
 
     private val clickListener: SkillViewHolder.ClickListener = this
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillMetricsAdapter.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillMetricsAdapter.kt
index 98b219f3b2..4fa625bee3 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillMetricsAdapter.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/recycleradapters/SkillMetricsAdapter.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.skills.skilllisting.adapters.recycleradapters
 
 import android.content.Context
-import android.support.annotation.NonNull
-import android.support.v4.content.ContextCompat
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.SnapHelper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.SnapHelper
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.dataclasses.SkillsBasedOnMetrics
 import org.fossasia.susi.ai.helper.StartSnapHelper
@@ -17,16 +17,16 @@ import org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders.GroupViewHo
 import org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders.SkillGroupViewHolder
 
 class SkillMetricsAdapter(val context: Context, val metrics: SkillsBasedOnMetrics, val skillCallback: SkillFragmentCallback) :
-        RecyclerView.Adapter<RecyclerView.ViewHolder>(), SkillGroupViewHolder.ClickListener {
+        androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>(), SkillGroupViewHolder.ClickListener {
 
     private val VIEW_TYPE_METRIC = 0
     private val VIEW_TYPE_GROUP = 1
-    private lateinit var skillAdapterSnapHelper: SnapHelper
+    private lateinit var skillAdapterSnapHelper: androidx.recyclerview.widget.SnapHelper
 
     private val clickListener: SkillGroupViewHolder.ClickListener = this
 
     @NonNull
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
         if (holder is GroupViewHolder) {
             if (metrics.metricsList[position] != null) {
                 holder.groupName.text = metrics.metricsGroupTitles[position]
@@ -34,7 +34,7 @@ class SkillMetricsAdapter(val context: Context, val metrics: SkillsBasedOnMetric
 
             skillAdapterSnapHelper = StartSnapHelper()
             holder.skillList.setHasFixedSize(true)
-            val layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+            val layoutManager = androidx.recyclerview.widget.LinearLayoutManager(context, androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL, false)
             holder.skillList.layoutManager = layoutManager
             holder.skillList.adapter = SkillListAdapter(context, metrics.metricsList[position], skillCallback)
             holder.skillList.onFlingListener = null
@@ -72,7 +72,7 @@ class SkillMetricsAdapter(val context: Context, val metrics: SkillsBasedOnMetric
     }
 
     @NonNull
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
         return if (viewType == VIEW_TYPE_METRIC) {
             val itemView = LayoutInflater.from(parent.context)
                     .inflate(R.layout.item_skill_group, parent, false)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/GroupViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/GroupViewHolder.kt
index b5b513f7fb..836724b106 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/GroupViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/GroupViewHolder.kt
@@ -1,13 +1,13 @@
 package org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class GroupViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class GroupViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
 
     val groupName: TextView by bindView(R.id.groupName)
-    val skillList: RecyclerView by bindView(R.id.skill_list)
+    val skillList: androidx.recyclerview.widget.RecyclerView by bindView(R.id.skill_list)
 }
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillGroupViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillGroupViewHolder.kt
index a8868fa594..4df233d589 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillGroupViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillGroupViewHolder.kt
@@ -1,10 +1,10 @@
 package org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
@@ -16,7 +16,7 @@ class SkillGroupViewHolder(
     private val adapterOffset: Int,
     private val listener: ClickListener?
 ) :
-    RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
     val groupParent: LinearLayout by bindView(R.id.group_parent)
     val groupName: TextView by bindView(R.id.group)
diff --git a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
index 5e9e9b7e9c..e7e0e7229e 100644
--- a/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
+++ b/app/src/main/java/org/fossasia/susi/ai/skills/skilllisting/adapters/viewholders/SkillViewHolder.kt
@@ -1,14 +1,14 @@
 package org.fossasia.susi.ai.skills.skilllisting.adapters.viewholders
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.widget.ImageView
 import android.widget.RatingBar
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import kotterknife.bindView
 import org.fossasia.susi.ai.R
 
-class SkillViewHolder(itemView: View, private val listener: ClickListener?) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+class SkillViewHolder(itemView: View, private val listener: ClickListener?) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
 
     val previewImageView: ImageView by bindView(R.id.skill_preview_image)
     val skillPreviewTitle: TextView by bindView(R.id.skill_preview_title)
diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index b083b5ce92..663a85ecda 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -34,7 +34,7 @@
             android:weightSum="1"
             tools:context="org.fossasia.susi.ai.login.LoginActivity">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/email"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -47,53 +47,53 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/email"
                     android:inputType="textEmailAddress" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/passwordInput"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/password"
                     android:imeOptions="actionGo"
                     android:inputType="textPassword" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.v7.widget.AppCompatCheckBox
+            <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/customServer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/custom_server" />
 
-            <android.support.v7.widget.AppCompatCheckBox
+            <androidx.appcompat.widget.AppCompatCheckBox
                 android:id="@+id/rememberCredential"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/margin_bottom"
                 android:text="@string/remember_me" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/inputUrl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
                 app:errorEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/url_input"
                     android:inputType="textUri" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.v7.widget.AppCompatButton
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/logIn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-land/activity_sign_up.xml b/app/src/main/res/layout-land/activity_sign_up.xml
index 0a8d8e3a12..35588e180d 100644
--- a/app/src/main/res/layout-land/activity_sign_up.xml
+++ b/app/src/main/res/layout-land/activity_sign_up.xml
@@ -19,22 +19,22 @@
         android:paddingRight="@dimen/margin_large"
         android:paddingTop="@dimen/margin_large">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/email"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/email"
                 android:inputType="textEmailAddress"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/password"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
@@ -42,16 +42,16 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/confirmPassword"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
@@ -59,44 +59,44 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/confirm_password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/customServerSignUp"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_small_medium"
             android:text="@string/custom_server" />
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/acceptTermsAndConditions"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_small_medium"
             android:text="@string/accept_terms_conditions" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/inputUrlSignUp"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/url_input"
                 android:inputType="textUri" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/signUp"
             android:layout_width="@dimen/activity_landscape_width"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout-land/fragment_skill_details.xml b/app/src/main/res/layout-land/fragment_skill_details.xml
index a5268d91f7..d526f64003 100644
--- a/app/src/main/res/layout-land/fragment_skill_details.xml
+++ b/app/src/main/res/layout-land/fragment_skill_details.xml
@@ -123,7 +123,7 @@
                 android:textSize="@dimen/text_size_large"
                 app:fontFamily="sans-serif" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/skillDetailExamples"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -410,7 +410,7 @@
 
                 </LinearLayout>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rvFeedback"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -456,7 +456,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <android.support.v7.widget.AppCompatEditText
+                <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/etFeedback"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
index 1982ec8c78..af66f1736d 100644
--- a/app/src/main/res/layout/activity_chat.xml
+++ b/app/src/main/res/layout/activity_chat.xml
@@ -1,4 +1,4 @@
-<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:id="@+id/coordinator_layout"
@@ -32,7 +32,7 @@
             android:layout_above="@id/rv_chat_feed"
             android:background="@color/md_grey_300" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_chat_feed"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -41,7 +41,7 @@
             android:background="@color/default_bg"
             android:scrollbars="vertical" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/searchChat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -54,7 +54,7 @@
             app:fabSize="mini"
             app:srcCompat="@drawable/ic_open_search" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/voiceSearchChat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
             app:fabSize="mini"
             app:srcCompat="@drawable/ic_mic_24dp" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabsetting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
             app:fabSize="mini"
             app:srcCompat="@drawable/letter_s" />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/btnScrollToEnd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -106,7 +106,7 @@
                 android:layout_height="@dimen/height_very_small"
                 android:background="@color/md_grey_300" />
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:cardPreventCornerOverlap="false">
@@ -158,7 +158,7 @@
 
                     </FrameLayout>
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
         </LinearLayout>
 
         <FrameLayout
@@ -166,4 +166,4 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"></FrameLayout>
     </RelativeLayout>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_chat_search.xml b/app/src/main/res/layout/activity_chat_search.xml
index c8423d1135..4f2ba551b8 100644
--- a/app/src/main/res/layout/activity_chat_search.xml
+++ b/app/src/main/res/layout/activity_chat_search.xml
@@ -15,11 +15,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/search_chat_feed"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="@dimen/margin_small"></android.support.v7.widget.RecyclerView>
+                android:layout_margin="@dimen/margin_small"></androidx.recyclerview.widget.RecyclerView>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_device.xml b/app/src/main/res/layout/activity_device.xml
index f6766dcbde..78e8f396c4 100644
--- a/app/src/main/res/layout/activity_device.xml
+++ b/app/src/main/res/layout/activity_device.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:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,4 @@
         android:id="@+id/fragment_container"
         >
     </FrameLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml
index 2044ab992b..e918f22fed 100644
--- a/app/src/main/res/layout/activity_feedback.xml
+++ b/app/src/main/res/layout/activity_feedback.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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/md_white_1000"
@@ -8,10 +8,10 @@
     android:paddingRight="@dimen/padding_small"
     android:paddingEnd="@dimen/padding_small">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvAllFeedback"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:scrollbars="vertical" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c5af2246d6..64fc9f499e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -26,7 +26,7 @@
             android:contentDescription="@string/activity_login_imageview_description"
             app:srcCompat="@drawable/ic_susi_blue" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,53 +38,53 @@
                 android:layout_height="wrap_content"
                 android:hint="@string/email"
                 android:inputType="textEmailAddress" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/passwordInput"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:imeOptions="actionGo"
                 android:inputType="textPassword" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/customServer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_bottom"
             android:text="@string/custom_server" />
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/rememberCredential"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_bottom"
             android:text="@string/remember_me" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/inputUrl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/url_input"
                 android:inputType="textUri" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/logIn"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_manage_device.xml b/app/src/main/res/layout/activity_manage_device.xml
index 8274bd94e0..43e070a7ea 100644
--- a/app/src/main/res/layout/activity_manage_device.xml
+++ b/app/src/main/res/layout/activity_manage_device.xml
@@ -1,6 +1,6 @@
 <?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:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
index 7c68409eac..a290011d35 100644
--- a/app/src/main/res/layout/activity_sign_up.xml
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -28,22 +28,22 @@
             android:contentDescription="@string/activity_login_imageview_description"
             app:srcCompat="@drawable/ic_susi_blue" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/email"
                 android:inputType="textEmailAddress"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -51,16 +51,16 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/confirmPassword"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -68,37 +68,37 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/confirm_password"
                 android:inputType="textPassword"
                 android:maxLines="1"
                 app:theme="@style/Login_Theme" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/customServerSignUp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/margin_small_medium"
             android:text="@string/custom_server" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/inputUrlSignUp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
             app:errorEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/url_input"
                 android:inputType="textUri" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/acceptTermsAndConditions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 427ac82865..594adf0be2 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -12,14 +12,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabDots"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/alert_change_server.xml b/app/src/main/res/layout/alert_change_server.xml
index 0a61e5b053..7e5a6b2887 100644
--- a/app/src/main/res/layout/alert_change_server.xml
+++ b/app/src/main/res/layout/alert_change_server.xml
@@ -10,14 +10,14 @@
     android:paddingStart="@dimen/padding_large"
     android:paddingTop="10dp">
 
-    <android.support.v7.widget.AppCompatCheckBox
+    <androidx.appcompat.widget.AppCompatCheckBox
         android:id="@+id/customer_server"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small_medium"
         android:text="@string/custom_server" />
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_url"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -25,11 +25,11 @@
         android:visibility="gone"
         app:errorEnabled="true">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_url_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/url_input"
             android:inputType="textUri" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/alert_reset_password.xml b/app/src/main/res/layout/alert_reset_password.xml
index ad472cd66f..fd36153b56 100644
--- a/app/src/main/res/layout/alert_reset_password.xml
+++ b/app/src/main/res/layout/alert_reset_password.xml
@@ -17,50 +17,50 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password_input"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/current_password"
                     android:inputType="textPassword" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/newpassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/newpassword_input"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/new_password"
                     android:inputType="textPassword" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/confirmpassword"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/confirmpassword_input"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="@string/confirm_password"
                     android:inputType="textPassword" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/layout/connect_susiai_speaker.xml b/app/src/main/res/layout/connect_susiai_speaker.xml
index 9d075d0176..d456ca6b56 100644
--- a/app/src/main/res/layout/connect_susiai_speaker.xml
+++ b/app/src/main/res/layout/connect_susiai_speaker.xml
@@ -6,7 +6,7 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/device_layout.xml b/app/src/main/res/layout/device_layout.xml
index 73fe8ccbd0..00e63da2bb 100644
--- a/app/src/main/res/layout/device_layout.xml
+++ b/app/src/main/res/layout/device_layout.xml
@@ -4,7 +4,7 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_margin="@dimen/margin_small"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -51,6 +51,6 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/edit_name_layout.xml b/app/src/main/res/layout/edit_name_layout.xml
index be2e0ae2d0..53e5aa65cd 100644
--- a/app/src/main/res/layout/edit_name_layout.xml
+++ b/app/src/main/res/layout/edit_name_layout.xml
@@ -19,7 +19,7 @@
             android:text="@string/change_spk_name"
             android:textSize="@dimen/text_size_medium" />
 
-        <android.support.v7.widget.AppCompatEditText
+        <androidx.appcompat.widget.AppCompatEditText
             android:id="@+id/name_new"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/edit_room_layout.xml b/app/src/main/res/layout/edit_room_layout.xml
index 43c1e08ecd..14b606da36 100644
--- a/app/src/main/res/layout/edit_room_layout.xml
+++ b/app/src/main/res/layout/edit_room_layout.xml
@@ -34,7 +34,7 @@
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/edit_rooms_available"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/padding_medium"
@@ -82,7 +82,7 @@
                     android:layout_weight="1"
                     android:src="@drawable/ic_add_24dp" />
             </LinearLayout>
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/finish_setup_layout.xml b/app/src/main/res/layout/finish_setup_layout.xml
index af6701a8bb..da14b28514 100644
--- a/app/src/main/res/layout/finish_setup_layout.xml
+++ b/app/src/main/res/layout/finish_setup_layout.xml
@@ -11,7 +11,7 @@
         android:layout_weight="10"
         android:gravity="center_vertical">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/padding_moderate"
diff --git a/app/src/main/res/layout/fragment_connected_device.xml b/app/src/main/res/layout/fragment_connected_device.xml
index cdaac0c97f..6f014459e3 100644
--- a/app/src/main/res/layout/fragment_connected_device.xml
+++ b/app/src/main/res/layout/fragment_connected_device.xml
@@ -1,4 +1,4 @@
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:id="@+id/refresh_device_layout"
@@ -19,10 +19,10 @@
             android:text="@string/connected_device_status"
             android:visibility="gone" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/connectedDevices"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </LinearLayout>
 
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_device_connect.xml b/app/src/main/res/layout/fragment_device_connect.xml
index e5b5a9944f..462f5e07bb 100644
--- a/app/src/main/res/layout/fragment_device_connect.xml
+++ b/app/src/main/res/layout/fragment_device_connect.xml
@@ -1,4 +1,4 @@
-<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"
@@ -131,7 +131,7 @@
         android:visibility="gone"
         app:layout_constraintTop_toBottomOf="@+id/noDeviceFound" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addDeviceButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -141,14 +141,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/ic_add_black_24dp" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/deviceList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_small"
         android:visibility="gone" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/wifiList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -183,4 +183,4 @@
         layout="@layout/wifi_password_layout"
         android:visibility="gone" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_group_wise_skill_listing.xml b/app/src/main/res/layout/fragment_group_wise_skill_listing.xml
index 35b7f4f27d..212ca52b46 100644
--- a/app/src/main/res/layout/fragment_group_wise_skill_listing.xml
+++ b/app/src/main/res/layout/fragment_group_wise_skill_listing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout 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/swipeRefreshLayout"
@@ -12,7 +12,7 @@
         android:layout_height="match_parent"
         android:background="@color/default_bg">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/groupWiseSkills"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -47,7 +47,7 @@
 
         </com.facebook.shimmer.ShimmerFrameLayout>
       
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/searchSkillGroupWise"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -95,4 +95,4 @@
             android:textSize="@dimen/text_size_large"
             android:visibility="gone" />
     </FrameLayout>
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_help.xml b/app/src/main/res/layout/fragment_help.xml
index 74c5f5b05c..31174fdd53 100644
--- a/app/src/main/res/layout/fragment_help.xml
+++ b/app/src/main/res/layout/fragment_help.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -48,9 +48,9 @@
                         android:text="@string/help_open_setting_desc"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -81,9 +81,9 @@
                         android:text="@string/help_signup_desc"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -114,9 +114,9 @@
                         android:text="@string/help_change_password_desc"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -148,9 +148,9 @@
                         android:textSize="@dimen/text_size_medium" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -182,9 +182,9 @@
                         android:textSize="@dimen/text_size_medium" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -215,9 +215,9 @@
                         android:text="@string/help_susi_voice_desc"
                         android:textSize="@dimen/text_size_medium" />
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -250,8 +250,8 @@
                         android:textSize="@dimen/text_size_medium" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
-            <android.support.v7.widget.CardView
+            </androidx.cardview.widget.CardView>
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_moderate"
@@ -284,7 +284,7 @@
                         android:textSize="@dimen/text_size_medium" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/fragment_music_servers.xml b/app/src/main/res/layout/fragment_music_servers.xml
index 534627f1a0..76fa03f11d 100644
--- a/app/src/main/res/layout/fragment_music_servers.xml
+++ b/app/src/main/res/layout/fragment_music_servers.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     tools:context="org.fossasia.susi.ai.device.managedevices.MusicServersFragment">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/margin_large"
@@ -13,7 +13,7 @@
         android:layout_marginRight="@dimen/margin_large"
         android:text="@string/music_services" />
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_large"
@@ -32,12 +32,12 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatImageView
+                <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="@dimen/height_width_spotify"
                     android:layout_height="@dimen/height_width_spotify"
                     android:src="@drawable/spotify" />
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
@@ -50,6 +50,6 @@
             </LinearLayout>
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_skill_details.xml b/app/src/main/res/layout/fragment_skill_details.xml
index cc7a808d73..90d0022831 100644
--- a/app/src/main/res/layout/fragment_skill_details.xml
+++ b/app/src/main/res/layout/fragment_skill_details.xml
@@ -119,7 +119,7 @@
                 android:textSize="@dimen/text_size_large"
                 app:fontFamily="sans-serif" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/skillDetailExamples"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -427,7 +427,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <android.support.v7.widget.AppCompatEditText
+                <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/etFeedback"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -459,7 +459,7 @@
                 android:textSize="@dimen/text_size_normal"
                 android:visibility="gone" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rvFeedback"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_skill_listing.xml b/app/src/main/res/layout/fragment_skill_listing.xml
index 8fa83daecb..2f844c5005 100644
--- a/app/src/main/res/layout/fragment_skill_listing.xml
+++ b/app/src/main/res/layout/fragment_skill_listing.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:shimmer="http://schemas.android.com/apk/res-auto"
     android:id="@+id/swipe_refresh_layout"
     android:layout_width="match_parent"
@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:background="@color/default_bg">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/skillMetrics"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
@@ -53,4 +53,4 @@
             android:textSize="@dimen/text_size_large"
             android:visibility="gone" />
     </FrameLayout>
-</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sttframe.xml b/app/src/main/res/layout/fragment_sttframe.xml
index c3022fac81..ff56854d06 100644
--- a/app/src/main/res/layout/fragment_sttframe.xml
+++ b/app/src/main/res/layout/fragment_sttframe.xml
@@ -13,7 +13,7 @@
         android:textColor="@color/md_black_1000"
         android:textSize="@dimen/text_size_extra_extra_large" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/clickableCommands"
         android:layout_width="match_parent"
         android:layout_above="@id/txtChat"
diff --git a/app/src/main/res/layout/get_password.xml b/app/src/main/res/layout/get_password.xml
index 57787c75ea..1fbb5e2efb 100644
--- a/app/src/main/res/layout/get_password.xml
+++ b/app/src/main/res/layout/get_password.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/margin_moderate"
@@ -21,5 +21,5 @@
             android:layout_marginTop="@dimen/margin_moderate"
             android:hint="@string/password"
             android:inputType="textPassword" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/groupwise_skill_listing_placeholder.xml b/app/src/main/res/layout/groupwise_skill_listing_placeholder.xml
index aefaab8212..2cc5bf88c8 100644
--- a/app/src/main/res/layout/groupwise_skill_listing_placeholder.xml
+++ b/app/src/main/res/layout/groupwise_skill_listing_placeholder.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:foreground="?attr/selectableItemBackground"
         app:cardBackgroundColor="@color/susi_message_bg"
@@ -70,6 +70,6 @@
             </LinearLayout>
 
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image_holder.xml b/app/src/main/res/layout/image_holder.xml
index b217cdc083..8be46fc3ca 100644
--- a/app/src/main/res/layout/image_holder.xml
+++ b/app/src/main/res/layout/image_holder.xml
@@ -6,7 +6,7 @@
     android:layout_margin="@dimen/margin_small"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_margin="@dimen/margin_small"
@@ -58,6 +58,6 @@
                     app:srcCompat="@drawable/thumbs_down_outline" />
             </LinearLayout>
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_feedback.xml b/app/src/main/res/layout/item_feedback.xml
index 62e8dcfca8..ed8cffbe2d 100644
--- a/app/src/main/res/layout/item_feedback.xml
+++ b/app/src/main/res/layout/item_feedback.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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -98,4 +98,4 @@
 
     </LinearLayout>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_group_wise_skill.xml b/app/src/main/res/layout/item_group_wise_skill.xml
index fbf6ce809c..99af976b1b 100644
--- a/app/src/main/res/layout/item_group_wise_skill.xml
+++ b/app/src/main/res/layout/item_group_wise_skill.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:foreground="?attr/selectableItemBackground"
@@ -109,5 +109,5 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_skill.xml b/app/src/main/res/layout/item_skill.xml
index 7b95bfa704..9e443138d9 100644
--- a/app/src/main/res/layout/item_skill.xml
+++ b/app/src/main/res/layout/item_skill.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="@dimen/websearch_card_width"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -103,5 +103,5 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_skill_group.xml b/app/src/main/res/layout/item_skill_group.xml
index 35793cce50..5b01e1a62e 100644
--- a/app/src/main/res/layout/item_skill_group.xml
+++ b/app/src/main/res/layout/item_skill_group.xml
@@ -23,7 +23,7 @@
         android:typeface="serif"
         app:fontFamily="sans-serif" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/skill_list"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/item_speaker.xml b/app/src/main/res/layout/item_speaker.xml
index 2754a2d02d..7403eeb1df 100644
--- a/app/src/main/res/layout/item_speaker.xml
+++ b/app/src/main/res/layout/item_speaker.xml
@@ -5,7 +5,7 @@
     android:layout_marginBottom="@dimen/margin_moderate"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -21,7 +21,7 @@
                 android:background="@drawable/smart_speaker"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/speaker_room"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
                 android:background="@color/colorPrimary"
                 android:orientation="horizontal">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="6"
@@ -59,6 +59,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_susi_image.xml b/app/src/main/res/layout/item_susi_image.xml
index 910912398a..60d659ccd8 100644
--- a/app/src/main/res/layout/item_susi_image.xml
+++ b/app/src/main/res/layout/item_susi_image.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -20,5 +20,5 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_susi" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_susi_map.xml b/app/src/main/res/layout/item_susi_map.xml
index 2a3231053b..81e28ab679 100644
--- a/app/src/main/res/layout/item_susi_map.xml
+++ b/app/src/main/res/layout/item_susi_map.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -29,5 +29,5 @@
                 tools:src="@drawable/ic_susi" />
 
         </FrameLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_susi_piechart.xml b/app/src/main/res/layout/item_susi_piechart.xml
index e282dbfbe9..e9b96be6d4 100644
--- a/app/src/main/res/layout/item_susi_piechart.xml
+++ b/app/src/main/res/layout/item_susi_piechart.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -77,7 +77,7 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_user_image.xml b/app/src/main/res/layout/item_user_image.xml
index f67ca00f0c..bd942a1019 100644
--- a/app/src/main/res/layout/item_user_image.xml
+++ b/app/src/main/res/layout/item_user_image.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:gravity="end">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -21,5 +21,5 @@
             android:layout_height="wrap_content"
             app:srcCompat="@drawable/ic_user" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/password_layout.xml b/app/src/main/res/layout/password_layout.xml
index 72f06609ff..cf52ed0a0c 100644
--- a/app/src/main/res/layout/password_layout.xml
+++ b/app/src/main/res/layout/password_layout.xml
@@ -30,7 +30,7 @@
             android:id="@+id/account_email"
             android:textSize="@dimen/text_size_large"/>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/account_auth_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/account_auth_password_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -47,9 +47,9 @@
                 android:imeOptions="actionGo"
                 android:inputType="textPassword"
                 android:textSize="@dimen/text_size_medium" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.v7.widget.AppCompatCheckBox
+        <androidx.appcompat.widget.AppCompatCheckBox
             android:id="@+id/anonymous_mode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/room_layout.xml b/app/src/main/res/layout/room_layout.xml
index 199eb83c53..19505ee386 100644
--- a/app/src/main/res/layout/room_layout.xml
+++ b/app/src/main/res/layout/room_layout.xml
@@ -44,7 +44,7 @@
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rooms_available"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -65,7 +65,7 @@
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="@dimen/padding_medium"
@@ -92,7 +92,7 @@
                     android:layout_weight="1"
                     android:src="@drawable/ic_add_24dp" />
             </LinearLayout>
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/rss_item.xml b/app/src/main/res/layout/rss_item.xml
index c1d5d0760c..2fdf04d675 100644
--- a/app/src/main/res/layout/rss_item.xml
+++ b/app/src/main/res/layout/rss_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="@dimen/websearch_card_width"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -68,5 +68,5 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_item.xml b/app/src/main/res/layout/search_item.xml
index fd99d624ca..3d7c3ea2c4 100644
--- a/app/src/main/res/layout/search_item.xml
+++ b/app/src/main/res/layout/search_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="@dimen/websearch_card_width"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
@@ -64,5 +64,5 @@
             </LinearLayout>
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/search_list.xml b/app/src/main/res/layout/search_list.xml
index 11c0555ef1..ef2108354c 100644
--- a/app/src/main/res/layout/search_list.xml
+++ b/app/src/main/res/layout/search_list.xml
@@ -6,7 +6,7 @@ android:layout_height="wrap_content"
 android:orientation="vertical"
 android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/skill_listing_placeholder.xml b/app/src/main/res/layout/skill_listing_placeholder.xml
index 36152a2c13..7034076e54 100644
--- a/app/src/main/res/layout/skill_listing_placeholder.xml
+++ b/app/src/main/res/layout/skill_listing_placeholder.xml
@@ -12,7 +12,7 @@
         android:layout_marginBottom="@dimen/margin_medium"
         android:background="@color/shimmer_background" />
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
@@ -93,5 +93,5 @@
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/susi_table.xml b/app/src/main/res/layout/susi_table.xml
index df15d9c1ae..08b0fe546a 100644
--- a/app/src/main/res/layout/susi_table.xml
+++ b/app/src/main/res/layout/susi_table.xml
@@ -5,14 +5,14 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_small"
         android:layout_marginTop="@dimen/margin_small"
         app:cardBackgroundColor="@color/susi_message_bg">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -55,5 +55,5 @@
                     app:srcCompat="@drawable/thumbs_down_outline" />
             </LinearLayout>
         </LinearLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/table_item.xml b/app/src/main/res/layout/table_item.xml
index 0acd9bba87..9a63e8b065 100644
--- a/app/src/main/res/layout/table_item.xml
+++ b/app/src/main/res/layout/table_item.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:layout_marginTop="@dimen/margin_very_small">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="@dimen/websearch_card_width"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/margin_small"
@@ -18,14 +18,14 @@
         app:cardElevation="@dimen/margin_small"
         app:contentPadding="@dimen/padding_small">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/parentLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
 
-        </android.support.v7.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/wifi_password_layout.xml b/app/src/main/res/layout/wifi_password_layout.xml
index 3575e081ae..94dcca57ab 100644
--- a/app/src/main/res/layout/wifi_password_layout.xml
+++ b/app/src/main/res/layout/wifi_password_layout.xml
@@ -30,7 +30,7 @@
             android:gravity="center"
             android:textSize="@dimen/text_size_large" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/wifi_password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -38,14 +38,14 @@
             app:errorEnabled="true"
             app:passwordToggleEnabled="true">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/wifi_password_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/password"
                 android:imeOptions="actionGo"
                 android:inputType="textPassword" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/youtube_video.xml b/app/src/main/res/layout/youtube_video.xml
index 44b45d4b6d..17e9fa7df4 100644
--- a/app/src/main/res/layout/youtube_video.xml
+++ b/app/src/main/res/layout/youtube_video.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_small"
@@ -28,5 +28,5 @@
                 android:layout_centerInParent="true"
                 app:srcCompat="@drawable/ic_play_circle_filled_white_24dp" />
         </RelativeLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </LinearLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8c88f7db51..08544d21b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:3.5.3"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        classpath "io.realm:realm-gradle-plugin:5.14.0"
+        classpath "io.realm:realm-gradle-plugin:3.5.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 273e052ebc..e803492b3a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,4 +13,6 @@
 
  org.gradle.parallel=true
 
- org.gradle.configureondemand=false
\ No newline at end of file
+ org.gradle.configureondemand=false
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file