Migration to AndroidX
diff --git a/.travis.yml b/.travis.yml
index 4f3f4ec..beb47cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@
 sudo: required
 env:
   global:
-    - ANDROID_API_LEVEL=27
-    - ANDROID_BUILD_TOOLS_VERSION=27.0.3
+    - ANDROID_API_LEVEL=28
+    - ANDROID_BUILD_TOOLS_VERSION=28.0.3
     - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
 
 android:
diff --git a/app/build.gradle b/app/build.gradle
index 5ffb247..80f820f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -65,6 +65,11 @@
     androidExtensions {
         experimental = true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -74,12 +79,12 @@
     def mockito = "org.mockito:mockito-core:$rootProject.mockitoVersion"
 
     // Support Dependencies
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support.test.espresso:espresso-idling-resource:$rootProject.espressoVersion"
-    implementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
+    implementation "androidx.appcompat:appcompat:$supportLibraryVersion"
+    implementation "com.google.android.material:material:$supportLibraryVersion"
+    implementation "androidx.recyclerview:recyclerview:$supportLibraryVersion"
+    implementation "androidx.cardview:cardview:$supportLibraryVersion"
+    implementation "androidx.test.espresso:espresso-idling-resource:$espressoVersion"
+    implementation "androidx.annotation:annotation:$supportLibraryVersion"
 
     // Kotlin Dependencies
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
@@ -88,41 +93,41 @@
     //android-job
     implementation "com.evernote:android-job:$androidJobVersion"
 
-    implementation "com.github.therajanmaurya:Sweet-Error:$rootProject.sweetErrorVersion"
+    implementation "com.github.therajanmaurya:Sweet-Error:$sweetErrorVersion"
 
-    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflowVersion}"
-    implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflowVersion}"
-    implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflowVersion}"
-    implementation "com.github.Raizlabs.DBFlow:dbflow-rx2:${dbflowVersion}"
+    implementation "androidx.legacy:legacy-support-v4:$supportLibraryVersion"
+    kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$dbflowVersion"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-core:$dbflowVersion"
+    implementation "com.github.Raizlabs.DBFlow:dbflow:$dbflowVersion"
+    implementation "com.github.Raizlabs.DBFlow:dbflow-rx2:$dbflowVersion"
 
     // Rx Dependencies
-    implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"
-    implementation "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
-    implementation "io.reactivex.rxjava2:rxkotlin:$rootProject.rxKotlinVersion"
+    implementation "io.reactivex.rxjava2:rxjava:$rxjavaVersion"
+    implementation "io.reactivex.rxjava2:rxandroid:$rxandroidVersion"
+    implementation "io.reactivex.rxjava2:rxkotlin:$rxKotlinVersion"
 
     // Square Dependencies
-    implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
-    implementation "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersion"
-    implementation "com.squareup.retrofit2:converter-scalars:$rootProject.retrofitVersion"
-    implementation "com.squareup.retrofit2:adapter-rxjava2:$rootProject.retrofitVersion"
-    implementation "com.squareup.okhttp3:okhttp:$rootProject.okHttp3Version"
-    implementation "com.squareup.okhttp3:logging-interceptor:$rootProject.okHttp3Version"
+    implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
+    implementation "com.squareup.okhttp3:okhttp:$okHttp3Version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okHttp3Version"
 
     //Glide for loading the images
-    implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
-    implementation "de.hdodenhof:circleimageview:$rootProject.circleImageviewVersion"
+    implementation "com.github.bumptech.glide:glide:$glideVersion"
+    implementation "de.hdodenhof:circleimageview:$circleImageviewVersion"
 
     // Dagger 2 Dependencies
-    implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
+    implementation "com.google.dagger:dagger:$daggerVersion"
     compileOnly 'org.glassfish:javax.annotation:10.0-b28' //Required by Dagger2
     kapt daggerCompiler
 //    testkapt daggerCompiler
 //    androidTestkapt daggerCompiler
 
     // ButterKnife Dependencies
-    implementation "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
-    kapt "com.jakewharton:butterknife-compiler:$rootProject.butterKnifeVersion"
+    implementation "com.jakewharton:butterknife:$butterKnifeVersion"
+    kapt "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
 
     // Fabric Crashlytics Dependencies
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
@@ -130,38 +135,38 @@
     }
 
     //Sticky header RecyclerView
-    implementation "org.zakariya.stickyheaders:stickyheaders:$rootProject.sticyHeaderVersion"
+    implementation "org.zakariya.stickyheaders:stickyheaders:$sticyHeaderVersion"
 
     // Compressor for Image Compression
-    implementation "id.zelory:compressor:$rootProject.compressorVersion"
+    implementation "id.zelory:compressor:$compressorVersion"
 
     //Material Stepper UI library
-    implementation "com.stepstone.stepper:material-stepper:$rootProject.materialStepperVersion"
+    implementation "com.stepstone.stepper:material-stepper:$materialStepperVersion"
 
     // Instrumentation test dependencies
     androidTestImplementation jUnit
     androidTestImplementation mockito
-    androidTestImplementation "org.mockito:mockito-android:$rootProject.mockitoVersion"
-    androidTestImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
-    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
+    androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
+    androidTestImplementation "androidx.annotation:annotation:$supportLibraryVersion"
+    androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'com.android.support', module: 'design'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test:runner:$rootProject.runnerVersion"
-    androidTestImplementation "com.android.support.test:rules:$rootProject.rulesVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion"
+    androidTestImplementation "androidx.test:runner:$runnerVersion"
+    androidTestImplementation "androidx.test:rules:$rulesVersion"
 
     // Unit tests dependencies
     testImplementation jUnit
     testImplementation mockito
-    testImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
-    testImplementation "org.hamcrest:hamcrest-core:$rootProject.hamcrestVersion"
-    testImplementation "org.hamcrest:hamcrest-library:$rootProject.hamcrestVersion"
-    testImplementation "org.hamcrest:hamcrest-integration:$rootProject.hamcrestVersion"
-    testImplementation "org.robolectric:robolectric:$rootProject.roboElectricVersion"
+    testImplementation "androidx.annotation:annotation:$supportLibraryVersion"
+    testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion"
+    testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
+    testImplementation "org.hamcrest:hamcrest-integration:$hamcrestVersion"
+    testImplementation "org.robolectric:robolectric:$roboElectricVersion"
 
 }
 
diff --git a/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
index 11f0609..745ae04 100644
--- a/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/org/apache/fineract/ExampleInstrumentedTest.java
@@ -3,8 +3,8 @@
 import static junit.framework.Assert.assertEquals;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 390c12c..7bc67e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
         android:theme="@style/AppTheme">
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="org.apache.fineract.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java b/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
index e7f766e..01c3ddb 100644
--- a/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
+++ b/app/src/main/java/org/apache/fineract/data/local/PreferencesHelper.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/app/src/main/java/org/apache/fineract/data/remote/ConnectivityInterceptor.java b/app/src/main/java/org/apache/fineract/data/remote/ConnectivityInterceptor.java
index 8c297f3..8c48d7a 100644
--- a/app/src/main/java/org/apache/fineract/data/remote/ConnectivityInterceptor.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/ConnectivityInterceptor.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.data.remote;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.apache.fineract.exceptions.NoConnectivityException;
 import org.apache.fineract.utils.NetworkUtil;
diff --git a/app/src/main/java/org/apache/fineract/data/remote/FineractInterceptor.java b/app/src/main/java/org/apache/fineract/data/remote/FineractInterceptor.java
index 5f77959..a561969 100644
--- a/app/src/main/java/org/apache/fineract/data/remote/FineractInterceptor.java
+++ b/app/src/main/java/org/apache/fineract/data/remote/FineractInterceptor.java
@@ -6,7 +6,7 @@
 package org.apache.fineract.data.remote;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.apache.fineract.FineractApplication;
diff --git a/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java b/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
index c73e2b7..b407ae4 100644
--- a/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
+++ b/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.jobs;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.evernote.android.job.Job;
diff --git a/app/src/main/java/org/apache/fineract/jobs/FineractJobCreator.java b/app/src/main/java/org/apache/fineract/jobs/FineractJobCreator.java
index 04741b8..3ace8b0 100644
--- a/app/src/main/java/org/apache/fineract/jobs/FineractJobCreator.java
+++ b/app/src/main/java/org/apache/fineract/jobs/FineractJobCreator.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.evernote.android.job.Job;
 import com.evernote.android.job.JobCreator;
diff --git a/app/src/main/java/org/apache/fineract/jobs/JobsReceiver.java b/app/src/main/java/org/apache/fineract/jobs/JobsReceiver.java
index a9dfbd0..dffbb35 100644
--- a/app/src/main/java/org/apache/fineract/jobs/JobsReceiver.java
+++ b/app/src/main/java/org/apache/fineract/jobs/JobsReceiver.java
@@ -6,7 +6,7 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import org.apache.fineract.R;
 import org.apache.fineract.data.local.PreferencesHelper;
diff --git a/app/src/main/java/org/apache/fineract/jobs/StartSyncJob.java b/app/src/main/java/org/apache/fineract/jobs/StartSyncJob.java
index a511793..8977a28 100644
--- a/app/src/main/java/org/apache/fineract/jobs/StartSyncJob.java
+++ b/app/src/main/java/org/apache/fineract/jobs/StartSyncJob.java
@@ -2,7 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.evernote.android.job.Job;
 import com.evernote.android.job.JobRequest;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
index f7f5f44..6205ad7 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters
 
 import android.content.Context
