Skip to content

Commit b942141

Browse files
committed
fix lints
1 parent afd95ba commit b942141

File tree

9 files changed

+22
-23
lines changed

9 files changed

+22
-23
lines changed

app/src/main/java/com/hoc/comicapp/activity/main/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class MainActivity : ScopeActivity(R.layout.activity_main) {
174174
.height(size)
175175
.endConfig()
176176
.buildRect(
177-
firstLetter.toUpperCase().toString(),
177+
firstLetter.uppercase(),
178178
ColorGenerator.MATERIAL.getColor(user.email)
179179
)
180180
}

app/src/main/java/com/hoc/comicapp/activity/main/MainVM.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.jakewharton.rxrelay3.PublishRelay
1313
import io.reactivex.rxjava3.core.Observable
1414
import io.reactivex.rxjava3.core.Observable.mergeArray
1515
import io.reactivex.rxjava3.core.ObservableTransformer
16+
import io.reactivex.rxjava3.disposables.Disposable
1617
import io.reactivex.rxjava3.kotlin.addTo
1718
import io.reactivex.rxjava3.kotlin.ofType
1819
import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -23,7 +24,7 @@ class MainVM(
2324
) : BaseViewModel<ViewIntent, ViewState, SingleEvent>(ViewState.initial()) {
2425
private val intentS = PublishRelay.create<ViewIntent>()
2526

26-
override fun processIntents(intents: Observable<ViewIntent>) = intents.subscribe(intentS)!!
27+
override fun processIntents(intents: Observable<ViewIntent>): Disposable = intents.subscribe(intentS)
2728

2829
private val initialProcessor =
2930
ObservableTransformer<ViewIntent.Initial, PartialChange> { intent ->

app/src/main/java/com/hoc/comicapp/data/analytics/AnalyticsServiceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AnalyticsServiceImpl : AnalyticsService {
2727

2828
class SnakeCaseFirebaseAnalyticsEventMapper {
2929
fun nameFor(event: String): String =
30-
CAMEL_REGEX.replace(event) { "_" + it.value }.toLowerCase()
30+
CAMEL_REGEX.replace(event) { "_" + it.value }.lowercase()
3131

3232
fun paramsFor(params: Map<String, Any>?): Bundle? {
3333
return bundleOf(

app/src/main/java/com/hoc/comicapp/data/firebase/favorite_comics/FavoriteComicsDataSourceImpl.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.hoc.comicapp.domain.models.AuthError
1414
import com.hoc.comicapp.domain.thread.CoroutinesDispatchersProvider
1515
import com.hoc.comicapp.domain.thread.RxSchedulerProvider
1616
import com.hoc.comicapp.utils.snapshots
17+
import com.hoc.comicapp.utils.unit
1718
import io.reactivex.rxjava3.core.Observable
1819
import kotlinx.coroutines.CoroutineScope
1920
import kotlinx.coroutines.ObsoleteCoroutinesApi
@@ -138,9 +139,7 @@ class FavoriteComicsDataSourceImpl(
138139
}
139140
}
140141

141-
override fun update(comics: List<_FavoriteComic>) {
142-
actor.offer(comics)
143-
}
142+
override fun update(comics: List<_FavoriteComic>) = actor.trySend(comics).unit
144143

145144
private val favoriteCollectionForCurrentUserOrNull: CollectionReference?
146145
get() = firebaseAuth.currentUser?.uid?.let {

app/src/main/java/com/hoc/comicapp/data/repository/ComicRepositoryImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ class ComicRepositoryImpl(
259259
favoriteComicsDataSource.update(listOf(entity))
260260

261261
// update downloaded
262-
actor.offer(Mappers.responseToLocalEntity(comicDetail))
262+
actor.trySend(Mappers.responseToLocalEntity(comicDetail))
263263
}
264264

265265
private companion object {

app/src/main/java/com/hoc/comicapp/data/repository/DownloadComicsRepositoryImpl.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ import kotlinx.coroutines.withContext
5454
import timber.log.Timber
5555
import java.io.File
5656
import java.util.Date
57+
import kotlin.time.DurationUnit
5758
import kotlin.time.ExperimentalTime
5859
import kotlin.time.TimeSource
5960

@@ -279,7 +280,7 @@ class DownloadComicsRepositoryImpl(
279280
chapterName = chapterDetail.chapterName,
280281
comicLink = chapterDetail.comicLink,
281282
comicName = chapterDetail.comicName,
282-
elapsedInMilliseconds = elapsed.inMilliseconds,
283+
elapsedInMilliseconds = elapsed.toDouble(DurationUnit.MILLISECONDS),
283284
elapsedInString = elapsed.toString()
284285
)
285286
)

app/src/main/java/com/hoc/comicapp/ui/category/CategoryViewModel.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.hoc.comicapp.utils.notOfType
99
import com.jakewharton.rxrelay3.PublishRelay
1010
import io.reactivex.rxjava3.core.Observable
1111
import io.reactivex.rxjava3.core.ObservableTransformer
12+
import io.reactivex.rxjava3.disposables.Disposable
1213
import io.reactivex.rxjava3.kotlin.addTo
1314
import io.reactivex.rxjava3.kotlin.cast
1415
import io.reactivex.rxjava3.kotlin.ofType
@@ -87,6 +88,7 @@ class CategoryViewModel(
8788
when (it) {
8889
is CategoryPartialChange.RefreshPartialChange.Error -> sendMessageEvent(message = "Refresh error occurred: ${it.error.getMessage()}")
8990
is CategoryPartialChange.RefreshPartialChange.Data -> sendMessageEvent(message = "Refresh success")
91+
CategoryPartialChange.RefreshPartialChange.Loading -> return@doOnNext
9092
}
9193
}
9294
.cast<CategoryPartialChange>()
@@ -109,8 +111,8 @@ class CategoryViewModel(
109111
}
110112
}
111113

112-
override fun processIntents(intents: Observable<CategoryViewIntent>) =
113-
intents.subscribe(intentS)!!
114+
override fun processIntents(intents: Observable<CategoryViewIntent>): Disposable =
115+
intents.subscribe(intentS)
114116

115117
init {
116118
intentS

app/src/main/java/com/hoc/comicapp/ui/category_detail/CategoryDetailAdapter.kt

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ import android.view.View
77
import android.view.ViewGroup
88
import androidx.annotation.LayoutRes
99
import androidx.core.view.isVisible
10-
import androidx.lifecycle.Lifecycle
11-
import androidx.lifecycle.LifecycleObserver
10+
import androidx.lifecycle.DefaultLifecycleObserver
1211
import androidx.lifecycle.LifecycleOwner
13-
import androidx.lifecycle.OnLifecycleEvent
1412
import androidx.recyclerview.widget.DiffUtil
1513
import androidx.recyclerview.widget.LinearLayoutManager
1614
import androidx.recyclerview.widget.LinearSmoothScroller
@@ -33,6 +31,7 @@ import com.hoc.comicapp.ui.category_detail.CategoryDetailContract.ViewState.Head
3331
import com.hoc.comicapp.ui.category_detail.CategoryDetailContract.ViewState.Item
3432
import com.hoc.comicapp.utils.asObservable
3533
import com.hoc.comicapp.utils.inflater
34+
import com.hoc.comicapp.utils.unit
3635
import com.jakewharton.rxbinding4.recyclerview.scrollStateChanges
3736
import com.jakewharton.rxbinding4.view.clicks
3837
import com.jakewharton.rxbinding4.view.detaches
@@ -186,11 +185,10 @@ class CategoryDetailAdapter(
186185
lifecycleOwner
187186
.lifecycle
188187
.addObserver(
189-
object : LifecycleObserver {
188+
object : DefaultLifecycleObserver {
190189
var disposable: Disposable? = null
191190

192-
@OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
193-
private fun onCreate() {
191+
override fun onCreate(owner: LifecycleOwner) {
194192
disposable = startStopAutoScrollS
195193
.mergeWith(
196194
binding.popularRecyclerHorizontal
@@ -229,14 +227,11 @@ class CategoryDetailAdapter(
229227
)
230228
}
231229

232-
@OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
233-
private fun onResume() = startStopAutoScrollS.accept(true)
230+
override fun onResume(owner: LifecycleOwner) = startStopAutoScrollS.accept(true)
234231

235-
@OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
236-
private fun onPause() = startStopAutoScrollS.accept(false)
232+
override fun onPause(owner: LifecycleOwner) = startStopAutoScrollS.accept(false)
237233

238-
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
239-
private fun onDestroy() = disposable?.dispose()
234+
override fun onDestroy(owner: LifecycleOwner) = disposable?.dispose().unit
240235
}
241236
)
242237
}

utils/src/main/java/com/hoc/comicapp/utils/Snackbar.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import androidx.annotation.StringRes
55
import com.google.android.material.snackbar.BaseTransientBottomBar
66
import com.google.android.material.snackbar.Snackbar
77

8-
inline class SnackbarLength private constructor(val length: Int) {
8+
@JvmInline
9+
value class SnackbarLength private constructor(val length: Int) {
910
companion object Factory {
1011
val SHORT = SnackbarLength(Snackbar.LENGTH_SHORT)
1112
val LONG = SnackbarLength(Snackbar.LENGTH_LONG)

0 commit comments

Comments
 (0)