feat: Migrated project to Android X and Updated dependencies accordingly

yashraj-01 · Jun 14, 2019 · a006a93 · a006a93
1 parent b5d2115
commit a006a93
Show file tree

Hide file tree

Showing 70 changed files with 269 additions and 267 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt b/...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
@@ -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/...otlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt b/...otlin/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/...rc/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt b/...rc/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
@@ -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
@@ -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