-import android.support.v7.widget.AppCompatImageView
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
index 2b71cb6..eda6af6 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAdapter.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
index 5b82b2b..97dec0f 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/BeneficiaryAutoCompleteAdapter.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
index 8aa8f69..9f2ec3f 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateCustomerStepAdapter.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
index 467edaf..66a4040 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateDepositStepAdapter.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
index 776ce02..fc659da 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CreateIdentificationStepAdapter.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
index d871aea..5672cea 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerActivitiesAdapter.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
index 33a6383..5fd3fdb 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
index 95c6a9e..26c5f41 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerDepositAdapter.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
index da39cb8..bffd64c 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/DebtIncomeReportAdapter.java
@@ -1,6 +1,6 @@
 package org.apache.fineract.ui.adapters;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/EditPayrollStepAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/EditPayrollStepAdapter.kt
index c09a4ec..95a2754 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/EditPayrollStepAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/EditPayrollStepAdapter.kt
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters
 
 import android.content.Context
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.FragmentManager
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter
 import com.stepstone.stepper.viewmodel.StepViewModel
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
index 6d9a5c9..b4c164e 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationAdapter.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
index 19d94f4..1db0456 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/IdentificationScanAdapter.java
@@ -1,6 +1,6 @@
 package org.apache.fineract.ui.adapters;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
index 310fc75..9f36953 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters
 
 import android.content.Context
-import android.support.v7.widget.AppCompatImageView
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
index 06ed84f..4b8772f 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanAccountListAdapter.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
index 3497041..924ed33 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanApplicationStepAdapter.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentManager;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
index 61699a4..acc8fa8 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LoanDebtIncomeAdapter.java
@@ -1,6 +1,6 @@
 package org.apache.fineract.ui.adapters;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/PayrollAllocationAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/PayrollAllocationAdapter.kt
index 21640e2..435b59d 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/PayrollAllocationAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/PayrollAllocationAdapter.kt
@@ -1,6 +1,6 @@
 package org.apache.fineract.ui.adapters
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
index a14f0f2..0a758e0 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java
@@ -2,8 +2,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/ProductAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/ProductAdapter.kt
index ac9b71b..7f06886 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/ProductAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/ProductAdapter.kt
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
index 8006c50..b415288 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/RolesAdapter.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.adapters;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt b/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
index ead8b3b..bcf86bd 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
@@ -2,8 +2,8 @@
 
 
 import android.content.Context
