Skip to content

Commit fe87e53

Browse files
author
YDT_DOM\dan-gl
committed
# libs update fix
1 parent 68ff24a commit fe87e53

9 files changed

Lines changed: 48 additions & 34 deletions

File tree

‎app/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@ dependencies {
3333
// support
3434
implementation "androidx.vectordrawable:vectordrawable-animated:$support_ver"
3535
implementation "androidx.recyclerview:recyclerview:$androidx_recycler"
36-
implementation "com.google.android.material:material:1.1.0-beta01"
37-
implementation "androidx.exifinterface:exifinterface:1.0.0"
38-
implementation "androidx.appcompat:appcompat:$support_ver"
36+
implementation "com.google.android.material:material:1.4.0-beta01"
37+
implementation "androidx.exifinterface:exifinterface:1.3.2"
38+
implementation "androidx.appcompat:appcompat:$androidx"
3939
implementation "androidx.legacy:legacy-support-v4:1.0.0"
4040
implementation "androidx.cardview:cardview:1.0.0"
41-
implementation "androidx.core:core:$support_ver"
41+
implementation "androidx.core:core-ktx:$support_ver"
4242

4343
// lifecycle
4444
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
4545
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
4646
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
4747

4848
// constraint
49-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
49+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
5050
// annotations
5151
implementation 'javax.annotation:javax.annotation-api:1.3.1'
5252

5353
// implementation 'com.squareup.picasso:picasso:2.71828'
5454

5555
// json
56-
implementation 'com.google.code.gson:gson:2.8.5'
56+
implementation 'com.google.code.gson:gson:2.8.6'
5757

5858
// rx
59-
implementation 'io.reactivex.rxjava2:rxjava:2.2.10'
59+
implementation 'io.reactivex.rxjava2:rxjava:2.2.13'
6060
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
6161

6262
//retrofit
@@ -65,16 +65,16 @@ dependencies {
6565
implementation "com.squareup.retrofit2:adapter-rxjava:$retrofit_ver"
6666

6767
// okHttp
68-
implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
69-
implementation 'com.squareup.okhttp3:okhttp:3.12.0'
68+
implementation 'com.squareup.okhttp3:logging-interceptor:4.2.2'
69+
implementation 'com.squareup.okhttp3:okhttp:4.2.2'
7070

7171
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
7272
exclude group: 'com.android.support', module: 'support-annotations'
7373
exclude group: 'android'
7474
})
7575

7676
// test lib
77-
testImplementation 'junit:junit:4.12'
77+
testImplementation 'junit:junit:4.13.2'
7878
testImplementation 'org.mockito:mockito-core:2.25.0'
7979

8080

@@ -96,8 +96,8 @@ dependencies {
9696
implementation project(':retrofit_support')
9797

9898
// kotlin
99-
implementation "androidx.core:core-ktx:1.1.0"
100-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
99+
implementation "androidx.core:core-ktx:1.5.0"
100+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30"
101101
}
102102

103103
repositories {

‎app/src/main/java/com/mdgd/j_commons/ui/main/fr/quackes/EarthQuakesFragment.kt‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ class EarthQuakesFragment : SwipeRecyclerFragment<QuakesFragmentContract.Present
118118
0, 0, true).show()
119119
} else if (id == R.id.fromDate) {
120120
val calendar = Calendar.getInstance()
121-
DatePickerDialog(activity!!, { _: DatePicker, y: Int, m: Int, d: Int -> binding?.searchParams?.fromDate?.text = String.format(Locale.getDefault(), "%1$2d.%2$2d.%3$4d", d, m, y) },
121+
DatePickerDialog(requireActivity(), { _: DatePicker, y: Int, m: Int, d: Int -> binding?.searchParams?.fromDate?.text = String.format(Locale.getDefault(), "%1$2d.%2$2d.%3$4d", d, m, y) },
122122
calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show()
123123
} else if (id == R.id.toDate) {
124124
val calendar = Calendar.getInstance()
125-
DatePickerDialog(activity!!, { _: DatePicker, y: Int, m: Int, d: Int -> binding?.searchParams?.toDate?.text = String.format(Locale.getDefault(), "%1$2d.%2$2d.%3$4d", d, m, y) },
125+
DatePickerDialog(requireActivity(), { _: DatePicker, y: Int, m: Int, d: Int -> binding?.searchParams?.toDate?.text = String.format(Locale.getDefault(), "%1$2d.%2$2d.%3$4d", d, m, y) },
126126
calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH)).show()
127127
}
128128
}
@@ -133,17 +133,24 @@ class EarthQuakesFragment : SwipeRecyclerFragment<QuakesFragmentContract.Present
133133
}
134134

135135
override fun setState(state: State) {
136-
if(state.showError) showToast(R.string.shit, state.errorMessage)
136+
if (state.showError && state.errorMessage != null) {
137+
showToast(R.string.shit, state.errorMessage)
138+
}
137139

138-
if(state.showProgress) showProgress(R.string.empty, R.string.wait_please)
139-
else hideProgress()
140+
if (state.showProgress) {
141+
showProgress(R.string.empty, R.string.wait_please)
142+
} else {
143+
hideProgress()
144+
}
140145

141146
if (state.updateData) {
142147
binding?.toolbarInc?.toolbarIcon?.requestFocus()
143148
if (state.isFirstPage) {
144149
listener?.resetState()
145150
adapter?.setItems(state.data)
146-
} else adapter?.addItems(state.data)
151+
} else {
152+
adapter?.addItems(state.data)
153+
}
147154
}
148155
}
149156
}

‎app/src/main/java/com/mdgd/j_commons/ui/main/fr/quackes/QuakesFragmentPresenter.kt‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,40 +15,46 @@ class QuakesFragmentPresenter(private val repo: IRepo) :
1515
checkNewEarthQuakes()
1616
return
1717
}
18-
view.setState(State.showProgressState(true))
18+
view?.setState(State.showProgressState(true))
1919
repo.searchQuakes(searchParams, ICallback {
2020
if (it.isFail) {
21-
view.setState(State.showErrorState(true, it.error?.message))
21+
view?.setState(State.showErrorState(true, it.error?.message))
2222
currentPage--
23-
} else view.setState(State.newDataState(currentPage, it.data!!))
23+
} else {
24+
view?.setState(State.newDataState(currentPage, it.data!!))
25+
}
2426
})
2527
}
2628

27-
override fun subscribe(view: QuakesFragmentContract.View?) {
29+
override fun subscribe(view: QuakesFragmentContract.View) {
2830
super.subscribe(view)
2931
checkNewEarthQuakes()
3032
}
3133

3234
override fun checkNewEarthQuakes() {
3335
currentPage = 1
34-
view.setState(State.showProgressState(true))
36+
view?.setState(State.showProgressState(true))
3537
repo.searchQuakes(SearchParams("", repo.getPrefs().lastUpdateDate), ICallback {
3638
if (it.isFail) {
37-
view.setState(State.showErrorState(true, it.error?.message))
39+
view?.setState(State.showErrorState(true, it.error?.message))
3840
currentPage--
39-
} else view.setState(State.newDataState(currentPage, it.data!!))
41+
} else {
42+
view?.setState(State.newDataState(currentPage, it.data!!))
43+
}
4044
})
4145
}
4246

4347
override fun getNextBulk(lastDate: Date) {
4448
currentPage++
4549
// add check is there more data in other cases
46-
view.setState(State.showProgressState(true))
50+
view?.setState(State.showProgressState(true))
4751
repo.getEarthquakesBeforeDate(SearchParams("", SearchParams.DEF_TIME, "", lastDate.time), ICallback {
4852
if (it.isFail) {
49-
view.setState(State.showErrorState(true, it.error?.message))
53+
view?.setState(State.showErrorState(true, it.error?.message))
5054
currentPage--
51-
} else view.setState(State.newDataState(currentPage, it.data!!))
55+
} else {
56+
view?.setState(State.newDataState(currentPage, it.data!!))
57+
}
5258
})
5359
}
5460
}

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
buildscript {
44
ext.kotlin_version = '1.3.72'
5-
ext.support_ver = '1.5.0'
5+
ext.support_ver = '1.1.0'
66
ext.gcm_ver = '17.0.0'
77
ext.retrofit_ver = '2.9.0'
88
ext.androidx = '1.3.0'
9+
ext.androidx_annotation = '1.2.0'
910
ext.androidx_recycler = '1.2.0'
1011
ext.lifecycle = '2.2.0'
1112
ext.lifecycle_ktx = '2.3.1'

‎capture/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ android {
2323

2424
dependencies {
2525
implementation project(':utilities')
26-
implementation "androidx.annotation:annotation:$androidx"
26+
implementation "androidx.annotation:annotation:$androidx_annotation"
2727
}

‎injection/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "androidx.annotation:annotation:$androidx"
25+
implementation "androidx.annotation:annotation:$androidx_annotation"
2626
}

‎prefs/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "androidx.annotation:annotation:$androidx"
25+
implementation "androidx.annotation:annotation:$androidx_annotation"
2626
}

‎retrofit_support/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ android {
2323

2424
dependencies {
2525
implementation "com.squareup.retrofit2:retrofit:$retrofit_ver"
26-
implementation "androidx.annotation:annotation:$androidx"
26+
implementation "androidx.annotation:annotation:$androidx_annotation"
2727
implementation project(path: ':result')
2828
}

‎sqlite/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ android {
2222
}
2323

2424
dependencies {
25-
implementation "androidx.annotation:annotation:$androidx"
25+
implementation "androidx.annotation:annotation:$androidx_annotation"
2626
}

0 commit comments

Comments
 (0)