Skip to content

Commit cd19f25

Browse files
committed
some lint fixes
1 parent 0af8371 commit cd19f25

File tree

5 files changed

+21
-22
lines changed

5 files changed

+21
-22
lines changed

app/src/main/java/com/hoc/comicapp/ui/detail/ComicDetailViewModel.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ class ComicDetailViewModel(
226226
Timber.d("$operation error $it")
227227
sendMessageEvent("$operation error: ${event.chapter.chapterName}")
228228
}
229+
is ComicDetailSingleEvent.EnqueuedDownloadFailure -> return@subscribeBy
230+
is ComicDetailSingleEvent.EnqueuedDownloadSuccess -> return@subscribeBy
231+
is ComicDetailSingleEvent.MessageEvent -> return@subscribeBy
229232
}
230233
}
231234
.addTo(compositeDisposable)

app/src/main/java/com/hoc/comicapp/ui/downloaded_comics/DownloadedComicsAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ class DownloadedComicsAdapter(
5858
)
5959
}
6060

61-
private fun <T> Observable<T>.getItemAtPosition(): Observable<ComicItem> {
61+
private fun <T : Any> Observable<T>.getItemAtPosition(): Observable<ComicItem> {
6262
return map { bindingAdapterPosition }
6363
.filter { it != NO_POSITION }
64-
.map { getItem(it) }
64+
.map(::getItem)
6565
}
6666

6767
init {

app/src/main/java/com/hoc/comicapp/ui/favorite_comics/FavoriteComicsAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class FavoriteComicsAdapter(
4949
inner class VH(private val binding: ItemRecyclerFavoriteComicsBinding, parent: View) :
5050
RecyclerView.ViewHolder(binding.root) {
5151

52-
private fun <T> Observable<T>.getItemAtPosition(): Observable<ComicItem> {
52+
private fun <T : Any> Observable<T>.getItemAtPosition(): Observable<ComicItem> {
5353
return map { bindingAdapterPosition }
5454
.filter { it != NO_POSITION }
55-
.map { getItem(it) }
55+
.map(::getItem)
5656
}
5757

5858
init {

app/src/main/java/com/hoc/comicapp/ui/home/HomeAdapter.kt

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import android.view.View
66
import android.view.ViewGroup
77
import androidx.annotation.IntDef
88
import androidx.core.view.isVisible
9-
import androidx.lifecycle.Lifecycle
10-
import androidx.lifecycle.LifecycleObserver
9+
import androidx.lifecycle.DefaultLifecycleObserver
1110
import androidx.lifecycle.LifecycleOwner
12-
import androidx.lifecycle.OnLifecycleEvent
1311
import androidx.recyclerview.widget.LinearLayoutManager
1412
import androidx.recyclerview.widget.LinearSmoothScroller
1513
import androidx.recyclerview.widget.LinearSnapHelper
@@ -30,6 +28,7 @@ import com.hoc.comicapp.ui.home.HomeListItem.HeaderType.MOST_VIEWED
3028
import com.hoc.comicapp.ui.home.HomeListItem.HeaderType.NEWEST
3129
import com.hoc.comicapp.ui.home.HomeListItem.HeaderType.UPDATED
3230
import com.hoc.comicapp.utils.mapNotNull
31+
import com.hoc.comicapp.utils.unit
3332
import com.hoc081098.viewbindingdelegate.inflateViewBinding
3433
import com.jakewharton.rxbinding4.recyclerview.scrollStateChanges
3534
import com.jakewharton.rxbinding4.view.clicks
@@ -89,18 +88,18 @@ class HomeAdapter(
8988
private val clickComicS = PublishRelay.create<_HomeClickEvent>()
9089

9190
// Retry observables
92-
val newestRetryObservable = newestRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)!!
93-
val mostViewedRetryObservable = mostViewedRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)!!
94-
val updatedRetryObservable = updatedRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)!!
91+
val newestRetryObservable: Observable<Unit> = newestRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)
92+
val mostViewedRetryObservable: Observable<Unit> = mostViewedRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)
93+
val updatedRetryObservable: Observable<Unit> = updatedRetryS.throttleFirst(500, TimeUnit.MILLISECONDS)
9594

9695
// Click observables
97-
val clickComicObservable = Observable.mergeArray(
96+
val clickComicObservable: Observable<HomeClickEvent> = Observable.mergeArray(
9897
newestAdapter.clickComicObservable,
9998
mostViewedAdapter.clickComicObservable,
10099
clickComicS,
101100
)
102101
.map(::toHomeClickEvent)
103-
.doOnNext { Timber.d("[*] Click comic $it") }!!
102+
.doOnNext { Timber.d("[*] Click comic $it") }
104103

105104
override fun onCreateViewHolder(parent: ViewGroup, @ViewType viewType: Int): VH {
106105
return when (viewType) {
@@ -207,11 +206,10 @@ class HomeAdapter(
207206
}
208207

209208
lifecycleOwner.lifecycle.addObserver(
210-
object : LifecycleObserver {
209+
object : DefaultLifecycleObserver {
211210
var disposable: Disposable? = null
212211

213-
@OnLifecycleEvent(Lifecycle.Event.ON_START)
214-
private fun onCreate() {
212+
override fun onCreate(owner: LifecycleOwner) {
215213
disposable = startStopAutoScrollS
216214
.doOnNext { Timber.d("[###] [1] $it") }
217215
.concatMap {
@@ -263,18 +261,16 @@ class HomeAdapter(
263261
Timber.d("[>>>] ON_CREATE")
264262
}
265263

266-
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
267-
private fun onResume() = startStopAutoScrollS.accept(true)
264+
override fun onResume(owner: LifecycleOwner) = startStopAutoScrollS.accept(true)
268265
.also { Timber.d("[>>>] ON_RESUME -> start") }
269266

270-
@OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
271-
private fun onPause() = startStopAutoScrollS.accept(false)
267+
override fun onPause(owner: LifecycleOwner) = startStopAutoScrollS.accept(false)
272268
.also { Timber.d("[>>>] ON_PAUSE -> stop") }
273269

274-
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
275-
private fun onDestroy() = disposable?.dispose()
270+
override fun onDestroy(owner: LifecycleOwner) = disposable?.dispose()
276271
.also { lifecycleOwner.lifecycle.removeObserver(this) }
277272
.also { Timber.d("[>>>] ON_DESTROY -> disposed") }
273+
.unit
278274
}
279275
)
280276
}

buildSrc/src/main/kotlin/com/hoc/comicapp/plugin/ComicAppPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private fun Project.configAndroidLibrary() = libraryExtension.run {
115115

116116
buildTypes {
117117
release {
118-
isMinifyEnabled = true
118+
isMinifyEnabled = false
119119

120120
proguardFiles(
121121
getDefaultProguardFile("proguard-android-optimize.txt"),

0 commit comments

Comments
 (0)