-import android.support.v7.widget.AppCompatImageView
-import android.support.v7.widget.RecyclerView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
index 75d4476..29de75e 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/ViewPagerAdapter.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.adapters;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java b/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
index 8e89ef8..7213d60 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/EndlessRecyclerViewScrollListener.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.base;
 
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
 /**
  * Created by rajanmaurya
diff --git a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
index 7052ee8..f40b697 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
@@ -3,11 +3,11 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
diff --git a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseBottomSheetDialogFragment.java b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseBottomSheetDialogFragment.java
index 876bba8..f6dfead 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseBottomSheetDialogFragment.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
diff --git a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseFragment.java b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseFragment.java
index ba97a75..1033960 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseFragment.java
@@ -3,9 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 
diff --git a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
index 70f6f28..b0962be 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.base;
 
 import android.graphics.Color;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
@@ -22,8 +22,7 @@
     public static void show(View view, String text, int duration) {
         final Snackbar snackbar = Snackbar.make(view, text, duration);
         View sbView = snackbar.getView();
-        TextView textView =  sbView.findViewById(android.support.design.R.id
-                .snackbar_text);
+        TextView textView =  sbView.findViewById(com.google.android.material.R.id.snackbar_text);
         textView.setTextColor(Color.WHITE);
         textView.setTextSize(12);
         snackbar.setAction(R.string.OK, new View.OnClickListener() {
@@ -38,8 +37,7 @@
     public static void showProgressMessage(View view, String text, int duration) {
         final Snackbar snackbar = Snackbar.make(view, text, duration);
         View sbView = snackbar.getView();
-        TextView textView = sbView.findViewById(android.support.design.R.id
-                .snackbar_text);
+        TextView textView = sbView.findViewById(com.google.android.material.R.id.snackbar_text);
         textView.setTextColor(Color.WHITE);
         textView.setTextSize(12);
         snackbar.show();
diff --git a/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java b/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
index 64f0a39..24c6d31 100644
--- a/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
@@ -1,11 +1,11 @@
 package org.apache.fineract.ui.offline;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
index 959758c..7169a8a 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
@@ -4,12 +4,12 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
+import androidx.annotation.NonNull;
+import com.google.android.material.navigation.NavigationView;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
index 891ec82..b5638c8 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
@@ -3,11 +3,12 @@
 import android.app.SearchManager
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SearchView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.appcompat.widget.SearchView
 import android.text.TextUtils
 import android.view.*
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_accounts.*
 import kotlinx.android.synthetic.main.layout_exception_handler.*
 import org.apache.fineract.R
@@ -65,7 +66,7 @@
     override fun showUserInterface() {
         setToolbarTitle(getString(R.string.accounts))
         val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        layoutManager.orientation = RecyclerView.VERTICAL
         rvAccount.layoutManager = layoutManager
         rvAccount.setHasFixedSize(true)
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
index 8462a97..adf76a8 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
@@ -4,11 +4,12 @@
 import android.app.SearchManager
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SearchView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.appcompat.widget.SearchView
 import android.text.TextUtils
 import android.view.*
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_ledger.*
 import kotlinx.android.synthetic.main.layout_exception_handler.*
 import org.apache.fineract.R
@@ -69,7 +70,7 @@
 
         setToolbarTitle(getString(R.string.ledger))
         val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        layoutManager.orientation = RecyclerView.VERTICAL
         rvLedger.layoutManager = layoutManager
         rvLedger.setHasFixedSize(true)
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
index c29b042..f423ba5 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerContactFragment.java
@@ -3,9 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
index d4ccf31..4222be0 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/FormCustomerDetailsFragment.java
@@ -4,9 +4,9 @@
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
index dbccffc..f3ba64c 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
@@ -3,9 +3,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
index 052d8f0..482016f 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customeractivities/CustomerActivitiesFragment.java
@@ -1,10 +1,10 @@
 package org.apache.fineract.ui.online.customers.customeractivities;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
index 603a9df..b34f58e 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java
@@ -2,12 +2,12 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
index dcde3ed..b4d80d1 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
@@ -6,13 +6,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.transition.TransitionManager;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.transition.TransitionManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
index 714fd97..2da7041 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
@@ -2,10 +2,11 @@
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.VerificationError
 import kotlinx.android.synthetic.main.fragment_edit_payroll_allocation.*
@@ -83,7 +84,7 @@
     fun showUserInterface() {
 
         val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        layoutManager.orientation = RecyclerView.VERTICAL
         rvPayrollAllocation.layoutManager = layoutManager
         rvPayrollAllocation.setHasFixedSize(true)
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/editpayrollbottomsheet/EditPayrollBottomSheet.kt b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/editpayrollbottomsheet/EditPayrollBottomSheet.kt
index df444f3..f212073 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/editpayrollbottomsheet/EditPayrollBottomSheet.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/editpayrollbottomsheet/EditPayrollBottomSheet.kt
@@ -2,7 +2,7 @@
 
 import android.app.Dialog
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.View
 import kotlinx.android.synthetic.main.bottom_sheet_edit_payroll_allocations.view.*
 import org.apache.fineract.R
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
index d424430..daf84fd 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
@@ -11,7 +11,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
index 0cca5f3..77ee5c9 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/editcustomerprofilebottomsheet/EditCustomerProfileBottomSheet.java
@@ -13,9 +13,9 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
index efb6a10..65e99d7 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customertasks/CustomerTasksBottomSheetFragment.java
@@ -3,10 +3,10 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import androidx.core.content.ContextCompat;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
index 345b730..4eaac03 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
index 7f580c3..915cce1 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/DepositOnNavigationBarListener.java
@@ -1,6 +1,6 @@
 package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.apache.fineract.data.models.deposit.DepositAccount;
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
index 47ac807..c3a9602 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/FormDepositOverviewFragment.java
@@ -1,10 +1,10 @@
 package org.apache.fineract.ui.online.depositaccounts.createdepositaccount;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
index e2e262d..cd7aaa4 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/createdepositaccount/formdepositassignproduct/FormDepositAssignProductFragment.java
@@ -3,12 +3,12 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
index 179e63b..a2019ef 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountdetails/DepositAccountDetailsFragment.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
index 0a5e2f4..8b00da4 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/depositaccounts/depositaccountslist/DepositAccountsFragment.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
index 3b46151..dc70503 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormIdentificationDetailsFragment.java
@@ -4,9 +4,9 @@
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
index cba4754..a7a2b50 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/createidentification/FormOverViewIdentificationFragment.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.online.identification.createidentification;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
index 8288492..cdf21ed 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationdetails/IdentificationDetailsFragment.java
@@ -4,9 +4,9 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
index c9e2193..733b688 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
index 2779125..13f695a 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
@@ -12,11 +12,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.core.content.FileProvider;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
index 80e6b34..6b3f6fb 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardActivity.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.online.identification.viewscancard;
 
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 import com.google.gson.reflect.TypeToken;
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
index 07e41f0..a36d5ee 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/identification/viewscancard/ViewScanCardFragment.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.online.identification.viewscancard;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
index cb1f880..4bcb5aa 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportActivity.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.ui.online.loanaccounts.debtincomereport;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
+import com.google.android.material.tabs.TabLayout;
+import androidx.viewpager.widget.ViewPager;
 
 import com.google.gson.reflect.TypeToken;
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
index 8436bcf..c1aa54c 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/debtincomereport/DebtIncomeReportFragment.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.online.loanaccounts.debtincomereport;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
index 34a97dd..7862fca 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
@@ -4,11 +4,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.SearchView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
index 7955e28..81185ec 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/AddDebtIncomeBottomSheet.java
@@ -3,10 +3,10 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.design.widget.BottomSheetDialogFragment;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
index c1167ee..91d12fc 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/BaseFragmentDebtIncome.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.ui.online.loanaccounts.loanapplication;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
index 30cd9ee..173a9e4 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/LoanDebtIncomeFragment.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.stepstone.stepper.Step;
 import com.stepstone.stepper.VerificationError;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
index bebe21c..21f82fc 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loancosigner/LoanCoSignerFragment.java
@@ -3,8 +3,8 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ArrayAdapter;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
index 90397aa..54e208b 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanapplication/loandetails/LoanDetailsFragment.java
@@ -3,11 +3,11 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.AppCompatSpinner;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.textfield.TextInputLayout;
+import androidx.core.widget.NestedScrollView;
+import androidx.appcompat.widget.AppCompatSpinner;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
index 97bdcd1..51cbc3b 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
@@ -2,9 +2,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.v4.widget.NestedScrollView;
+import androidx.annotation.Nullable;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.widget.NestedScrollView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
index 191df3c..ee6412c 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/plannedpayment/PlannedPaymentFragment.java
@@ -1,13 +1,13 @@
 package org.apache.fineract.ui.online.loanaccounts.plannedpayment;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.cardview.widget.CardView;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
index 90abc5c..d06f30a 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
@@ -2,10 +2,11 @@
 
 import android.content.Context
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
 import butterknife.ButterKnife
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.VerificationError
@@ -81,25 +82,25 @@
 
     private fun showUserInterface() {
         val layoutManagerDebt = LinearLayoutManager(activity)
-        layoutManagerDebt.orientation = LinearLayoutManager.VERTICAL
+        layoutManagerDebt.orientation = RecyclerView.VERTICAL
         rvDebt.layoutManager = layoutManagerDebt
         rvDebt.setHasFixedSize(true)
         rvDebt.adapter = debtAdapter
 
         val layoutManagerIncome = LinearLayoutManager(activity)
-        layoutManagerIncome.orientation = LinearLayoutManager.VERTICAL
+        layoutManagerIncome.orientation = RecyclerView.VERTICAL
         rvIncome.layoutManager = layoutManagerIncome
         rvIncome.setHasFixedSize(true)
         rvIncome.adapter = incomeAdapter
 
         val layoutManagerCoSignerDebt = LinearLayoutManager(activity)
-        layoutManagerCoSignerDebt.orientation = LinearLayoutManager.VERTICAL
+        layoutManagerCoSignerDebt.orientation = RecyclerView.VERTICAL
         rvCosignerDebt.layoutManager = layoutManagerCoSignerDebt
         rvCosignerDebt.setHasFixedSize(true)
         rvCosignerDebt.adapter = debtCoSignerAdapter
 
         val layoutManagerCoSignerIncome = LinearLayoutManager(activity)
-        layoutManagerCoSignerIncome.orientation = LinearLayoutManager.VERTICAL
+        layoutManagerCoSignerIncome.orientation = RecyclerView.VERTICAL
         rvCosignerIncome.layoutManager = layoutManagerCoSignerIncome
         rvCosignerIncome.setHasFixedSize(true)
         rvCosignerIncome.adapter = incomeCoSignerAdapter
diff --git a/app/src/main/java/org/apache/fineract/ui/online/review/CreateCustomerReviewFragment.java b/app/src/main/java/org/apache/fineract/ui/online/review/CreateCustomerReviewFragment.java
index dffa38c..2a81a12 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/review/CreateCustomerReviewFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/review/CreateCustomerReviewFragment.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
index 247d453..fe22e55 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/roles/roleslist/RolesFragment.java
@@ -1,10 +1,10 @@
 package org.apache.fineract.ui.online.roles.roleslist;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
index 005e078..b949b30 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
@@ -3,11 +3,12 @@
 import android.app.SearchManager
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SearchView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.appcompat.widget.SearchView
 import android.text.TextUtils
 import android.view.*
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_teller.*
 import kotlinx.android.synthetic.main.layout_exception_handler.*
 import org.apache.fineract.R
@@ -70,7 +71,7 @@
 
         setToolbarTitle(getString(R.string.teller))
         val llManager = LinearLayoutManager(activity)
-        llManager.orientation = LinearLayoutManager.VERTICAL
+        llManager.orientation = RecyclerView.VERTICAL
         rvTellers.layoutManager = llManager
         rvTellers.setHasFixedSize(true)
         rvTellers.adapter = tellerAdapter
diff --git a/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt b/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
index d891470..8d44abb 100644
--- a/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
@@ -3,11 +3,12 @@
 import android.app.SearchManager
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.SearchView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.appcompat.widget.SearchView
 import android.text.TextUtils
 import android.view.*
+import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.fragment_product.*
 import kotlinx.android.synthetic.main.layout_exception_handler.*
 import org.apache.fineract.R
@@ -70,7 +71,7 @@
 
         setToolbarTitle(getString(R.string.products))
         val layoutManager = LinearLayoutManager(activity)
-        layoutManager.orientation = LinearLayoutManager.VERTICAL
+        layoutManager.orientation = RecyclerView.VERTICAL
         rvProduct.layoutManager = layoutManager
         rvProduct.setHasFixedSize(true)
         rvProduct.adapter = productAdapter
diff --git a/app/src/main/java/org/apache/fineract/ui/uierrorhandler/FineractUIErrorHandler.java b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/FineractUIErrorHandler.java
index 0bf6eb6..87cac8e 100644
--- a/app/src/main/java/org/apache/fineract/ui/uierrorhandler/FineractUIErrorHandler.java
+++ b/app/src/main/java/org/apache/fineract/ui/uierrorhandler/FineractUIErrorHandler.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.ui.uierrorhandler;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -10,8 +10,6 @@
 
 import org.apache.fineract.R;
 
-import butterknife.ButterKnife;
-
 /**
  * @author Rajan Maurya
  *         On 03/09/17.
@@ -70,15 +68,15 @@
     }
 
     private void initializeUI() {
-        ivEmptyFeatureImage = ButterKnife.findById(view, R.id.iv_empty_feature_image);
-        tvFeatureName = ButterKnife.findById(view, R.id.tv_empty_feature_name);
-        tvSubFeatureName = ButterKnife.findById(view, R.id.tv_empty_sub_feature_name);
-        llEmptyUI = ButterKnife.findById(view, R.id.ll_empty_ui);
-        llErrorToLoad = ButterKnife.findById(view, R.id.ll_error_to_load);
-        llNoInternet = ButterKnife.findById(view, R.id.ll_no_internet);
-        llError = ButterKnife.findById(view, R.id.ll_error);
-        btnTryAgain = ButterKnife.findById(view, R.id.btn_try_again);
-        tvErrorFeatureName = ButterKnife.findById(view, R.id.tv_error_feature_name);
-        ivErrorNoInternet = ButterKnife.findById(view, R.id.iv_error_no_connection);
+        ivEmptyFeatureImage = view.findViewById(R.id.iv_empty_feature_image);
+        tvFeatureName = view.findViewById(R.id.tv_empty_feature_name);
+        tvSubFeatureName = view.findViewById(R.id.tv_empty_sub_feature_name);
+        llEmptyUI = view.findViewById(R.id.ll_empty_ui);
+        llErrorToLoad = view.findViewById(R.id.ll_error_to_load);
+        llNoInternet = view.findViewById(R.id.ll_no_internet);
+        llError = view.findViewById(R.id.ll_error);
+        btnTryAgain = view.findViewById(R.id.btn_try_again);
+        tvErrorFeatureName = view.findViewById(R.id.tv_error_feature_name);
+        ivErrorNoInternet = view.findViewById(R.id.iv_error_no_connection);
     }
 }
diff --git a/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java b/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
index f97ae9d..d3ed3bb 100644
--- a/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/DelayAutoCompleteTextView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.AppCompatAutoCompleteTextView;
+import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ProgressBar;
diff --git a/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java b/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
index e3e2b00..a05a1b7 100644
--- a/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
+++ b/app/src/main/java/org/apache/fineract/ui/views/ViewBehavior.java
@@ -3,8 +3,8 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CoordinatorLayout;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
diff --git a/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java b/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
index 8e3ac13..6464d53 100644
--- a/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
+++ b/app/src/main/java/org/apache/fineract/utils/CheckSelfPermissionAndRequest.java
@@ -8,9 +8,9 @@
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import org.apache.fineract.R;
diff --git a/app/src/main/java/org/apache/fineract/utils/FileUtils.java b/app/src/main/java/org/apache/fineract/utils/FileUtils.java
index aac4fc4..57f841f 100644
--- a/app/src/main/java/org/apache/fineract/utils/FileUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/FileUtils.java
@@ -10,7 +10,7 @@
 import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 
diff --git a/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java b/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
index 54dbbdd..7cc4999 100644
--- a/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
+++ b/app/src/main/java/org/apache/fineract/utils/MaterialDialog.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.StringRes;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
 
 import org.apache.fineract.R;
 
diff --git a/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java b/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
index 4186dba..98925aa 100644
--- a/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
+++ b/app/src/main/java/org/apache/fineract/utils/ScrollFabBehavior.java
@@ -1,9 +1,9 @@
 package org.apache.fineract.utils;
 
 import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.view.ViewCompat;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/app/src/main/java/org/apache/fineract/utils/StatusUtils.java b/app/src/main/java/org/apache/fineract/utils/StatusUtils.java
index 374b508..3cd120f 100644
--- a/app/src/main/java/org/apache/fineract/utils/StatusUtils.java
+++ b/app/src/main/java/org/apache/fineract/utils/StatusUtils.java
@@ -1,8 +1,8 @@
 package org.apache.fineract.utils;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.widget.ImageView;
 
 import com.google.gson.annotations.SerializedName;
diff --git a/app/src/main/java/org/apache/fineract/utils/Utils.java b/app/src/main/java/org/apache/fineract/utils/Utils.java
index d9af4bd..b0b8326 100644
--- a/app/src/main/java/org/apache/fineract/utils/Utils.java
+++ b/app/src/main/java/org/apache/fineract/utils/Utils.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.Menu;
 
 import com.google.gson.Gson;
diff --git a/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java b/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
index df806d8..ae71bfe 100644
--- a/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
+++ b/app/src/main/java/org/apache/fineract/utils/ValidateIdentifierUtil.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.utils;
 
 import android.content.Context;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.TextUtils;
 
 import org.apache.fineract.R;
diff --git a/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java b/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
index 3d89309..bf8b4c2 100644
--- a/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
+++ b/app/src/main/java/org/apache/fineract/utils/ValidationUtil.java
@@ -1,7 +1,7 @@
 package org.apache.fineract.utils;
 
 import android.content.Context;
-import android.support.design.widget.TextInputLayout;
+import com.google.android.material.textfield.TextInputLayout;
 import android.text.TextUtils;
 
 import org.apache.fineract.R;
diff --git a/app/src/main/res/layout/activity_create_customer.xml b/app/src/main/res/layout/activity_create_customer.xml
index 01c00ba..de7d5ba 100644
--- a/app/src/main/res/layout/activity_create_customer.xml
+++ b/app/src/main/res/layout/activity_create_customer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
     android:layout_height="match_parent"
@@ -30,7 +30,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/activity_create_deposit.xml b/app/src/main/res/layout/activity_create_deposit.xml
index b39fcff..12b2f89 100644
--- a/app/src/main/res/layout/activity_create_deposit.xml
+++ b/app/src/main/res/layout/activity_create_deposit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
     android:layout_height="match_parent"
@@ -29,4 +29,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_create_identification.xml b/app/src/main/res/layout/activity_create_identification.xml
index b39fcff..12b2f89 100644
--- a/app/src/main/res/layout/activity_create_identification.xml
+++ b/app/src/main/res/layout/activity_create_identification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
     android:layout_height="match_parent"
@@ -29,4 +29,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index 240a37e..1690643 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -18,7 +18,7 @@
             style="@style/FrameLayout.Container" />
     </LinearLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:fitsSystemWindows="true"
         android:id="@+id/nav_view"
         android:layout_gravity="start"
@@ -27,4 +27,4 @@
         app:headerLayout="@layout/layout_nav_header"
         app:menu="@menu/menu_navigation_drawer"/>
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_debt_income_report.xml b/app/src/main/res/layout/activity_debt_income_report.xml
index 743423a..f92936f 100644
--- a/app/src/main/res/layout/activity_debt_income_report.xml
+++ b/app/src/main/res/layout/activity_debt_income_report.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_content"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:background="?attr/colorPrimary"
             android:id="@+id/toolbar"
             android:layout_height="?attr/actionBarSize"
@@ -20,17 +20,17 @@
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tl_debt_income"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_debt_income"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</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_edit_payroll.xml b/app/src/main/res/layout/activity_edit_payroll.xml
index 01c00ba..de7d5ba 100644
--- a/app/src/main/res/layout/activity_edit_payroll.xml
+++ b/app/src/main/res/layout/activity_edit_payroll.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
     android:layout_height="match_parent"
@@ -30,7 +30,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml
index ed0a4f9..0f992ea 100644
--- a/app/src/main/res/layout/activity_launcher.xml
+++ b/app/src/main/res/layout/activity_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
@@ -27,4 +27,4 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_loan_application.xml b/app/src/main/res/layout/activity_loan_application.xml
index 59a6da8..119fd9d 100644
--- a/app/src/main/res/layout/activity_loan_application.xml
+++ b/app/src/main/res/layout/activity_loan_application.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:fitsSystemWindows="true"
     android:layout_height="match_parent"
@@ -29,7 +29,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 707c1b9..ac2039a 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,7 +7,7 @@
 
     <include layout="@layout/toolbar"/>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
@@ -46,7 +46,7 @@
                 android:layout_width="match_parent"
                 android:orientation="vertical">
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent">
 
@@ -61,9 +61,9 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent">
 
@@ -78,9 +78,9 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
                     app:passwordToggleEnabled="true">
@@ -96,7 +96,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </LinearLayout>
 
@@ -111,5 +111,5 @@
 
         </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/activity_toolbar_container.xml b/app/src/main/res/layout/activity_toolbar_container.xml
index f7f00ff..94f3787 100644
--- a/app/src/main/res/layout/activity_toolbar_container.xml
+++ b/app/src/main/res/layout/activity_toolbar_container.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -14,5 +14,5 @@
             style="@style/FrameLayout.Container" />
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/activity_view_scan_card.xml b/app/src/main/res/layout/activity_view_scan_card.xml
index 41e8a0b..40b974c 100644
--- a/app/src/main/res/layout/activity_view_scan_card.xml
+++ b/app/src/main/res/layout/activity_view_scan_card.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/main_content"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:background="?attr/colorPrimary"
             android:id="@+id/toolbar"
             android:layout_height="?attr/actionBarSize"
@@ -20,12 +20,12 @@
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/vp_view_scan_card"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</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/bottom_sheet_add_debt_income.xml b/app/src/main/res/layout/bottom_sheet_add_debt_income.xml
index 9f80100..09a965d 100644
--- a/app/src/main/res/layout/bottom_sheet_add_debt_income.xml
+++ b/app/src/main/res/layout/bottom_sheet_add_debt_income.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
@@ -28,7 +28,7 @@
                 android:textColor="@color/colorPrimaryDark"
                 android:textStyle="bold"/>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:paddingLeft="@dimen/layout_padding_24dp"
@@ -40,9 +40,9 @@
                     android:inputType="numberDecimal"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:paddingTop="@dimen/layout_padding_16dp"
@@ -57,7 +57,7 @@
                     android:inputType="textMultiLine"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
@@ -96,7 +96,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/bottom_sheet_add_document.xml b/app/src/main/res/layout/bottom_sheet_add_document.xml
index c580311..bbcf237 100644
--- a/app/src/main/res/layout/bottom_sheet_add_document.xml
+++ b/app/src/main/res/layout/bottom_sheet_add_document.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools">
@@ -54,7 +54,7 @@
 
             </LinearLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:paddingLeft="@dimen/layout_padding_24dp"
@@ -68,7 +68,7 @@
                     android:inputType="textMultiLine"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <LinearLayout
                 android:id="@+id/ll_document_name"
@@ -135,7 +135,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml b/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml
index 66ab690..709117e 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_height="match_parent"
@@ -266,9 +266,9 @@
 
         </RelativeLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/bottom_sheet_edit_payroll_allocations.xml b/app/src/main/res/layout/bottom_sheet_edit_payroll_allocations.xml
index ef1ecf4..e23e0d7 100644
--- a/app/src/main/res/layout/bottom_sheet_edit_payroll_allocations.xml
+++ b/app/src/main/res/layout/bottom_sheet_edit_payroll_allocations.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -28,7 +28,7 @@
                 android:textColor="@color/colorPrimaryDark"
                 android:textStyle="bold" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingLeft="@dimen/layout_padding_24dp"
@@ -41,9 +41,9 @@
                     android:inputType="text"
                     android:hint="@string/account" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:paddingLeft="@dimen/layout_padding_24dp"
@@ -57,7 +57,7 @@
                     android:hint="@string/amount"
                     android:inputType="numberDecimal"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
@@ -105,7 +105,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/bottom_sheet_task_list.xml b/app/src/main/res/layout/bottom_sheet_task_list.xml
index 02aae7b..916c343 100644
--- a/app/src/main/res/layout/bottom_sheet_task_list.xml
+++ b/app/src/main/res/layout/bottom_sheet_task_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -154,7 +154,7 @@
 
             </LinearLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:paddingEnd="@dimen/layout_padding_24dp"
@@ -169,7 +169,7 @@
                     android:layout_width="match_parent"
                     android:scrollHorizontally="false"
                     android:scrollbars="vertical"/>
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
         </LinearLayout>
 
@@ -210,7 +210,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml b/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml
index 0efb1bf..229b358 100644
--- a/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml
+++ b/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_height="match_parent"
@@ -37,7 +37,7 @@
                     android:textColor="@color/colorPrimaryDark"
                     android:textStyle="bold"/>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_identifier"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
@@ -50,9 +50,9 @@
                         android:inputType="text"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"/>
-                </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/til_description"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
@@ -68,7 +68,7 @@
                         android:layout_width="match_parent"
                         android:scrollHorizontally="false"
                         android:scrollbars="vertical"/>
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
 
                 <LinearLayout
@@ -81,7 +81,7 @@
                     android:paddingTop="@dimen/layout_padding_16dp"
                     android:weightSum="1">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_selected_file"
                         android:gravity="center"
                         android:layout_height="wrap_content"
@@ -101,7 +101,7 @@
                             android:scrollHorizontally="false"
                             android:enabled="false"
                             android:scrollbars="vertical"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                     <Button
                         android:drawableLeft="@drawable/ic_folder_black_24dp"
@@ -152,9 +152,9 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
 
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 164d6a0..b398d13 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvAccount"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layoutError"
         android:visibility="gone"/>
 
-</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/fragment_add_loan_review.xml b/app/src/main/res/layout/fragment_add_loan_review.xml
index 4b6f1fb..02ee0cc 100644
--- a/app/src/main/res/layout/fragment_add_loan_review.xml
+++ b/app/src/main/res/layout/fragment_add_loan_review.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_review"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.core.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/ncv_loan_review"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -13,7 +13,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_loan_review"
             android:layout_width="match_parent"
@@ -309,7 +309,7 @@
 
                     <View style="@style/TextViewUnderline.Grey" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rvDebt"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -331,7 +331,7 @@
 
                     <View style="@style/TextViewUnderline.Grey" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rvIncome"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -392,7 +392,7 @@
 
                     <View style="@style/TextViewUnderline.Grey" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rvCosignerDebt"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -414,7 +414,7 @@
 
                     <View style="@style/TextViewUnderline.Grey" />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rvCosignerIncome"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -424,8 +424,8 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_create_customer_review.xml b/app/src/main/res/layout/fragment_create_customer_review.xml
index 3707575..7d40609 100644
--- a/app/src/main/res/layout/fragment_create_customer_review.xml
+++ b/app/src/main/res/layout/fragment_create_customer_review.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_customer_review"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.core.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/ncv_customer_review"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -13,7 +13,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_customer_review"
             android:layout_width="match_parent"
@@ -308,8 +308,8 @@
                 </LinearLayout>
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_customer_activities.xml b/app/src/main/res/layout/fragment_customer_activities.xml
index 3e328d8..2b6b231 100644
--- a/app/src/main/res/layout/fragment_customer_activities.xml
+++ b/app/src/main/res/layout/fragment_customer_activities.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_customer_activities"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-</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/fragment_customer_deposit.xml b/app/src/main/res/layout/fragment_customer_deposit.xml
index dab0e52..a4f4a8e 100644
--- a/app/src/main/res/layout/fragment_customer_deposit.xml
+++ b/app/src/main/res/layout/fragment_customer_deposit.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_customers_deposit_accounts"
         android:layout_centerHorizontal="true"
         android:layout_height="match_parent"
@@ -17,7 +17,7 @@
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:id="@+id/fab_add_deposit_accounts"
         android:layout_gravity="bottom|end"
@@ -27,4 +27,4 @@
         app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_black_24dp"/>
 
-</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/fragment_customer_deposit_details.xml b/app/src/main/res/layout/fragment_customer_deposit_details.xml
index c47a1b3..f15ab36 100644
--- a/app/src/main/res/layout/fragment_customer_deposit_details.xml
+++ b/app/src/main/res/layout/fragment_customer_deposit_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:orientation="vertical"
     android:visibility="invisible">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/white"
@@ -209,14 +209,14 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_edit_deposit_account"
@@ -228,4 +228,4 @@
         app:srcCompat="@drawable/ic_edit_black_24dp"/>
 
 
-</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/fragment_customer_details.xml b/app/src/main/res/layout/fragment_customer_details.xml
index 1be884c..8500cee 100644
--- a/app/src/main/res/layout/fragment_customer_details.xml
+++ b/app/src/main/res/layout/fragment_customer_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,19 +7,19 @@
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/cl_customer_details"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:fitsSystemWindows="true"
             android:id="@+id/app_bar_layout"
             android:layout_height="@dimen/detail_backdrop_height"
             android:layout_width="match_parent"
             android:theme="@style/AppTheme.AppBarOverlay">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:clickable="true"
                 android:fitsSystemWindows="true"
                 android:focusable="true"
@@ -40,7 +40,7 @@
                     android:src="@drawable/mifos_logo_new"
                     app:layout_collapseMode="parallax"/>
 
-                <android.support.v7.widget.Toolbar
+                <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_height="?attr/actionBarSize"
                     android:layout_width="match_parent"
@@ -55,13 +55,13 @@
                         android:layout_width="match_parent"
                         android:visibility="gone"/>
 
-                </android.support.v7.widget.Toolbar>
+                </androidx.appcompat.widget.Toolbar>
 
-            </android.support.design.widget.CollapsingToolbarLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:background="@color/gray_light"
@@ -75,7 +75,7 @@
                 android:layout_width="match_parent"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:app="http://schemas.android.com/apk/res-auto"
                     android:background="@color/white"
@@ -356,7 +356,7 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
                 <TextView
                     android:layout_height="match_parent"
@@ -369,7 +369,7 @@
                     android:paddingTop="@dimen/layout_padding_16dp"
                     android:text="@string/financial_products"/>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:app="http://schemas.android.com/apk/res-auto"
                     android:background="@color/white"
@@ -519,7 +519,7 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
                 <TextView
                     android:layout_height="match_parent"
@@ -532,7 +532,7 @@
                     android:paddingTop="@dimen/layout_padding_16dp"
                     android:text="@string/management"/>
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     xmlns:android="http://schemas.android.com/apk/res/android"
                     xmlns:app="http://schemas.android.com/apk/res-auto"
                     android:background="@color/white"
@@ -682,11 +682,11 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             layout="@layout/layout_collapsing_header_view"
@@ -696,7 +696,7 @@
             app:layout_behavior="org.apache.fineract.ui.views.ViewBehavior"
         />
 
-        <android.support.design.widget.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:clickable="true"
             android:focusable="true"
             android:id="@+id/fab_edit_customer"
@@ -708,11 +708,11 @@
             app:layout_anchorGravity="bottom|end"
             app:srcCompat="@drawable/ic_edit_black_24dp"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_customer_list.xml b/app/src/main/res/layout/fragment_customer_list.xml
index 01afc76..626c1fc 100644
--- a/app/src/main/res/layout/fragment_customer_list.xml
+++ b/app/src/main/res/layout/fragment_customer_list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/coordinator"
     android:layout_width="match_parent"
@@ -60,19 +60,19 @@
         </LinearLayout>
 
 
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipe_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_customers"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="@dimen/layout_padding_30dp" />
 
 
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </LinearLayout>
 
@@ -81,7 +81,7 @@
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_add_customer"
@@ -92,4 +92,4 @@
         app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_black_24dp"/>
 
-</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/fragment_customer_loan_details.xml b/app/src/main/res/layout/fragment_customer_loan_details.xml
index c8c3d52..7ce43f1 100644
--- a/app/src/main/res/layout/fragment_customer_loan_details.xml
+++ b/app/src/main/res/layout/fragment_customer_loan_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,7 +8,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -29,7 +29,7 @@
                 android:id="@+id/cl_alert_message"
                 android:visibility="gone"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -330,7 +330,7 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <TextView
                 android:layout_height="match_parent"
@@ -343,7 +343,7 @@
                 android:paddingTop="@dimen/layout_padding_16dp"
                 android:text="@string/management"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -496,11 +496,11 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <include
         layout="@layout/layout_bottom_content"
@@ -515,4 +515,4 @@
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-</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/fragment_customer_loans.xml b/app/src/main/res/layout/fragment_customer_loans.xml
index 507bd0d..10d3dbe 100644
--- a/app/src/main/res/layout/fragment_customer_loans.xml
+++ b/app/src/main/res/layout/fragment_customer_loans.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_customers_loans"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
@@ -18,14 +18,14 @@
             android:layout_weight="1"
             android:layout_width="wrap_content"
             android:scrollbars="vertical"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_add_customer_loan"
@@ -36,4 +36,4 @@
         app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_black_24dp"/>
 
-</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/fragment_customer_payload.xml b/app/src/main/res/layout/fragment_customer_payload.xml
index 57a0e48..112faf5 100644
--- a/app/src/main/res/layout/fragment_customer_payload.xml
+++ b/app/src/main/res/layout/fragment_customer_payload.xml
@@ -1,22 +1,22 @@
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_customers"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_sweet_exception_handler"
@@ -24,4 +24,4 @@
         android:visibility="gone"/>
 
 
-</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/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 01bd7ce..030dbc1 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cl_customer_deposit_details"
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical" >
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:clickable="true"
@@ -106,6 +106,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-</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/fragment_debt_income_report.xml b/app/src/main/res/layout/fragment_debt_income_report.xml
index 007eaf5..17390cb 100644
--- a/app/src/main/res/layout/fragment_debt_income_report.xml
+++ b/app/src/main/res/layout/fragment_debt_income_report.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -31,7 +31,7 @@
                 android:paddingTop="@dimen/layout_padding_16dp"
                 android:text="@string/total_debt"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -102,7 +102,7 @@
 
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_debt"
                         android:layout_height="0dp"
                         android:layout_weight="1"
@@ -117,7 +117,7 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <TextView
                 android:id="@+id/tv_income_ratio"
@@ -131,7 +131,7 @@
                 android:paddingTop="@dimen/layout_padding_8dp"
                 android:text="@string/total_income"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -198,7 +198,7 @@
 
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_income"
                         android:layout_height="0dp"
                         android:layout_weight="1"
@@ -213,10 +213,10 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_edit_payroll.xml b/app/src/main/res/layout/fragment_edit_payroll.xml
index fabdfb1..0269052 100644
--- a/app/src/main/res/layout/fragment_edit_payroll.xml
+++ b/app/src/main/res/layout/fragment_edit_payroll.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/clEditPayroll"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/ncvEditPayroll"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cvEditPayroll"
@@ -37,7 +37,7 @@
                     android:orientation="vertical"
                     android:padding="@dimen/layout_padding_16dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/tilAccount"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -50,9 +50,9 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/account"
                             android:inputType="text" />
-                    </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/tilCreatedBy"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -64,9 +64,9 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/created_by"
                             android:inputType="text" />
-                    </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/tilCreatedOn"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -79,9 +79,9 @@
                             android:focusable="false"
                             android:hint="@string/created_on"
                             android:inputType="date" />
-                    </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/tilLastModifiedBy"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -93,9 +93,9 @@
                             android:layout_height="wrap_content"
                             android:hint="@string/last_modified_by"
                             android:inputType="text" />
-                    </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/tilLastModifiedOn"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -108,14 +108,14 @@
                             android:focusable="false"
                             android:hint="@string/last_modified_by"
                             android:inputType="text" />
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_edit_payroll_allocation.xml b/app/src/main/res/layout/fragment_edit_payroll_allocation.xml
index 22145a2..66b55fa 100644
--- a/app/src/main/res/layout/fragment_edit_payroll_allocation.xml
+++ b/app/src/main/res/layout/fragment_edit_payroll_allocation.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/clEditPayroll"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="visible">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvPayrollAllocation"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabAddPayrollAllocation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -22,4 +22,4 @@
         android:tint="@color/white"
         app:srcCompat="@drawable/ic_add_black_24dp" />
 
-</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/fragment_form_customer_address.xml b/app/src/main/res/layout/fragment_form_customer_address.xml
index 80e6a48..a307d1e 100644
--- a/app/src/main/res/layout/fragment_form_customer_address.xml
+++ b/app/src/main/res/layout/fragment_form_customer_address.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -37,7 +37,7 @@
                     android:orientation="vertical"
                     android:padding="@dimen/layout_padding_16dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_street"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -50,9 +50,9 @@
                             android:inputType="text"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_city"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -65,9 +65,9 @@
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:digits="@string/restrict_a_zA_Z"/>
-                    </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/til_postal_code"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -79,9 +79,9 @@
                             android:inputType="text"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_country"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -94,9 +94,9 @@
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:digits="@string/restrict_a_zA_Z"/>
-                    </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/til_region"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -109,15 +109,15 @@
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"
                             android:digits="@string/restrict_a_zA_Z"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_form_customer_contact.xml b/app/src/main/res/layout/fragment_form_customer_contact.xml
index 714754a..361692a 100644
--- a/app/src/main/res/layout/fragment_form_customer_contact.xml
+++ b/app/src/main/res/layout/fragment_form_customer_contact.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -37,7 +37,7 @@
                     android:orientation="vertical"
                     android:padding="@dimen/layout_padding_16dp">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_email"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -50,9 +50,9 @@
                             android:inputType="textEmailAddress"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_phone"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -64,9 +64,9 @@
                             android:inputType="text"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_mobile"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -78,14 +78,14 @@
                             android:inputType="text"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_form_customer_details.xml b/app/src/main/res/layout/fragment_form_customer_details.xml
index 0b0f7a6..ef89fba 100644
--- a/app/src/main/res/layout/fragment_form_customer_details.xml
+++ b/app/src/main/res/layout/fragment_form_customer_details.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -37,7 +37,7 @@
                     android:orientation="vertical"
                     android:padding="@dimen/layout_padding_16dp" >
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_account"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -51,9 +51,9 @@
                             android:digits="@string/restrict_a_zA_Z0_9"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_first_name"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -66,9 +66,9 @@
                             android:digits="@string/restrict_a_zA_Z"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_middle_name"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -81,9 +81,9 @@
                             android:digits="@string/restrict_a_zA_Z"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_last_name"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
@@ -96,9 +96,9 @@
                             android:digits="@string/restrict_a_zA_Z"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </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/til_date_of_birth"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent" >
@@ -113,7 +113,7 @@
                             android:focusable="false"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                 </LinearLayout>
 
@@ -139,8 +139,8 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_form_deposit_assign_product.xml b/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
index 17b17e7..0b8a3de 100644
--- a/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
+++ b/app/src/main/res/layout/fragment_form_deposit_assign_product.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -15,7 +15,7 @@
         android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -40,14 +40,14 @@
                     android:layout_width="match_parent"
                     android:text="@string/select_product"/>
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     style="@style/Widget.AppCompat.Spinner.Underlined"
                     android:entries="@array/loan_application_steps"
                     android:id="@+id/sp_products"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_beneficiary"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
@@ -57,7 +57,7 @@
                     android:layout_height="match_parent"
                     android:layout_width="match_parent">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_search_beneficiary"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/layout_padding_16dp"
@@ -72,7 +72,7 @@
                             android:layout_width="match_parent"
                             android:imeOptions="flagNoExtractUi|actionSearch"/>
 
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
                     <ProgressBar
                         android:id="@+id/pb_search_beneficiary"
@@ -95,13 +95,13 @@
 
 
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-</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/fragment_form_deposit_overview.xml b/app/src/main/res/layout/fragment_form_deposit_overview.xml
index f7e5533..28651e0 100644
--- a/app/src/main/res/layout/fragment_form_deposit_overview.xml
+++ b/app/src/main/res/layout/fragment_form_deposit_overview.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_deposit_assign_product"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -64,7 +64,7 @@
                     android:text="@string/no_beneficiary"
                     android:visibility="gone"/>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_beneficiary"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
@@ -77,8 +77,8 @@
             </LinearLayout>
 
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_form_identification_details.xml b/app/src/main/res/layout/fragment_form_identification_details.xml
index a759c56..a70f607 100644
--- a/app/src/main/res/layout/fragment_form_identification_details.xml
+++ b/app/src/main/res/layout/fragment_form_identification_details.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -32,7 +32,7 @@
                 android:orientation="vertical"
                 android:padding="@dimen/layout_padding_16dp" >
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_number"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -45,9 +45,9 @@
                         android:inputType="text"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
-                </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/til_type"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -59,9 +59,9 @@
                         android:inputType="text"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
-                </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/til_expiration_date"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -77,9 +77,9 @@
                         android:focusable="false"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
-                </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/til_issuer"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
@@ -91,12 +91,12 @@
                         android:inputType="text"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_form_overview_identification.xml b/app/src/main/res/layout/fragment_form_overview_identification.xml
index e33065f..08057be 100644
--- a/app/src/main/res/layout/fragment_form_overview_identification.xml
+++ b/app/src/main/res/layout/fragment_form_overview_identification.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/ncv_loan_details"
@@ -16,7 +16,7 @@
         android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -81,8 +81,8 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_identification_details.xml b/app/src/main/res/layout/fragment_identification_details.xml
index 0c4fa5b..9a0872b 100644
--- a/app/src/main/res/layout/fragment_identification_details.xml
+++ b/app/src/main/res/layout/fragment_identification_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:orientation="vertical"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -24,7 +24,7 @@
             android:orientation="vertical"
             android:paddingBottom="@dimen/layout_padding_64dp">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -175,7 +175,7 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <TextView
                 android:layout_height="match_parent"
@@ -188,7 +188,7 @@
                 android:paddingTop="@dimen/layout_padding_16dp"
                 android:text="@string/scans_uploaded"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -201,7 +201,7 @@
                     android:layout_height="match_parent"
                     android:layout_width="match_parent">
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_scans_uploaded"
                         android:layout_height="match_parent"
                         android:layout_width="match_parent"/>
@@ -226,13 +226,13 @@
 
                 </FrameLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_upload_identification_scan_card"
@@ -244,4 +244,4 @@
         app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_a_photo_black_24dp"/>
 
-</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/fragment_identification_list.xml b/app/src/main/res/layout/fragment_identification_list.xml
index 202d482..b6a7df0 100644
--- a/app/src/main/res/layout/fragment_identification_list.xml
+++ b/app/src/main/res/layout/fragment_identification_list.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/white"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_identifications"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_add_identification_card"
@@ -36,4 +36,4 @@
         app:layout_behavior="org.apache.fineract.utils.ScrollFabBehavior"
         app:srcCompat="@drawable/ic_add_black_24dp"/>
 
-</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/fragment_ledger.xml b/app/src/main/res/layout/fragment_ledger.xml
index 19ff350..95377a4 100644
--- a/app/src/main/res/layout/fragment_ledger.xml
+++ b/app/src/main/res/layout/fragment_ledger.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvLedger"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layoutError"
         android:visibility="gone"/>
 
-</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/fragment_loan_co_signer.xml b/app/src/main/res/layout/fragment_loan_co_signer.xml
index a84b521..407359d 100644
--- a/app/src/main/res/layout/fragment_loan_co_signer.xml
+++ b/app/src/main/res/layout/fragment_loan_co_signer.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -21,7 +21,7 @@
             android:paddingTop="@dimen/layout_padding_8dp"
             android:orientation="vertical">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -85,12 +85,12 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <include layout="@layout/fragment_loan_debt_income_ratio"/>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_loan_debt_income_ratio.xml b/app/src/main/res/layout/fragment_loan_debt_income_ratio.xml
index aa9fc60..f1a5dab 100644
--- a/app/src/main/res/layout/fragment_loan_debt_income_ratio.xml
+++ b/app/src/main/res/layout/fragment_loan_debt_income_ratio.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -33,7 +33,7 @@
                 android:paddingTop="@dimen/layout_padding_16dp"
                 android:text="@string/ratio"/>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -101,7 +101,7 @@
 
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_debt"
                         android:layout_height="0dp"
                         android:layout_marginBottom="@dimen/layout_padding_30dp"
@@ -112,9 +112,9 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -182,7 +182,7 @@
 
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_income"
                         android:layout_height="0dp"
                         android:layout_marginBottom="@dimen/layout_padding_30dp"
@@ -192,10 +192,10 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_loan_details.xml b/app/src/main/res/layout/fragment_loan_details.xml
index fc8e2bc..7ae0226 100644
--- a/app/src/main/res/layout/fragment_loan_details.xml
+++ b/app/src/main/res/layout/fragment_loan_details.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:visibility="visible">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -16,7 +16,7 @@
         android:visibility="invisible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/cv_financial_products"
@@ -40,14 +40,14 @@
                     android:layout_width="match_parent"
                     android:text="@string/products"/>
 
-                <android.support.v7.widget.AppCompatSpinner
+                <androidx.appcompat.widget.AppCompatSpinner
                     style="@style/Widget.AppCompat.Spinner.Underlined"
                     android:entries="@array/loan_application_steps"
                     android:id="@+id/sp_products"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"/>
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/til_short_name"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_padding_16dp"
@@ -60,9 +60,9 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"
                         android:inputType="text"/>
-                </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/til_principal_amount"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/layout_padding_4dp"
@@ -74,7 +74,7 @@
                         android:inputType="numberDecimal"
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <LinearLayout
                     android:layout_height="match_parent"
@@ -83,7 +83,7 @@
                     android:orientation="horizontal"
                     android:weightSum="2">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_term"
                         android:layout_height="match_parent"
                         android:layout_marginTop="@dimen/layout_padding_4dp"
@@ -96,9 +96,9 @@
                             android:inputType="numberDecimal"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         style="@style/Widget.AppCompat.Spinner.Underlined"
                         android:entries="@array/loan_application_steps"
                         android:id="@+id/sp_term_unit_type"
@@ -115,7 +115,7 @@
                     android:orientation="horizontal"
                     android:weightSum="2">
 
-                    <android.support.design.widget.TextInputLayout
+                    <com.google.android.material.textfield.TextInputLayout
                         android:id="@+id/til_repay"
                         android:layout_height="match_parent"
                         android:layout_marginTop="@dimen/layout_padding_4dp"
@@ -128,9 +128,9 @@
                             android:inputType="number"
                             android:layout_height="wrap_content"
                             android:layout_width="match_parent"/>
-                    </android.support.design.widget.TextInputLayout>
+                    </com.google.android.material.textfield.TextInputLayout>
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         style="@style/Widget.AppCompat.Spinner.Underlined"
                         android:entries="@array/loan_application_steps"
                         android:id="@+id/sp_repay_unit_type"
@@ -157,7 +157,7 @@
                         android:layout_width="match_parent"
                         android:text="@string/on"/>
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         style="@style/Widget.AppCompat.Spinner.Underlined"
                         android:entries="@array/loan_application_steps"
                         android:id="@+id/sp_repay_unit_week"
@@ -219,7 +219,7 @@
                             android:orientation="horizontal"
                             android:weightSum="2">
 
-                            <android.support.v7.widget.AppCompatSpinner
+                            <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/sp_repay_month_day_in_number"
                                 style="@style/Widget.AppCompat.Spinner.Underlined"
                                 android:entries="@array/loan_application_steps"
@@ -251,7 +251,7 @@
                             android:orientation="horizontal"
                             android:weightSum="2">
 
-                            <android.support.v7.widget.AppCompatSpinner
+                            <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/sp_repay_time_slots"
                                 style="@style/Widget.AppCompat.Spinner.Underlined"
                                 android:entries="@array/loan_application_steps"
@@ -260,7 +260,7 @@
                                 android:layout_weight="1"
                                 android:layout_width="match_parent"/>
 
-                            <android.support.v7.widget.AppCompatSpinner
+                            <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/sp_repay_week_days"
                                 style="@style/Widget.AppCompat.Spinner.Underlined"
                                 android:entries="@array/loan_application_steps"
@@ -291,7 +291,7 @@
                         android:layout_width="wrap_content"
                         android:text="@string/in"/>
 
-                    <android.support.v7.widget.AppCompatSpinner
+                    <androidx.appcompat.widget.AppCompatSpinner
                         android:id="@+id/sp_repay_year_month"
                         style="@style/Widget.AppCompat.Spinner.Underlined"
                         android:entries="@array/loan_application_steps"
@@ -303,13 +303,13 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-</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/fragment_loan_document.xml b/app/src/main/res/layout/fragment_loan_document.xml
index 485b18e..3ffb7bc 100644
--- a/app/src/main/res/layout/fragment_loan_document.xml
+++ b/app/src/main/res/layout/fragment_loan_document.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/gray_light"
@@ -21,7 +21,7 @@
             android:orientation="vertical">
 
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:background="@color/white"
@@ -87,7 +87,7 @@
 
                     </LinearLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_customers"
                         android:layout_height="0dp"
                         android:layout_marginBottom="@dimen/layout_padding_30dp"
@@ -98,11 +98,11 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</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/fragment_payroll.xml b/app/src/main/res/layout/fragment_payroll.xml
index 95d0709..5aa0629 100644
--- a/app/src/main/res/layout/fragment_payroll.xml
+++ b/app/src/main/res/layout/fragment_payroll.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -9,7 +9,7 @@
     android:orientation="vertical"
     android:visibility="visible">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/cvPayroll"
@@ -194,14 +194,14 @@
         </LinearLayout>
 
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
     <include
         android:id="@+id/layoutError"
         layout="@layout/layout_exception_handler"
         android:visibility="gone" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fabEditPayroll"
@@ -212,4 +212,4 @@
         android:tint="@color/white"
         app:srcCompat="@drawable/ic_edit_black_24dp"/>
 
-</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/fragment_planned_payment.xml b/app/src/main/res/layout/fragment_planned_payment.xml
index b340779..8f0b3a8 100644
--- a/app/src/main/res/layout/fragment_planned_payment.xml
+++ b/app/src/main/res/layout/fragment_planned_payment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 style="@style/Toolbar.Common"
@@ -46,11 +46,11 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
         </LinearLayout>
 
-        <android.support.v7.widget.CardView
+        <androidx.cardview.widget.CardView
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:background="@color/white"
@@ -72,7 +72,7 @@
                     android:layout_height="300dp"
                     android:layout_width="match_parent"/>
 
-                <android.support.v7.widget.AppCompatButton
+                <androidx.appcompat.widget.AppCompatButton
                     android:id="@+id/btn_load_planned_payment"
                     android:layout_gravity="end"
                     android:layout_height="wrap_content"
@@ -83,34 +83,34 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-        <android.support.design.widget.CoordinatorLayout
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_height="match_parent"
             android:layout_width="match_parent">
 
-            <android.support.v4.widget.SwipeRefreshLayout
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:id="@+id/swipe_container"
                 android:layout_height="match_parent"
                 android:layout_width="match_parent">
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_planned_payment"
                     android:layout_centerHorizontal="true"
                     android:layout_height="0dp"
                     android:layout_marginBottom="@dimen/layout_padding_30dp"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"/>
-            </android.support.v4.widget.SwipeRefreshLayout>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
             <include
                 layout="@layout/layout_exception_handler"
                 android:id="@+id/layout_error"
                 android:visibility="gone"/>
 
-        </android.support.design.widget.CoordinatorLayout>
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </LinearLayout>
 
-</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/fragment_product.xml b/app/src/main/res/layout/fragment_product.xml
index 59fa9de..2b279d3 100644
--- a/app/src/main/res/layout/fragment_product.xml
+++ b/app/src/main/res/layout/fragment_product.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvProduct"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/layout_padding_30dp"
             android:layout_weight="1" />
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         android:id="@+id/layoutError"
         layout="@layout/layout_exception_handler"
         android:visibility="gone" />
 
-</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/fragment_roles_list.xml b/app/src/main/res/layout/fragment_roles_list.xml
index ac12610..395ab04 100644
--- a/app/src/main/res/layout/fragment_roles_list.xml
+++ b/app/src/main/res/layout/fragment_roles_list.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_roles"
             android:layout_centerHorizontal="true"
             android:layout_height="0dp"
             android:layout_weight="1"
             android:layout_width="wrap_content"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         layout="@layout/layout_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:clickable="true"
         android:focusable="true"
         android:id="@+id/fab_add_role"
@@ -37,4 +37,4 @@
         layout="@layout/layout_sweet_exception_handler"
         android:id="@+id/layout_error"
         android:visibility="gone"/>
-</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/fragment_teller.xml b/app/src/main/res/layout/fragment_teller.xml
index cc01983..7cdccbe 100644
--- a/app/src/main/res/layout/fragment_teller.xml
+++ b/app/src/main/res/layout/fragment_teller.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/swipeContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rvTellers"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <include
         android:id="@+id/layoutError"
         layout="@layout/layout_exception_handler"
         android:visibility="gone" />
 
-</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/fragment_view_scan_card.xml b/app/src/main/res/layout/fragment_view_scan_card.xml
index cb0c662..8a33e20 100644
--- a/app/src/main/res/layout/fragment_view_scan_card.xml
+++ b/app/src/main/res/layout/fragment_view_scan_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cl_loan_details"
     android:layout_height="match_parent"
@@ -15,4 +15,4 @@
         android:scaleType="fitCenter"
         android:visibility="visible"/>
 
-</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/item_account.xml b/app/src/main/res/layout/item_account.xml
index 572c4ae..452a0cb 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_type_indicator"
             android:layout_width="@dimen/side_bar_width"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_customer.xml b/app/src/main/res/layout/item_customer.xml
index c2b800c..18fcfbb 100644
--- a/app/src/main/res/layout/item_customer.xml
+++ b/app/src/main/res/layout/item_customer.xml
@@ -20,7 +20,7 @@
         android:minHeight="?attr/listPreferredItemHeight"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_status_indicator"
             android:layout_height="match_parent"
             android:layout_width="@dimen/side_bar_width"
diff --git a/app/src/main/res/layout/item_customer_deposit_accounts.xml b/app/src/main/res/layout/item_customer_deposit_accounts.xml
index eb85095..e9c6516 100644
--- a/app/src/main/res/layout/item_customer_deposit_accounts.xml
+++ b/app/src/main/res/layout/item_customer_deposit_accounts.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_status_indicator"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/default_margin"
diff --git a/app/src/main/res/layout/item_customer_loans.xml b/app/src/main/res/layout/item_customer_loans.xml
index 2c9d3dc..773177c 100644
--- a/app/src/main/res/layout/item_customer_loans.xml
+++ b/app/src/main/res/layout/item_customer_loans.xml
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_status_indicator"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/default_margin"
diff --git a/app/src/main/res/layout/item_header_planned_payment.xml b/app/src/main/res/layout/item_header_planned_payment.xml
index dfcd222..60e60a9 100644
--- a/app/src/main/res/layout/item_header_planned_payment.xml
+++ b/app/src/main/res/layout/item_header_planned_payment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cl_customer_deposit_details"
@@ -8,7 +8,7 @@
     android:orientation="vertical"
     android:visibility="visible">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/white"
@@ -86,6 +86,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
-</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/item_identification.xml b/app/src/main/res/layout/item_identification.xml
index 8deb5a0..4c21f43 100644
--- a/app/src/main/res/layout/item_identification.xml
+++ b/app/src/main/res/layout/item_identification.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -99,4 +99,4 @@
 
     </LinearLayout>
 
-</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/item_identification_scan_card.xml b/app/src/main/res/layout/item_identification_scan_card.xml
index ae8d3d3..81c4e4c 100644
--- a/app/src/main/res/layout/item_identification_scan_card.xml
+++ b/app/src/main/res/layout/item_identification_scan_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -117,4 +117,4 @@
 
     </LinearLayout>
 
-</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/item_ledger.xml b/app/src/main/res/layout/item_ledger.xml
index c61fb82..f152bc6 100644
--- a/app/src/main/res/layout/item_ledger.xml
+++ b/app/src/main/res/layout/item_ledger.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_type_indicator"
             android:layout_width="@dimen/side_bar_width"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_loan_debt_income.xml b/app/src/main/res/layout/item_loan_debt_income.xml
index 4e09053..7b8a209 100644
--- a/app/src/main/res/layout/item_loan_debt_income.xml
+++ b/app/src/main/res/layout/item_loan_debt_income.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -119,4 +119,4 @@
             android:background="@color/collapse_image"/>
     </LinearLayout>
 
-</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/item_panned_payment.xml b/app/src/main/res/layout/item_panned_payment.xml
index 96b616b..24669f9 100644
--- a/app/src/main/res/layout/item_panned_payment.xml
+++ b/app/src/main/res/layout/item_panned_payment.xml
@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:background="@color/white"
@@ -54,6 +54,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_payroll_allocation.xml b/app/src/main/res/layout/item_payroll_allocation.xml
index 3b02da1..31b6fdc 100644
--- a/app/src/main/res/layout/item_payroll_allocation.xml
+++ b/app/src/main/res/layout/item_payroll_allocation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -126,4 +126,4 @@
             android:background="@color/collapse_image" />
     </LinearLayout>
 
-</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/item_teller.xml b/app/src/main/res/layout/item_teller.xml
index 38bacab..d5eb5ee 100644
--- a/app/src/main/res/layout/item_teller.xml
+++ b/app/src/main/res/layout/item_teller.xml
@@ -15,7 +15,7 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <android.support.v7.widget.AppCompatImageView
+        <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_status_indicator"
             android:layout_width="@dimen/side_bar_width"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/layout_alert_message.xml b/app/src/main/res/layout/layout_alert_message.xml
index 6103923..ea7c008 100644
--- a/app/src/main/res/layout/layout_alert_message.xml
+++ b/app/src/main/res/layout/layout_alert_message.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -57,4 +57,4 @@
 
     </LinearLayout>
 
-</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/layout_exception_handler.xml b/app/src/main/res/layout/layout_exception_handler.xml
index 724d4bc..86a8298 100644
--- a/app/src/main/res/layout/layout_exception_handler.xml
+++ b/app/src/main/res/layout/layout_exception_handler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -138,4 +138,4 @@
 
     </LinearLayout>
 
-</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/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 5e389e3..2ac21aa 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.AppBarLayout
+<com.google.android.material.appbar.AppBarLayout
     android:id="@+id/appbar"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
@@ -7,7 +7,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:background="?attr/colorPrimary"
         android:id="@+id/toolbar"
         android:layout_height="?attr/actionBarSize"
@@ -15,4 +15,4 @@
         app:layout_scrollFlags="scroll|enterAlways|snap"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
 
-</android.support.design.widget.AppBarLayout>
+</com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/menu/menu_account_search.xml b/app/src/main/res/menu/menu_account_search.xml
index 2970d73..c1b66ef 100644
--- a/app/src/main/res/menu/menu_account_search.xml
+++ b/app/src/main/res/menu/menu_account_search.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/ledger_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_customer.xml b/app/src/main/res/menu/menu_customer.xml
index 031010d..a35692f 100644
--- a/app/src/main/res/menu/menu_customer.xml
+++ b/app/src/main/res/menu/menu_customer.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/search_customer"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_identification_search.xml b/app/src/main/res/menu/menu_identification_search.xml
index ca560c1..d5ce53a 100644
--- a/app/src/main/res/menu/menu_identification_search.xml
+++ b/app/src/main/res/menu/menu_identification_search.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/identification_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_ledger_search.xml b/app/src/main/res/menu/menu_ledger_search.xml
index 6ddfbd0..2282219 100644
--- a/app/src/main/res/menu/menu_ledger_search.xml
+++ b/app/src/main/res/menu/menu_ledger_search.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/ledger_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_loan_account_search.xml b/app/src/main/res/menu/menu_loan_account_search.xml
index 0f7c895..6914e17 100644
--- a/app/src/main/res/menu/menu_loan_account_search.xml
+++ b/app/src/main/res/menu/menu_loan_account_search.xml
@@ -6,5 +6,5 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/loan_account_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView" />
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_product_search.xml b/app/src/main/res/menu/menu_product_search.xml
index b1b75de..18ae45b 100644
--- a/app/src/main/res/menu/menu_product_search.xml
+++ b/app/src/main/res/menu/menu_product_search.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/search_product"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_teller_search.xml b/app/src/main/res/menu/menu_teller_search.xml
index 751de05..9691dab 100644
--- a/app/src/main/res/menu/menu_teller_search.xml
+++ b/app/src/main/res/menu/menu_teller_search.xml
@@ -7,6 +7,6 @@
         android:icon="@drawable/ic_search_black_24dp"
         android:title="@string/teller_search"
         app:showAsAction="always"
-        app:actionViewClass="android.support.v7.widget.SearchView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 </menu>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8543208..cf2ace9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlinVersion = '1.2.70'
+    ext.kotlinVersion = '1.3.10'
     repositories {
         google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'io.fabric.tools:gradle:1.+'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         // NOTE: Do not place your application dependencies here; they belong
@@ -32,16 +32,16 @@
 ext {
     // Sdk and tools
     minSdkVersion = 16
-    targetSdkVersion = 27
-    compileSdkVersion = 27
-    buildToolsVersion = '27.0.3'
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
 
     // App dependencies
-    supportLibraryVersion = '27.1.1'
+    supportLibraryVersion = '1.0.0'
     daggerVersion = '2.5'
     retrofitVersion = '2.4.0'
     okHttp3Version = '3.11.0'
-    butterKnifeVersion = '8.5.1'
+    butterKnifeVersion = '10.1.0'
 
     // rxjava dependencies
     rxjavaVersion = '2.2.1'
@@ -58,9 +58,9 @@
     mockitoVersion = '2.6.2'
     powerMockito = '1.6.2'
     hamcrestVersion = '1.3'
-    runnerVersion = '0.5'
-    rulesVersion = '0.5'
-    espressoVersion = '3.0.2'
+    runnerVersion = '1.1.0'
+    rulesVersion = '1.1.0'
+    espressoVersion = '3.1.0'
     sweetErrorVersion = '1.0.0'
     glideVersion = '3.7.0'
     materialStepperVersion = '3.3.0'
diff --git a/config/quality/pmd/pmd-ruleset.xml b/config/quality/pmd/pmd-ruleset.xml
index 6c4c05e..2ebae9b 100644
--- a/config/quality/pmd/pmd-ruleset.xml
+++ b/config/quality/pmd/pmd-ruleset.xml
@@ -4,7 +4,7 @@
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
 
-    <description>Custom ruleset for Fineract 2.0 Android application</description>
+    <description>Custom ruleset for Fineract Android application</description>
 
     <exclude-pattern>.*/R.java</exclude-pattern>
     <exclude-pattern>.*/gen/.*</exclude-pattern>
diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle
index f55895e..ff49b61 100644
--- a/config/quality/quality.gradle
+++ b/config/quality/quality.gradle
@@ -31,7 +31,7 @@
     reports {
         xml.enabled = true
         xml {
-            destination "$reportsDir/checkstyle/checkstyle.xml"
+            destination file("$reportsDir/checkstyle/checkstyle.xml")
         }
     }
 
@@ -47,7 +47,7 @@
     effort = "max"
     reportLevel = "high"
     excludeFilter = new File("$qualityConfigDir/findbugs/android-exclude-filter.xml")
-    classes = files("$project.rootDir/app/build/intermediates/classes")
+    classes = files("$project.rootDir/app/build/intermediates/javac")
 
     source 'src'
     include '**/*.java'
@@ -57,10 +57,10 @@
         xml.enabled = false
         html.enabled = true
         xml {
-            destination "$reportsDir/findbugs/findbugs.xml"
+            destination file("$reportsDir/findbugs/findbugs.xml")
         }
         html {
-            destination "$reportsDir/findbugs/findbugs.html"
+            destination file("$reportsDir/findbugs/findbugs.html")
         }
     }
 
@@ -81,10 +81,10 @@
         xml.enabled = true
         html.enabled = true
         xml {
-            destination "$reportsDir/pmd/pmd.xml"
+            destination file("$reportsDir/pmd/pmd.xml")
         }
         html {
-            destination "$reportsDir/pmd/pmd.html"
+            destination file("$reportsDir/pmd/pmd.html")
         }
     }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 37b8455..5b9415c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,4 +22,6 @@
 org.gradle.parallel=true
 # When set to true the Gradle daemon is used to run the build. For local developer builds this is our favorite property.
 # The developer environment is optimized for speed and feedback so we nearly always run Gradle jobProvider with the daemon.
-org.gradle.daemon=true
\ No newline at end of file
+org.gradle.daemon=true
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b618363..6180aba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 20 16:28:01 IST 2017
+#Fri Jun 07 00:52:53 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip