From a006a9336619b24445428d036868d9d24a698ee5 Mon Sep 17 00:00:00 2001
From: abhijitramesh <abhijitramesh2k@gmail.com>
Date: Wed, 12 Jun 2019 22:31:04 +0530
Subject: [PATCH] feat: Migrated project to Android X and Updated dependencies
 accordingly

---
 .travis.yml                                   |  4 +-
 app/build.gradle                              | 34 +++++++-------
 .../mobile/cn/ExampleInstrumentedTest.kt      |  4 +-
 .../org/mifos/mobile/cn/MifosApplication.kt   |  2 +-
 .../mobile/cn/data/remote/MifosInterceptor.kt |  2 +-
 .../mobile/cn/ui/adapter/CheckboxAdapter.kt   |  2 +-
 .../ui/adapter/CustomerActivitiesAdapter.kt   |  2 +-
 .../ui/adapter/DepositAccountListAdapter.kt   |  6 +--
 .../ui/adapter/IdentificationScanAdapter.kt   |  2 +-
 .../cn/ui/adapter/IdentificationsAdapter.kt   |  2 +-
 .../cn/ui/adapter/LoanAccountListAdapter.kt   |  4 +-
 .../ui/adapter/LoanApplicationStepAdapter.kt  |  2 +-
 .../cn/ui/adapter/LoanDebtIncomeAdapter.kt    |  2 +-
 .../mobile/cn/ui/adapter/ViewPagerAdapter.kt  |  6 +--
 .../mobile/cn/ui/base/BaseActivityCallback.kt |  2 +-
 .../mobile/cn/ui/base/MifosBaseActivity.kt    |  8 ++--
 .../mobile/cn/ui/base/MifosBaseFragment.kt    |  4 +-
 .../mobile/cn/ui/mifos/DashboardActivity.kt   |  8 ++--
 .../cn/ui/mifos/accounts/AccountsFragment.kt  |  4 +-
 .../AccountsFilterBottomSheet.kt              |  8 ++--
 .../CustomerAccountFragment.kt                |  4 +-
 .../CustomerActivitiesFragment.kt             |  6 +--
 .../CustomerDetailsFragment.kt                |  6 +--
 .../IdentificationDetailsFragment.kt          |  2 +-
 .../IdentificationsFragment.kt                |  8 ++--
 .../AddDebtIncomeBottomSheet.kt               |  6 +--
 .../loanApplication/BaseFragmentDebtIncome.kt |  4 +-
 .../loanDetails/LoanDetailsFragment.kt        |  6 +--
 .../viewScanCard/ViewScanCardActivity.kt      |  6 +--
 .../ui/utils/CheckSelfPermissionAndRequest.kt |  6 +--
 .../mobile/cn/ui/utils/ImageLoaderUtils.kt    |  2 +-
 .../mobile/cn/ui/utils/MaterialDialog.kt      |  4 +-
 .../mobile/cn/ui/utils/ScrollFabBehaviour.kt  |  6 +--
 .../mifos/mobile/cn/ui/utils/StatusUtils.kt   |  4 +-
 .../org/mifos/mobile/cn/ui/utils/Toaster.kt   |  6 +--
 .../cn/ui/utils/ValidateIdentifierUtil.kt     |  2 +-
 .../mobile/cn/ui/utils/ValidationUtil.kt      |  2 +-
 .../mifos/mobile/cn/ui/views/ViewBehavior.kt  |  8 ++--
 .../res/layout/activity_loan_application.xml  |  4 +-
 app/src/main/res/layout/activity_login.xml    | 12 ++---
 app/src/main/res/layout/activity_main.xml     |  6 +--
 .../res/layout/activity_toolbar_container.xml |  4 +-
 .../res/layout/activity_view_scan_card.xml    | 12 ++---
 .../layout/bottom_sheet_add_debt_income.xml   | 12 ++---
 .../layout/bottom_sheet_filter_accounts.xml   |  4 +-
 app/src/main/res/layout/fragment_accounts.xml | 10 ++---
 .../res/layout/fragment_client_accounts.xml   | 14 +++---
 .../layout/fragment_customer_activities.xml   | 10 ++---
 .../res/layout/fragment_customer_details.xml  | 36 +++++++--------
 .../main/res/layout/fragment_dashboard.xml    | 40 ++++++++---------
 .../fragment_identification_details.xml       | 18 ++++----
 .../layout/fragment_identification_list.xml   | 10 ++---
 .../res/layout/fragment_loan_co_signer.xml    | 12 ++---
 .../fragment_loan_debt_income_ratio.xml       | 20 ++++-----
 .../main/res/layout/fragment_loan_details.xml | 44 +++++++++----------
 .../res/layout/fragment_view_scan_card.xml    |  4 +-
 .../layout/item_customer_deposit_accounts.xml |  2 +-
 .../main/res/layout/item_customer_loans.xml   |  2 +-
 .../main/res/layout/item_identification.xml   |  4 +-
 .../layout/item_identification_scan_card.xml  |  4 +-
 .../main/res/layout/item_loan_debt_income.xml |  4 +-
 .../res/layout/layout_exception_handler.xml   |  4 +-
 app/src/main/res/layout/row_checkbox.xml      |  2 +-
 app/src/main/res/layout/toolbar.xml           |  4 +-
 app/src/main/res/menu/menu_account.xml        |  4 +-
 .../res/menu/menu_identification_search.xml   |  2 +-
 build.gradle                                  | 28 ++++++------
 config/quality/quality.gradle                 |  2 +-
 gradle.properties                             |  2 +
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 70 files changed, 269 insertions(+), 267 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c589757a..3db8e9b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ android:
     - extra-google-google_play_services
     - extra-android-m2repository
     - extra-google-m2repository
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.3
+    - android-28
     - android-22
     - sys-img-armeabi-v7a-android-22
     - platform-tools
