Add fingerprint to lock UI
Migrate login UI to conductor Fix batch add controller not saving EditText content onResume Prevent double-locking of lock UI Remove back button from lock UI Fix login preference not updating
This commit is contained in:
@@ -35,7 +35,7 @@ class BatchAddController : NucleusController<BatchAddPresenter>() {
|
||||
}
|
||||
|
||||
progress_dismiss_btn.clicks().subscribeUntilDestroy {
|
||||
presenter.currentlyAddingRelay.call(false)
|
||||
presenter.currentlyAddingRelay.call(BatchAddPresenter.STATE_PROGRESS_TO_INPUT)
|
||||
}
|
||||
|
||||
val progressSubscriptions = CompositeSubscription()
|
||||
@@ -44,7 +44,7 @@ class BatchAddController : NucleusController<BatchAddPresenter>() {
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.subscribeUntilDestroy {
|
||||
progressSubscriptions.clear()
|
||||
if(it) {
|
||||
if(it == BatchAddPresenter.STATE_INPUT_TO_PROGRESS) {
|
||||
showProgress(this)
|
||||
progressSubscriptions += presenter.progressRelay
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
@@ -79,7 +79,10 @@ class BatchAddController : NucleusController<BatchAddPresenter>() {
|
||||
}?.let {
|
||||
progressSubscriptions += it
|
||||
}
|
||||
} else hideProgress(this)
|
||||
} else if(it == BatchAddPresenter.STATE_PROGRESS_TO_INPUT) {
|
||||
hideProgress(this)
|
||||
presenter.currentlyAddingRelay.call(BatchAddPresenter.STATE_IDLE)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,18 +15,18 @@ class BatchAddPresenter: BasePresenter<BatchAddController>() {
|
||||
val progressTotalRelay = BehaviorRelay.create(0)!!
|
||||
val progressRelay = BehaviorRelay.create(0)!!
|
||||
var eventRelay: ReplayRelay<String>? = null
|
||||
val currentlyAddingRelay = BehaviorRelay.create(false)!!
|
||||
val currentlyAddingRelay = BehaviorRelay.create(STATE_IDLE)!!
|
||||
|
||||
fun addGalleries(galleries: String) {
|
||||
eventRelay = ReplayRelay.create()
|
||||
val splitGalleries = galleries.split("\n").map {
|
||||
val splitGalleries = galleries.split("\n").mapNotNull {
|
||||
it.trim().nullIfBlank()
|
||||
}.filterNotNull()
|
||||
}
|
||||
|
||||
progressRelay.call(0)
|
||||
progressTotalRelay.call(splitGalleries.size)
|
||||
|
||||
currentlyAddingRelay.call(true)
|
||||
currentlyAddingRelay.call(STATE_INPUT_TO_PROGRESS)
|
||||
|
||||
thread {
|
||||
val succeeded = mutableListOf<String>()
|
||||
@@ -48,4 +48,10 @@ class BatchAddPresenter: BasePresenter<BatchAddController>() {
|
||||
eventRelay?.call(summary)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val STATE_IDLE = 0
|
||||
const val STATE_INPUT_TO_PROGRESS = 1
|
||||
const val STATE_PROGRESS_TO_INPUT = 2
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user