Skip to content

Commit e963f3b

Browse files
committed
chore: ♻️ fix naming
1 parent 97ec65c commit e963f3b

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

app/src/main/java/es/ffgiraldez/comicsearch/comics/data/ComicRepository.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ abstract class ComicRepository<T> (
1818
) {
1919
fun findByTerm(term: String): Flowable<Either<ComicError, List<T>>> =
2020
local.findQueryByTerm(term)
21-
.flatMap { findSuggestions(it, term) }
21+
.flatMap { find(it, term) }
2222

23-
private fun findSuggestions(
23+
private fun find(
2424
query: Option<Query>,
2525
term: String
2626
): Flowable<out Either<ComicError, List<T>>> = when (query) {
27-
is None -> searchSuggestions(term)
28-
is Some -> fetchSuggestions(query)
27+
is None -> search(term)
28+
is Some -> fetch(query)
2929
}
3030

31-
private fun searchSuggestions(term: String): Flowable<Either<ComicError, List<T>>> =
31+
private fun search(term: String): Flowable<Either<ComicError, List<T>>> =
3232
remote.findByTerm(term)
3333
.map { right<ComicError, List<T>>(it) }
3434
.onErrorReturn { left<ComicError, List<T>>(NetworkError) }
35-
.flatMapPublisher { saveSuggestions(it, term) }
35+
.flatMapPublisher { save(it, term) }
3636

37-
private fun saveSuggestions(
37+
private fun save(
3838
results: Either<ComicError, List<T>>,
3939
term: String
4040
): Flowable<Either<ComicError, List<T>>> =
@@ -44,7 +44,7 @@ abstract class ComicRepository<T> (
4444
local.insert(term, it).toFlowable<Either<ComicError, List<T>>>()
4545
})
4646

47-
private fun fetchSuggestions(it: Some<Query>): Flowable<Either<EmptyResultsError, List<T>>> =
47+
private fun fetch(it: Some<Query>): Flowable<Either<EmptyResultsError, List<T>>> =
4848
local.findByQuery(it.t)
4949
.map {
5050
when (it.isEmpty()) {

app/src/main/java/es/ffgiraldez/comicsearch/query/base/ui/QueryViewStateExt.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ val <T>QueryViewState<T>.error: Option<ComicError>
1111
else -> Option.empty()
1212
}
1313

14+
val <T>QueryViewState<T>.hasError: Boolean
15+
get() = !error.isEmpty()
16+
1417
val <T>QueryViewState<T>.results: List<T>
1518
get() = when (this) {
1619
is QueryViewState.Result -> _results

app/src/main/java/es/ffgiraldez/comicsearch/query/search/ui/SearchBindingAdapters.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ import android.widget.ProgressBar
66
import android.widget.TextView
77
import androidx.databinding.BindingAdapter
88
import androidx.recyclerview.widget.RecyclerView
9-
import arrow.core.Option
109
import com.arlib.floatingsearchview.FloatingSearchView
1110
import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion
12-
import es.ffgiraldez.comicsearch.comics.domain.ComicError
1311
import es.ffgiraldez.comicsearch.comics.domain.Volume
1412
import es.ffgiraldez.comicsearch.platform.gone
1513
import es.ffgiraldez.comicsearch.query.base.presentation.QueryViewState
1614
import es.ffgiraldez.comicsearch.query.base.ui.OnVolumeSelectedListener
1715
import es.ffgiraldez.comicsearch.query.base.ui.QuerySearchSuggestion.ResultSuggestion
1816
import es.ffgiraldez.comicsearch.query.base.ui.QueryVolumeAdapter
1917
import es.ffgiraldez.comicsearch.query.base.ui.error
18+
import es.ffgiraldez.comicsearch.query.base.ui.hasError
2019
import es.ffgiraldez.comicsearch.query.base.ui.loading
2120
import es.ffgiraldez.comicsearch.query.base.ui.results
2221
import es.ffgiraldez.comicsearch.query.base.ui.toHumanResponse
@@ -56,7 +55,7 @@ fun RecyclerView.bindStateData(inputAdapter: QueryVolumeAdapter, data: QueryView
5655
}
5756

5857
data?.let {
59-
bindError(data.error)
58+
bindError(data.hasError)
6059
bindResults(data.results)
6160
}
6261
}
@@ -77,8 +76,8 @@ fun ProgressBar.bindProgress(data: QueryViewState<Volume>?) = data?.let { state
7776
gone(!state.loading)
7877
}
7978

80-
private fun RecyclerView.bindError(error: Option<ComicError>): Unit =
81-
error.fold({ View.VISIBLE }, { View.GONE }).let { this.visibility = it }
79+
private fun RecyclerView.bindError(error: Boolean): Unit =
80+
gone(error)
8281

8382
private fun RecyclerView.bindResults(error: List<Volume>): Unit = with(adapter as QueryVolumeAdapter) {
8483
this.submitList(error)

0 commit comments

Comments
 (0)