diff --git a/app/build.gradle b/app/build.gradle
index 8d36208e..64371cf5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,14 +5,14 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "org.mifos.mobile.cn"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -81,13 +81,13 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
 
     // 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 'com.android.support.constraint:constraint-layout:1.1.0'
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
+    implementation "androidx.recyclerview:recyclerview:$rootProject.supportLibraryVersion"
+    implementation "androidx.cardview:cardview:$rootProject.supportLibraryVersion"
+    implementation "androidx.test.espresso:espresso-idling-resource:$rootProject.espressoVersion"
+    implementation "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "com.mifos.mobile:mifos-passcode:$rootProject.passcodeLibraryVersion"
     // Rx Dependencies
     implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"
@@ -120,8 +120,8 @@ dependencies {
     implementation "com.stepstone.stepper:material-stepper:$rootProject.stepperVersion"
 
     // Glide for Image Loading
-    implementation 'com.github.bumptech.glide:glide:4.7.1'
-    kapt 'com.github.bumptech.glide:compiler:4.7.1'
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    kapt 'com.github.bumptech.glide:compiler:4.8.0'
 
     //dbFlow for database
     kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbFlowVersion"
@@ -135,22 +135,22 @@ 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 "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
+    androidTestImplementation("androidx.test.espresso:espresso-contrib:$rootProject.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:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test:runner:$rootProject.runnerVersion"
+    androidTestImplementation "androidx.test:rules:$rootProject.rulesVersion"
 
     // Unit tests dependencies
     testImplementation jUnit
     testImplementation mockito
-    testImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
+    testImplementation "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
     testImplementation "org.hamcrest:hamcrest-core:$rootProject.hamcrestVersion"
     testImplementation "org.hamcrest:hamcrest-library:$rootProject.hamcrestVersion"
     testImplementation "org.hamcrest:hamcrest-integration:$rootProject.hamcrestVersion"
diff --git a/app/src/androidTest/java/org/mifos/mobile/cn/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/mifos/mobile/cn/ExampleInstrumentedTest.kt
index 43416331..dca789c6 100644
--- a/app/src/androidTest/java/org/mifos/mobile/cn/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/org/mifos/mobile/cn/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn
 
-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/kotlin/org/mifos/mobile/cn/MifosApplication.kt b/app/src/main/kotlin/org/mifos/mobile/cn/MifosApplication.kt
index 3bc5a1cb..a4f2d3ff 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/MifosApplication.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/MifosApplication.kt
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn
 
 import android.app.Application
 import android.content.Context
-import android.support.v7.app.AppCompatDelegate
+import androidx.appcompat.app.AppCompatDelegate
 import com.facebook.stetho.Stetho
 import com.mifos.mobile.passcode.utils.ForegroundChecker
 import com.raizlabs.android.dbflow.config.FlowManager
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/data/remote/MifosInterceptor.kt b/app/src/main/kotlin/org/mifos/mobile/cn/data/remote/MifosInterceptor.kt
index 4d1baca0..f72e71e4 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/data/remote/MifosInterceptor.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/data/remote/MifosInterceptor.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.data.remote
 
 import android.content.Context
-import android.support.annotation.NonNull
+import androidx.annotation.NonNull
 import android.text.TextUtils
 import okhttp3.Interceptor
 import okhttp3.Response
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CheckboxAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CheckboxAdapter.kt
index 42896515..9490b4b8 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CheckboxAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CheckboxAdapter.kt
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn.ui.adapter
 
 import android.content.Context
 import android.content.res.ColorStateList
-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/kotlin/org/mifos/mobile/cn/ui/adapter/CustomerActivitiesAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CustomerActivitiesAdapter.kt
index b703a29f..b6551e82 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CustomerActivitiesAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CustomerActivitiesAdapter.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.adapter
 
 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/kotlin/org/mifos/mobile/cn/ui/adapter/DepositAccountListAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/DepositAccountListAdapter.kt
index 469b61c2..dfb1aa49 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/DepositAccountListAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/DepositAccountListAdapter.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.adapter
 
 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
@@ -56,7 +56,7 @@ constructor(@ApplicationContext val context: Context) :
     }
 
 
-    inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view) {
+    inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view!!) {
 
         val ivStatusIndicator = view?.iv_status_indicator
 
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationScanAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationScanAdapter.kt
index 5e0d0a38..afd8d4e2 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationScanAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationScanAdapter.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.adapter
 
 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/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationsAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationsAdapter.kt
index 67482d8e..7cf76344 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationsAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationsAdapter.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.adapter
 
 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/kotlin/org/mifos/mobile/cn/ui/adapter/LoanAccountListAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanAccountListAdapter.kt
index c7553573..bbdf7799 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanAccountListAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanAccountListAdapter.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.adapter
 
 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
@@ -66,7 +66,7 @@ constructor(@ApplicationContext var context: Context) : RecyclerView.Adapter<Loa
     }
 
 
