kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-15 10:26:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1972 switched to use lambda method calls

Browse Source
This commit is contained in:
Frans-Lukas 2020-04-10 14:59:08 +02:00
parent 722f4a7642
commit 58ef0de353
1 changed files with 30 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryPresenter.kt
View File

@ -18,10 +18,8 @@
package org.kiwix.kiwixmobile.core.history package org.kiwix.kiwixmobile.core.history
import android.util.Log import android.util.Log
import io.reactivex.CompletableObserver
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.Scheduler import io.reactivex.Scheduler
import io.reactivex.SingleObserver
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import org.kiwix.kiwixmobile.core.base.BasePresenter import org.kiwix.kiwixmobile.core.base.BasePresenter
import org.kiwix.kiwixmobile.core.data.DataSource import org.kiwix.kiwixmobile.core.data.DataSource
@ -30,6 +28,7 @@ import org.kiwix.kiwixmobile.core.di.qualifiers.MainThread
import org.kiwix.kiwixmobile.core.history.HistoryContract.Presenter import org.kiwix.kiwixmobile.core.history.HistoryContract.Presenter
import org.kiwix.kiwixmobile.core.history.HistoryContract.View import org.kiwix.kiwixmobile.core.history.HistoryContract.View
import org.kiwix.kiwixmobile.core.history.HistoryListItem.HistoryItem import org.kiwix.kiwixmobile.core.history.HistoryListItem.HistoryItem
import java.util.Locale
import javax.inject.Inject import javax.inject.Inject
internal class HistoryPresenter @Inject constructor( internal class HistoryPresenter @Inject constructor(
@ -37,64 +36,40 @@ internal class HistoryPresenter @Inject constructor(
@param:MainThread private val mainThread: Scheduler, @param:MainThread private val mainThread: Scheduler,
@param:Computation private val computation: Scheduler @param:Computation private val computation: Scheduler
) : BasePresenter<View>(), Presenter { ) : BasePresenter<View>(), Presenter {
private var disposable: Disposable? = null private var disposable: Disposable? = null
override fun loadHistory(showHistoryCurrentBook: Boolean) { override fun loadHistory(showHistoryCurrentBook: Boolean) {
dataSource.getDateCategorizedHistory(showHistoryCurrentBook) val d = dataSource.getDateCategorizedHistory(showHistoryCurrentBook).subscribe(
.subscribe(object : SingleObserver<List<HistoryListItem>> { { histories: List<HistoryListItem> -> view?.updateHistoryList(histories) },
override fun onSubscribe(d: Disposable) { { e: Throwable -> Log.e("HistoryPresenter", "Failed to load history.", e) }
if (disposable != null && !disposable!!.isDisposed) { )
disposable!!.dispose() disposable?.takeIf { !it.isDisposed }?.let { it.dispose() }
} disposable = d
disposable = d compositeDisposable.add(d)
compositeDisposable.add(d)
}
override fun onSuccess(histories: List<HistoryListItem>) {
view?.updateHistoryList(histories)
}
override fun onError(e: Throwable) {
Log.e("HistoryPresenter", e.toString())
}
})
} }
override fun filterHistory( override fun filterHistory(historyList: List<HistoryListItem>, newText: String) {
historyList: List<HistoryListItem>, compositeDisposable.add(Observable.just(historyList)
newText: String .flatMapIterable { flatHistoryList: List<HistoryListItem> ->
) = Observable.just(historyList) flatHistoryList.filter { item ->
.flatMapIterable { flatHistoryList: List<HistoryListItem> -> item is HistoryItem &&
flatHistoryList.filter { item -> item.historyTitle.toLowerCase(Locale.getDefault())
item is HistoryItem .contains(newText.toLowerCase(Locale.getDefault()))
&& item.historyTitle.toLowerCase()
.contains(newText.toLowerCase())
}
}
.toList()
.subscribeOn(computation)
.observeOn(mainThread)
.subscribe(object : SingleObserver<List<HistoryListItem>> {
override fun onSubscribe(d: Disposable) {
compositeDisposable.add(d)
}
override fun onError(e: Throwable) {
Log.e("HistoryPresenter", e.toString())
}
override fun onSuccess(historyList: List<HistoryListItem>) {
view?.notifyHistoryListFiltered(historyList)
}
})
override fun deleteHistory(deleteList: List<HistoryListItem>) =
dataSource.deleteHistory(deleteList)
.subscribe(object : CompletableObserver {
override fun onSubscribe(d: Disposable) {}
override fun onComplete() {}
override fun onError(e: Throwable) {
Log.e("HistoryPresenter", e.toString())
} }
}
.toList()
.subscribeOn(computation)
.observeOn(mainThread)
.subscribe(
{ hList: List<HistoryListItem> -> view?.notifyHistoryListFiltered(hList) },
{ e: Throwable -> Log.e("HistoryPresenter", "Failed to filter history", e) }
))
}
override fun deleteHistory(deleteList: List<HistoryListItem>) {
dataSource.deleteHistory(deleteList).subscribe({}, { e: Throwable ->
Log.e("HistoryPresenter", "Failed to delete history", e)
}) })
}
} }