Skip to content

Commit a006a93

Browse files
abhijitrameshtherajanmaurya
abhijitramesh
authored and
therajanmaurya
committed
feat: Migrated project to Android X and Updated dependencies accordingly
1 parent b5d2115 commit a006a93

File tree

70 files changed

+269
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+269
-267
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android:
88
- extra-google-google_play_services
99
- extra-android-m2repository
1010
- extra-google-m2repository
11-
- build-tools-27.0.3
12-
- android-27
11+
- build-tools-28.0.3
12+
- android-28
1313
- android-22
1414
- sys-img-armeabi-v7a-android-22
1515
- platform-tools

‎app/build.gradle

+17-17
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ apply plugin: 'kotlin-android-extensions'
55
apply plugin: 'kotlin-kapt'
66

77
android {
8-
compileSdkVersion 27
8+
compileSdkVersion 28
99
defaultConfig {
1010
applicationId "org.mifos.mobile.cn"
1111
minSdkVersion rootProject.ext.minSdkVersion
1212
targetSdkVersion rootProject.ext.targetSdkVersion
1313
versionCode 1
1414
versionName "1.0"
15-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
vectorDrawables.useSupportLibrary = true
1717
}
1818
buildTypes {
@@ -81,13 +81,13 @@ dependencies {
8181
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$rootProject.kotlinVersion"
8282

8383
// Support Dependencies
84-
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
85-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
86-
implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
87-
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
88-
implementation "com.android.support.test.espresso:espresso-idling-resource:$rootProject.espressoVersion"
89-
implementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
90-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
84+
implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
85+
implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
86+
implementation "androidx.recyclerview:recyclerview:$rootProject.supportLibraryVersion"
87+
implementation "androidx.cardview:cardview:$rootProject.supportLibraryVersion"
88+
implementation "androidx.test.espresso:espresso-idling-resource:$rootProject.espressoVersion"
89+
implementation "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
90+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
9191
implementation "com.mifos.mobile:mifos-passcode:$rootProject.passcodeLibraryVersion"
9292
// Rx Dependencies
9393
implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"
@@ -120,8 +120,8 @@ dependencies {
120120
implementation "com.stepstone.stepper:material-stepper:$rootProject.stepperVersion"
121121

122122
// Glide for Image Loading
123-
implementation 'com.github.bumptech.glide:glide:4.7.1'
124-
kapt 'com.github.bumptech.glide:compiler:4.7.1'
123+
implementation 'com.github.bumptech.glide:glide:4.8.0'
124+
kapt 'com.github.bumptech.glide:compiler:4.8.0'
125125

126126
//dbFlow for database
127127
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:$rootProject.dbFlowVersion"
@@ -135,22 +135,22 @@ dependencies {
135135
androidTestImplementation jUnit
136136
androidTestImplementation mockito
137137
androidTestImplementation "org.mockito:mockito-android:$rootProject.mockitoVersion"
138-
androidTestImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
139-
androidTestImplementation("com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
138+
androidTestImplementation "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
139+
androidTestImplementation("androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
140140
exclude group: 'com.android.support', module: 'appcompat'
141141
exclude group: 'com.android.support', module: 'support-v4'
142142
exclude group: 'com.android.support', module: 'recyclerview-v7'
143143
exclude group: 'com.android.support', module: 'design'
144144
exclude group: 'com.android.support', module: 'support-annotations'
145145
}
146-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
147-
androidTestImplementation "com.android.support.test:runner:$rootProject.runnerVersion"
148-
androidTestImplementation "com.android.support.test:rules:$rootProject.rulesVersion"
146+
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
147+
androidTestImplementation "androidx.test:runner:$rootProject.runnerVersion"
148+
androidTestImplementation "androidx.test:rules:$rootProject.rulesVersion"
149149

150150
// Unit tests dependencies
151151
testImplementation jUnit
152152
testImplementation mockito
153-
testImplementation "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
153+
testImplementation "androidx.annotation:annotation:$rootProject.supportLibraryVersion"
154154
testImplementation "org.hamcrest:hamcrest-core:$rootProject.hamcrestVersion"
155155
testImplementation "org.hamcrest:hamcrest-library:$rootProject.hamcrestVersion"
156156
testImplementation "org.hamcrest:hamcrest-integration:$rootProject.hamcrestVersion"

‎app/src/androidTest/java/org/mifos/mobile/cn/ExampleInstrumentedTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.InstrumentationRegistry
4+
import androidx.test.runner.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

‎app/src/main/kotlin/org/mifos/mobile/cn/MifosApplication.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn
22

33
import android.app.Application
44
import android.content.Context
5-
import android.support.v7.app.AppCompatDelegate
5+
import androidx.appcompat.app.AppCompatDelegate
66
import com.facebook.stetho.Stetho
77
import com.mifos.mobile.passcode.utils.ForegroundChecker
88
import com.raizlabs.android.dbflow.config.FlowManager

‎app/src/main/kotlin/org/mifos/mobile/cn/data/remote/MifosInterceptor.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn.data.remote
22

33
import android.content.Context
4-
import android.support.annotation.NonNull
4+
import androidx.annotation.NonNull
55
import android.text.TextUtils
66
import okhttp3.Interceptor
77
import okhttp3.Response

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CheckboxAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
44
import android.content.res.ColorStateList
5-
import android.support.v7.widget.RecyclerView
5+
import androidx.recyclerview.widget.RecyclerView
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/CustomerActivitiesAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
4-
import android.support.v7.widget.RecyclerView
4+
import androidx.recyclerview.widget.RecyclerView
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/DepositAccountListAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
4-
import android.support.v4.content.ContextCompat
5-
import android.support.v7.widget.RecyclerView
4+
import androidx.core.content.ContextCompat
5+
import androidx.recyclerview.widget.RecyclerView
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup
@@ -56,7 +56,7 @@ constructor(@ApplicationContext val context: Context) :
5656
}
5757

5858

59-
inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view) {
59+
inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view!!) {
6060

6161
val ivStatusIndicator = view?.iv_status_indicator
6262

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationScanAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
4-
import android.support.v7.widget.RecyclerView
4+
import androidx.recyclerview.widget.RecyclerView
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/IdentificationsAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
4-
import android.support.v7.widget.RecyclerView
4+
import androidx.recyclerview.widget.RecyclerView
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanAccountListAdapter.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.mifos.mobile.cn.ui.adapter
22

33
import android.content.Context
4-
import android.support.v7.widget.RecyclerView
4+
import androidx.recyclerview.widget.RecyclerView
55
import android.view.LayoutInflater
66
import android.view.View
77
import android.view.ViewGroup
@@ -66,7 +66,7 @@ constructor(@ApplicationContext var context: Context) : RecyclerView.Adapter<Loa
6666
}
6767

6868

69-
inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view) {
69+
inner class ViewHolder(view: View?) : RecyclerView.ViewHolder(view!!) {
7070

7171
val tvLoanIdentifier = view?.tv_loan_identifier
7272

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanApplicationStepAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.mifos.mobile.cn.ui.adapter
22

3-
import android.support.v4.app.FragmentManager
3+
import androidx.fragment.app.FragmentManager
44
import android.content.Context
55
import com.stepstone.stepper.Step
66
import com.stepstone.stepper.adapter.AbstractFragmentStepAdapter

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/LoanDebtIncomeAdapter.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.mifos.mobile.cn.ui.adapter
22

3-
import android.support.v7.widget.RecyclerView
3+
import androidx.recyclerview.widget.RecyclerView
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/adapter/ViewPagerAdapter.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.mifos.mobile.cn.ui.adapter
22

3-
import android.support.v4.app.Fragment
4-
import android.support.v4.app.FragmentManager
5-
import android.support.v4.app.FragmentPagerAdapter
3+
import androidx.fragment.app.Fragment
4+
import androidx.fragment.app.FragmentManager
5+
import androidx.fragment.app.FragmentPagerAdapter
66
import java.util.ArrayList
77

88
/**

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/base/BaseActivityCallback.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.mifos.mobile.cn.ui.base
22

3-
import android.support.v7.widget.Toolbar
3+
import androidx.appcompat.widget.Toolbar
44

55
interface BaseActivityCallback {
66

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseActivity.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package org.mifos.mobile.cn.ui.base
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.app.Fragment
7-
import android.support.v4.app.FragmentManager
8-
import android.support.v4.view.ViewCompat
9-
import android.support.v7.widget.Toolbar
6+
import androidx.fragment.app.Fragment
7+
import androidx.fragment.app.FragmentManager
8+
import androidx.core.view.ViewCompat
9+
import androidx.appcompat.widget.Toolbar
1010
import android.view.MenuItem
1111
import android.view.View
1212
import android.view.inputmethod.InputMethodManager

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/base/MifosBaseFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.mifos.mobile.cn.ui.base
33
import android.app.Activity
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.app.Fragment
7-
import android.support.v7.widget.Toolbar
6+
import androidx.fragment.app.Fragment
7+
import androidx.appcompat.widget.Toolbar
88
import android.view.View
99
import android.view.inputmethod.InputMethodManager
1010
import org.mifos.mobile.cn.ui.utils.ProgressBarHandler

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/DashboardActivity.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import android.content.DialogInterface
55
import android.content.Intent
66
import android.os.Bundle
77
import android.os.Handler
8-
import android.support.design.widget.NavigationView
9-
import android.support.v4.app.FragmentManager
10-
import android.support.v4.view.GravityCompat
11-
import android.support.v7.app.ActionBarDrawerToggle
8+
import com.google.android.material.navigation.NavigationView
9+
import androidx.fragment.app.FragmentManager
10+
import androidx.core.view.GravityCompat
11+
import androidx.appcompat.app.ActionBarDrawerToggle
1212
import android.view.MenuItem
1313
import android.view.View
1414
import android.view.inputmethod.InputMethodManager

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.mifos.mobile.cn.ui.mifos.accounts
22

33
import android.os.Bundle
4-
import android.support.v7.widget.DividerItemDecoration
5-
import android.support.v7.widget.LinearLayoutManager
4+
import androidx.recyclerview.widget.DividerItemDecoration
5+
import androidx.recyclerview.widget.LinearLayoutManager
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accountsFilter/AccountsFilterBottomSheet.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package org.mifos.mobile.cn.ui.mifos.accountsFilter
33
import android.app.Dialog
44
import android.content.DialogInterface
55
import android.os.Bundle
6-
import android.support.design.widget.BottomSheetBehavior
7-
import android.support.design.widget.BottomSheetDialog
8-
import android.support.design.widget.BottomSheetDialogFragment
9-
import android.support.v7.widget.LinearLayoutManager
6+
import com.google.android.material.bottomsheet.BottomSheetBehavior
7+
import com.google.android.material.bottomsheet.BottomSheetDialog
8+
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
9+
import androidx.recyclerview.widget.LinearLayoutManager
1010
import android.view.View
1111
import kotlinx.android.synthetic.main.bottom_sheet_filter_accounts.view.*
1212
import org.mifos.mobile.cn.R

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package org.mifos.mobile.cn.ui.mifos.customerAccounts
33
import android.app.SearchManager
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.view.ViewPager
7-
import android.support.v7.widget.SearchView
6+
import androidx.viewpager.widget.ViewPager
7+
import androidx.appcompat.widget.SearchView
88
import android.view.*
99
import android.widget.Toast
1010
import kotlinx.android.synthetic.main.fragment_client_accounts.*

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerActivities/CustomerActivitiesFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.mifos.mobile.cn.ui.mifos.customerActivities
22

33
import android.os.Bundle
4-
import android.support.v4.widget.SwipeRefreshLayout
5-
import android.support.v7.widget.LinearLayoutManager
4+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
5+
import androidx.recyclerview.widget.LinearLayoutManager
66
import android.util.Log
77
import android.view.LayoutInflater
88
import android.view.View
@@ -18,7 +18,7 @@ import org.mifos.mobile.cn.ui.utils.ConstantKeys
1818
import javax.annotation.Nullable
1919
import javax.inject.Inject
2020

21-
class CustomerActivitiesFragment: MifosBaseFragment(),CustomerAcitivitesContracts.View,SwipeRefreshLayout.OnRefreshListener {
21+
class CustomerActivitiesFragment: MifosBaseFragment(),CustomerAcitivitesContracts.View, SwipeRefreshLayout.OnRefreshListener {
2222

2323
lateinit var rootView: View
2424
lateinit var customerIdentifier: String

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerDetails/CustomerDetailsFragment.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.mifos.mobile.cn.ui.mifos.customerDetails
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.support.design.widget.AppBarLayout
6-
import android.support.design.widget.CollapsingToolbarLayout
7-
import android.support.v7.app.AppCompatActivity
5+
import com.google.android.material.appbar.AppBarLayout
6+
import com.google.android.material.appbar.CollapsingToolbarLayout
7+
import androidx.appcompat.app.AppCompatActivity
88

99
import android.view.LayoutInflater
1010
import android.view.View

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationdetails/IdentificationDetailsFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.mifos.mobile.cn.ui.mifos.identificationdetails
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.support.v7.widget.LinearLayoutManager
5+
import androidx.recyclerview.widget.LinearLayoutManager
66
import android.view.*
77
import com.google.gson.Gson
88
import kotlinx.android.synthetic.main.fragment_identification_details.*

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/identificationlist/IdentificationsFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package org.mifos.mobile.cn.ui.mifos.identificationlist
33
import android.app.SearchManager
44
import android.content.Context
55
import android.os.Bundle
6-
import android.support.v4.widget.SwipeRefreshLayout
7-
import android.support.v7.widget.LinearLayoutManager
8-
import android.support.v7.widget.SearchView
6+
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
7+
import androidx.recyclerview.widget.LinearLayoutManager
8+
import androidx.appcompat.widget.SearchView
99
import android.text.TextUtils
1010
import android.view.*
1111
import kotlinx.android.synthetic.main.fragment_identification_list.*
@@ -23,7 +23,7 @@ import javax.annotation.Nonnull
2323
import javax.annotation.Nullable
2424
import javax.inject.Inject
2525

26-
class IdentificationsFragment : MifosBaseFragment(),IdentificationsContract.Views,OnItemClickListener,SwipeRefreshLayout.OnRefreshListener{
26+
class IdentificationsFragment : MifosBaseFragment(),IdentificationsContract.Views,OnItemClickListener, SwipeRefreshLayout.OnRefreshListener{
2727

2828
lateinit var rootView: View
2929
lateinit var identifications: List<Identification>

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/AddDebtIncomeBottomSheet.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package org.mifos.mobile.cn.ui.mifos.loanApplication
33
import android.app.Dialog
44
import android.content.DialogInterface
55
import android.os.Bundle
6-
import android.support.design.widget.BottomSheetBehavior
7-
import android.support.design.widget.BottomSheetDialog
8-
import android.support.design.widget.BottomSheetDialogFragment
6+
import com.google.android.material.bottomsheet.BottomSheetBehavior
7+
import com.google.android.material.bottomsheet.BottomSheetDialog
8+
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
99
import android.text.TextUtils
1010
import android.view.View
1111
import android.widget.Button

‎app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/loanApplication/BaseFragmentDebtIncome.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.mifos.mobile.cn.ui.mifos.loanApplication
22

33
import android.os.Bundle
4-
import android.support.v7.widget.LinearLayoutManager
5-
import android.support.v7.widget.RecyclerView
4+
import androidx.recyclerview.widget.LinearLayoutManager
5+
import androidx.recyclerview.widget.RecyclerView
66
import android.view.LayoutInflater
77
import android.view.View
88
import android.view.ViewGroup

0 commit comments

Comments
 (0)