-    inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view) {
+    inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view!!) {
 
         val tvLoanIdentifier = view?.tv_loan_identifier
 
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanApplicationStepAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanApplicationStepAdapter.kt
index e8c4ebd7..15dbd17e 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanApplicationStepAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanApplicationStepAdapter.kt
@@ -1,6 +1,6 @@
 package org.mifos.mobile.cn.ui.adapter
 
-import android.support.v4.app.FragmentManager
+import androidx.fragment.app.FragmentManager
 import android.content.Context
 import com.stepstone.stepper.Step
 import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanDebtIncomeAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanDebtIncomeAdapter.kt
index 206892d6..a12a47fa 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanDebtIncomeAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanDebtIncomeAdapter.kt
@@ -1,6 +1,6 @@
 package org.mifos.mobile.cn.ui.adapter
 
-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/kotlin/org/mifos/mobile/cn/ui/adapter/ViewPagerAdapter.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/ViewPagerAdapter.kt
index 34821146..8017bddc 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/ViewPagerAdapter.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/ViewPagerAdapter.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.adapter
 
-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
 
 /**
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/BaseActivityCallback.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/BaseActivityCallback.kt
index 12d8d62f..88648a8f 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/BaseActivityCallback.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/BaseActivityCallback.kt
@@ -1,6 +1,6 @@
 package org.mifos.mobile.cn.ui.base
 
-import android.support.v7.widget.Toolbar
+import androidx.appcompat.widget.Toolbar
 
 interface BaseActivityCallback {
 
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseActivity.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseActivity.kt
index d16cff54..ad75edd4 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseActivity.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseActivity.kt
@@ -3,10 +3,10 @@ package org.mifos.mobile.cn.ui.base
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.view.ViewCompat
-import android.support.v7.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.core.view.ViewCompat
+import androidx.appcompat.widget.Toolbar
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt
index 8f41f179..ff78b31b 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt
@@ -3,8 +3,8 @@ package org.mifos.mobile.cn.ui.base
 import android.app.Activity
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.appcompat.widget.Toolbar
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import org.mifos.mobile.cn.ui.utils.ProgressBarHandler
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt
index be104c92..4afc5aea 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt
@@ -5,10 +5,10 @@ import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
-import android.support.design.widget.NavigationView
-import android.support.v4.app.FragmentManager
-import android.support.v4.view.GravityCompat
-import android.support.v7.app.ActionBarDrawerToggle
+import com.google.android.material.navigation.NavigationView
+import androidx.fragment.app.FragmentManager
+import androidx.core.view.GravityCompat
+import androidx.appcompat.app.ActionBarDrawerToggle
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt
index f7268a29..2fc72ff8 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.mifos.accounts
 
 import android.os.Bundle
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.LinearLayoutManager
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accountsFilter/AccountsFilterBottomSheet.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accountsFilter/AccountsFilterBottomSheet.kt
index 709d09e1..19e656c9 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accountsFilter/AccountsFilterBottomSheet.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accountsFilter/AccountsFilterBottomSheet.kt
@@ -3,10 +3,10 @@ package org.mifos.mobile.cn.ui.mifos.accountsFilter
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.design.widget.BottomSheetDialog
-import android.support.design.widget.BottomSheetDialogFragment
-import android.support.v7.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.View
 import kotlinx.android.synthetic.main.bottom_sheet_filter_accounts.view.*
 import org.mifos.mobile.cn.R
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt
index 9536853a..595cdec5 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt
@@ -3,8 +3,8 @@ package org.mifos.mobile.cn.ui.mifos.customerAccounts
 import android.app.SearchManager
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.view.ViewPager
-import android.support.v7.widget.SearchView
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.widget.SearchView
 import android.view.*
 import android.widget.Toast
 import kotlinx.android.synthetic.main.fragment_client_accounts.*
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt
index 653bb3a8..fe19ad95 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.mifos.customerActivities
 
 import android.os.Bundle
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -18,7 +18,7 @@ import org.mifos.mobile.cn.ui.utils.ConstantKeys
 import javax.annotation.Nullable
 import javax.inject.Inject
 
-class CustomerActivitiesFragment: MifosBaseFragment(),CustomerAcitivitesContracts.View,SwipeRefreshLayout.OnRefreshListener {
+class CustomerActivitiesFragment: MifosBaseFragment(),CustomerAcitivitesContracts.View, SwipeRefreshLayout.OnRefreshListener {
 
     lateinit var rootView: View
     lateinit var customerIdentifier: String
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt
index 8fe5592f..9e650004 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt
@@ -2,9 +2,9 @@ package org.mifos.mobile.cn.ui.mifos.customerDetails
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.design.widget.AppBarLayout
-import android.support.design.widget.CollapsingToolbarLayout
-import android.support.v7.app.AppCompatActivity
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import androidx.appcompat.app.AppCompatActivity
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt
index ad38a6df..6344de44 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn.ui.mifos.identificationdetails
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.*
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.fragment_identification_details.*
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt
index a5f9d365..5c759f0d 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt
@@ -3,9 +3,9 @@ package org.mifos.mobile.cn.ui.mifos.identificationlist
 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 kotlinx.android.synthetic.main.fragment_identification_list.*
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull
 import javax.annotation.Nullable
 import javax.inject.Inject
 
-class IdentificationsFragment : MifosBaseFragment(),IdentificationsContract.Views,OnItemClickListener,SwipeRefreshLayout.OnRefreshListener{
+class IdentificationsFragment : MifosBaseFragment(),IdentificationsContract.Views,OnItemClickListener, SwipeRefreshLayout.OnRefreshListener{
 
     lateinit var rootView: View
     lateinit var identifications: List<Identification>
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/AddDebtIncomeBottomSheet.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/AddDebtIncomeBottomSheet.kt
index 086f33b2..b84f989f 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/AddDebtIncomeBottomSheet.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/AddDebtIncomeBottomSheet.kt
@@ -3,9 +3,9 @@ package org.mifos.mobile.cn.ui.mifos.loanApplication
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
-import android.support.design.widget.BottomSheetDialog
-import android.support.design.widget.BottomSheetDialogFragment
+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/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/BaseFragmentDebtIncome.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/BaseFragmentDebtIncome.kt
index a422fc63..f21c8f90 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/BaseFragmentDebtIncome.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/BaseFragmentDebtIncome.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.mifos.loanApplication
 
 import android.os.Bundle
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+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/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/loanDetails/LoanDetailsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/loanDetails/LoanDetailsFragment.kt
index 87dd83d8..4180c985 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/loanDetails/LoanDetailsFragment.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/loanDetails/LoanDetailsFragment.kt
@@ -1,9 +1,9 @@
 package org.mifos.mobile.cn.ui.mifos.loanApplication.loanDetails
 
 import android.os.Bundle
-import android.support.design.widget.TextInputLayout
-import android.support.v4.widget.NestedScrollView
-import android.support.v7.widget.AppCompatSpinner
+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/kotlin/org/mifos/mobile/cn/ui/mifos/viewScanCard/ViewScanCardActivity.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/viewScanCard/ViewScanCardActivity.kt
index d4e0a1f0..19235c7a 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/viewScanCard/ViewScanCardActivity.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/viewScanCard/ViewScanCardActivity.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.mifos.viewScanCard
 
 import android.os.Bundle
-import android.support.v4.view.PagerAdapter
-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
 import com.google.gson.reflect.TypeToken
 import kotlinx.android.synthetic.main.activity_view_scan_card.*
 import org.mifos.mobile.cn.data.models.customer.identification.ScanCard
@@ -13,7 +13,7 @@ import org.mifos.mobile.cn.ui.utils.ConstantKeys
 import org.mifos.mobile.cn.ui.utils.Utils
 
 
-class ViewScanCardActivity: MifosBaseActivity(),ViewPager.OnPageChangeListener, ViewPager.OnAdapterChangeListener {
+class ViewScanCardActivity: MifosBaseActivity(), ViewPager.OnPageChangeListener, ViewPager.OnAdapterChangeListener {
 
 
 
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/CheckSelfPermissionAndRequest.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/CheckSelfPermissionAndRequest.kt
index f13bc881..5d2e27c7 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/CheckSelfPermissionAndRequest.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/CheckSelfPermissionAndRequest.kt
@@ -8,9 +8,9 @@ import android.content.pm.PackageManager
 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.mifos.mobile.cn.R
 import org.mifos.mobile.cn.data.local.PreferencesHelper
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ImageLoaderUtils.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ImageLoaderUtils.kt
index 1acd35de..aa6b5b68 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ImageLoaderUtils.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ImageLoaderUtils.kt
@@ -3,7 +3,7 @@ package org.mifos.mobile.cn.ui.utils
 import android.content.Context
 import android.graphics.Bitmap
 import android.service.carrier.CarrierIdentifier
-import android.support.constraint.Placeholder
+import androidx.constraintlayout.widget.Placeholder
 import android.view.View
 import android.widget.ImageView
 import com.bumptech.glide.Glide
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/MaterialDialog.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/MaterialDialog.kt
index a962bab4..76d998ca 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/MaterialDialog.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/MaterialDialog.kt
@@ -2,8 +2,8 @@ package org.mifos.mobile.cn.ui.utils
 
 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 android.view.View
 import org.mifos.mobile.cn.R
 
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ScrollFabBehaviour.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ScrollFabBehaviour.kt
index 91a48b5c..8d3bb916 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ScrollFabBehaviour.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ScrollFabBehaviour.kt
@@ -1,9 +1,9 @@
 package org.mifos.mobile.cn.ui.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/kotlin/org/mifos/mobile/cn/ui/utils/StatusUtils.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/StatusUtils.kt
index 8eac59b6..97f61c51 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/StatusUtils.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/StatusUtils.kt
@@ -1,8 +1,8 @@
 package org.mifos.mobile.cn.ui.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 org.mifos.mobile.cn.data.models.customer.Command
 import org.mifos.mobile.cn.data.models.customer.Customer
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/Toaster.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/Toaster.kt
index 9bd64077..7c254299 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/Toaster.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/Toaster.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.utils
 
 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
@@ -21,7 +21,7 @@ object Toaster {
     fun show(view: View, text: String, duration: Int = Snackbar.LENGTH_LONG) {
         val snackbar = Snackbar.make(view, text, duration)
         val sbView = snackbar.view
-        val textView = sbView.findViewById<View>(android.support.design.R.id
+        val textView = sbView.findViewById<View>(com.google.android.material.R.id
                 .snackbar_text) as TextView
         textView.setTextColor(Color.WHITE)
         textView.textSize = 12f
@@ -33,7 +33,7 @@ object Toaster {
     fun showProgressMessage(view: View, text: String, duration: Int) {
         val snackbar = Snackbar.make(view, text, duration)
         val sbView = snackbar.view
-        val textView = sbView.findViewById<View>(android.support.design.R.id
+        val textView = sbView.findViewById<View>(com.google.android.material.R.id
                 .snackbar_text) as TextView
         textView.setTextColor(Color.WHITE)
         textView.textSize = 12f
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidateIdentifierUtil.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidateIdentifierUtil.kt
index 6fcef3ac..2429ad62 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidateIdentifierUtil.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidateIdentifierUtil.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.utils
 
 import android.content.Context
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
 import android.text.TextUtils
 import org.mifos.mobile.cn.R
 import java.io.UnsupportedEncodingException
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidationUtil.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidationUtil.kt
index e000dc0d..a22a1d59 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidationUtil.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/utils/ValidationUtil.kt
@@ -1,7 +1,7 @@
 package org.mifos.mobile.cn.ui.utils
 
 import android.content.Context
-import android.support.design.widget.TextInputLayout
+import com.google.android.material.textfield.TextInputLayout
 import android.text.TextUtils
 import android.view.View
 import android.widget.EditText
diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/views/ViewBehavior.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/views/ViewBehavior.kt
index 898f31d6..9a74ea03 100644
--- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/views/ViewBehavior.kt
+++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/views/ViewBehavior.kt
@@ -2,8 +2,8 @@ package org.mifos.mobile.cn.ui.views
 
 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
@@ -24,11 +24,11 @@ class ViewBehavior : CoordinatorLayout.Behavior<HeaderView>{
 
     }
 
-    override fun layoutDependsOn(parent: CoordinatorLayout?, child: HeaderView?, dependency: View?): Boolean {
+    override fun layoutDependsOn(parent: CoordinatorLayout, child: HeaderView, dependency: View): Boolean {
         return dependency is AppBarLayout
     }
 
-    override fun onDependentViewChanged(parent: CoordinatorLayout?, child: HeaderView?, dependency: View?): Boolean {
+    override fun onDependentViewChanged(parent: CoordinatorLayout, child: HeaderView, dependency: View): Boolean {
         shouldInitProperties(child!!, dependency!!)
         val maxScroll:Int = (dependency as AppBarLayout).totalScrollRange
         val percentage:Float = Math.abs(dependency.getY()) / maxScroll.toFloat()
diff --git a/app/src/main/res/layout/activity_loan_application.xml b/app/src/main/res/layout/activity_loan_application.xml
index e610040b..20819ace 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,4 +29,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/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 94430bb2..5f9704e1 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,7 +8,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"
@@ -47,7 +47,7 @@
                 android:orientation="vertical">
 
 
-                <android.support.design.widget.TextInputLayout
+                <com.google.android.material.textfield.TextInputLayout
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent">
 
@@ -62,9 +62,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">
@@ -80,7 +80,7 @@
                         android:layout_height="wrap_content"
                         android:layout_width="match_parent"/>
 
-                </android.support.design.widget.TextInputLayout>
+                </com.google.android.material.textfield.TextInputLayout>
 
             </LinearLayout>
 
@@ -95,5 +95,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_main.xml b/app/src/main/res/layout/activity_main.xml
index c7b98d98..ee15b610 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<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"
@@ -14,7 +14,7 @@
         <FrameLayout style="@style/FrameLayout.Container"/>
     </LinearLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/navigationView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -22,4 +22,4 @@
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_drawer_header"
         app:menu="@menu/menu_nav_drawer"/>
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</androidx.drawerlayout.widget.DrawerLayout>
\ 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 f7f00ff1..94f37878 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 41e8a0b8..40b974cc 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 d21d20f2..d5f0b6c5 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:paddingLeft="@dimen/layout_padding_24dp"
@@ -57,7 +57,7 @@
                     android:layout_width="match_parent"
                     android:scrollHorizontally="false"
                     android:scrollbars="vertical"/>
-            </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_filter_accounts.xml b/app/src/main/res/layout/bottom_sheet_filter_accounts.xml
index a0aacac7..fa70ed8f 100644
--- a/app/src/main/res/layout/bottom_sheet_filter_accounts.xml
+++ b/app/src/main/res/layout/bottom_sheet_filter_accounts.xml
@@ -22,12 +22,12 @@
               android:textSize="@dimen/text_size_12sp"
               android:layout_marginLeft="@dimen/margin_16dp"
               android:layout_marginStart="@dimen/margin_16dp"/>
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_accounts_filter"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:orientation="vertical">
-    </android.support.v7.widget.RecyclerView>
+    </androidx.recyclerview.widget.RecyclerView>
 
     <Button
         android:id="@+id/btn_filter"
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index a9c40652..0d2e38cc 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.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"
     android:background="@android:color/white"
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/swipe_container"
         android:layout_height="match_parent"
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:orientation="vertical">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:fadeScrollbars="false"
                 android:id="@+id/rv_accounts"
                 android:layout_centerHorizontal="true"
@@ -31,6 +31,6 @@
                 android:id="@+id/layout_error"
                 android:visibility="gone"/>
         </LinearLayout>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-</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_client_accounts.xml b/app/src/main/res/layout/fragment_client_accounts.xml
index 9b7a9980..70b5ceb5 100644
--- a/app/src/main/res/layout/fragment_client_accounts.xml
+++ b/app/src/main/res/layout/fragment_client_accounts.xml
@@ -1,30 +1,30 @@
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabGravity="fill"
             app:tabIndicatorColor="@color/white"
             app:tabMode="fixed"/>
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
@@ -35,4 +35,4 @@
         app:layout_behavior="org.mifos.mobile.cn.ui.utils.ScrollFabBehaviour"
         app:srcCompat="@drawable/ic_add_white_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_activities.xml b/app/src/main/res/layout/fragment_customer_activities.xml
index 3e328d80..2b6b2319 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_details.xml b/app/src/main/res/layout/fragment_customer_details.xml
index a483f6fa..cc56b3aa 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:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/detail_backdrop_height"
             android:fitsSystemWindows="true"
             android:theme="@style/AppTheme.AppBarOverlay">
 
-            <android.support.design.widget.CollapsingToolbarLayout
+            <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -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_customer"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
@@ -55,13 +55,13 @@
                         android:layout_marginRight="@dimen/header_view_end_margin_right"
                         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"
@@ -474,7 +474,7 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
                 <TextView
                     android:layout_height="match_parent"
@@ -487,7 +487,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"
@@ -593,11 +593,11 @@
 
                     </LinearLayout>
 
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
         <include
             android:id="@+id/float_header_view"
@@ -608,11 +608,11 @@
 
 
 
-    </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_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 0d429e48..f3fd880e 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.v4.widget.SwipeRefreshLayout
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     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,7 +7,7 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent">
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_height="match_parent"
         android:layout_width="match_parent">
 
@@ -162,7 +162,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 app:cardElevation="1dp">
@@ -203,7 +203,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -222,7 +222,7 @@
                                     android:tint="@color/white"
                                     app:srcCompat="@drawable/ic_account_balance_black_24dp"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -251,7 +251,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -271,7 +271,7 @@
                                     android:tint="@color/white"
                                     app:srcCompat="@drawable/ic_compare_arrows_black_24dp"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -300,7 +300,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -320,7 +320,7 @@
                                     android:tint="@color/white"
                                     app:srcCompat="@drawable/ic_border_color_black_24dp"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -337,9 +337,9 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
                 app:cardElevation="1dp">
@@ -380,7 +380,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -399,7 +399,7 @@
                                     android:tint="@color/black"
                                     app:srcCompat="@drawable/ic_supervisor_account_black_24dp"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -429,7 +429,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -448,7 +448,7 @@
                                     android:tint="@color/black"
                                     app:srcCompat="@drawable/ic_account_balance_wallet_black_24dp"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -477,7 +477,7 @@
                             android:padding="@dimen/default_margin"
                             tools:ignore="UseCompoundDrawables">
 
-                            <android.support.v7.widget.CardView
+                            <androidx.cardview.widget.CardView
                                 android:innerRadius="0dp"
                                 android:layout_height="60dp"
                                 android:layout_width="60dp"
@@ -496,7 +496,7 @@
                                     android:tint="@color/black"
                                     app:srcCompat="@drawable/ic_surveys_48px"/>
 
-                            </android.support.v7.widget.CardView>
+                            </androidx.cardview.widget.CardView>
 
                             <TextView
                                 android:layout_height="wrap_content"
@@ -512,7 +512,7 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_height="wrap_content"
@@ -568,6 +568,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.v4.widget.SwipeRefreshLayout>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_identification_details.xml b/app/src/main/res/layout/fragment_identification_details.xml
index f3bbb03d..bdfb2885 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,11 +226,11 @@
 
                 </FrameLayout>
 
-            </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_identification_list.xml b/app/src/main/res/layout/fragment_identification_list.xml
index 9bf5db42..ae5441a5 100644
--- a/app/src/main/res/layout/fragment_identification_list.xml
+++ b/app/src/main/res/layout/fragment_identification_list.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"
     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_identification"
         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"
@@ -27,4 +27,4 @@
 
 
 
-</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 a6b8ed69..a56309e1 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:orientation="vertical"
             android:paddingTop="@dimen/layout_padding_8dp">
 
-            <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,11 +85,11 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <include layout="@layout/fragment_loan_debt_income_ratio"/>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+    </androidx.core.widget.NestedScrollView>
+</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 aa9fc604..f1a5dab2 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 a978f3c5..80317db8 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"
@@ -15,7 +15,7 @@
         android:layout_width="match_parent"
         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"
@@ -39,14 +39,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"
@@ -59,9 +59,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"
@@ -73,7 +73,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"
@@ -82,7 +82,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"
@@ -95,9 +95,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"
@@ -114,7 +114,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"
@@ -127,9 +127,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_repay_unit_type"
@@ -156,7 +156,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"
@@ -218,7 +218,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"
@@ -250,7 +250,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"
@@ -259,7 +259,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"
@@ -290,7 +290,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"
@@ -302,13 +302,13 @@
 
             </LinearLayout>
 
-        </android.support.v7.widget.CardView>
+        </androidx.cardview.widget.CardView>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
     <include
         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_view_scan_card.xml b/app/src/main/res/layout/fragment_view_scan_card.xml
index 81ca06c2..c0184489 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"
@@ -16,4 +16,4 @@
         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_customer_deposit_accounts.xml b/app/src/main/res/layout/item_customer_deposit_accounts.xml
index eb85095e..e9c65169 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 c17a94db..1905331e 100644
--- a/app/src/main/res/layout/item_customer_loans.xml
+++ b/app/src/main/res/layout/item_customer_loans.xml
@@ -16,7 +16,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_identification.xml b/app/src/main/res/layout/item_identification.xml
index 8deb5a02..4c21f439 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 8b9106ec..bae3d0c5 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"
@@ -108,4 +108,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_loan_debt_income.xml b/app/src/main/res/layout/item_loan_debt_income.xml
index 63dc77a1..475cb2ab 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/layout_exception_handler.xml b/app/src/main/res/layout/layout_exception_handler.xml
index 724d4bcd..86a8298e 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/row_checkbox.xml b/app/src/main/res/layout/row_checkbox.xml
index bca62aab..bfc8270c 100644
--- a/app/src/main/res/layout/row_checkbox.xml
+++ b/app/src/main/res/layout/row_checkbox.xml
@@ -10,7 +10,7 @@
               android:paddingRight="@dimen/default_margin"
               android:paddingEnd="@dimen/default_margin"
               android:layout_height="wrap_content">
-    <android.support.v7.widget.AppCompatCheckBox
+    <androidx.appcompat.widget.AppCompatCheckBox
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/cb_status_select"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 8b3cea19..e1ef14a8 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.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"
     android:id="@+id/toolbar"
@@ -9,4 +9,4 @@
     android:theme="@style/Toolbar.Common"
     app:layout_scrollFlags="scroll|enterAlways"
     app:popupTheme="@style/AppToolbarPopup">
-</android.support.v7.widget.Toolbar>
\ No newline at end of file
+</androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_account.xml b/app/src/main/res/menu/menu_account.xml
index aade03ad..686e06d6 100644
--- a/app/src/main/res/menu/menu_account.xml
+++ b/app/src/main/res/menu/menu_account.xml
@@ -11,12 +11,12 @@
           android:title="@string/search"
           android:icon="@drawable/ic_search_black_24dp"
           app:showAsAction="always"
-          app:actionViewClass="android.support.v7.widget.SearchView" />
+          app:actionViewClass="androidx.appcompat.widget.SearchView" />
     <item android:id="@+id/menu_search_deposit"
           android:title="@string/search"
           android:icon="@drawable/ic_search_black_24dp"
           app:showAsAction="always"
-          app:actionViewClass="android.support.v7.widget.SearchView" />
+          app:actionViewClass="androidx.appcompat.widget.SearchView" />
     <item
         android:id="@+id/menu_filter_loan"
         app:showAsAction="always"
diff --git a/app/src/main/res/menu/menu_identification_search.xml b/app/src/main/res/menu/menu_identification_search.xml
index ca560c18..d5ce53a2 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/build.gradle b/build.gradle
index bc34a176..22a3e8c9 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.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -30,23 +30,23 @@ task clean(type: Delete) {
 
 ext {
     // Sdk and tools
-    minSdkVersion = 15
-    targetSdkVersion = 27
-    compileSdkVersion = 27
-    buildToolsVersion = '27.0.3'
+    minSdkVersion = 16
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.3'
 
     // App dependencies
-    supportLibraryVersion = '27.1.1'
+    supportLibraryVersion = '1.0.0'
     daggerVersion = '2.8'
-    retrofitVersion = '2.3.0'
-    okHttp3Version = '3.8.0'
+    retrofitVersion = '2.4.0'
+    okHttp3Version = '3.11.0'
     passcodeLibraryVersion = '0.3.0'
 
     // Kotlin dependencies
-    kotlinVersion = '1.2.41'
+    kotlinVersion = '1.3.10'
 
     // rxjava dependencies
-    rxjavaVersion = '2.1.8'
+    rxjavaVersion = '2.2.1'
     rxandroidVersion = '2.0.2'
     rxKotlinVersion = '2.2.0'
 
@@ -57,8 +57,8 @@ ext {
     mockitoVersion = '2.6.2'
     powerMockito = '1.6.2'
     hamcrestVersion = '1.3'
-    runnerVersion = '0.5'
-    rulesVersion = '0.5'
-    espressoVersion = '3.0.1'
+    runnerVersion = '1.1.0-alpha4'
+    rulesVersion = '1.1.0-alpha4'
+    espressoVersion = '3.1.0-alpha4'
     stepperVersion = '4.3.1'
 }
\ No newline at end of file
diff --git a/config/quality/quality.gradle b/config/quality/quality.gradle
index 2787d9b4..e59103f4 100644
--- a/config/quality/quality.gradle
+++ b/config/quality/quality.gradle
@@ -47,7 +47,7 @@ task findbugs(type: FindBugs,
     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'
diff --git a/gradle.properties b/gradle.properties
index 743d692c..8de50581 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 97e6a21d..0a8c6ddf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 29 20:44:38 IST 2018
+#Wed Jun 12 21:01:44 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