sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Disable signed in students in login (#677)

Browse Source
This commit is contained in:
Dominik Korsa
2020-02-04 09:43:24 +01:00
committed by GitHub
parent 2f56f7e4a4
commit 720a530a6c
7 changed files with 78 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectItem.kt
View File

@ -2,6 +2,8 @@ package io.github.wulkanowy.ui.modules.login.studentselect
import android.annotation.SuppressLint
import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
import eu.davidea.flexibleadapter.items.IFlexible
@ -10,12 +12,16 @@ import io.github.wulkanowy.R
import io.github.wulkanowy.data.db.entities.Student
import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.main.item_login_student_select.*
import timber.log.Timber
class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
class LoginStudentSelectItem(val student: Student, val alreadySaved: Boolean) :
AbstractFlexibleItem<LoginStudentSelectItem.ItemViewHolder>() {
override fun getLayoutRes() = R.layout.item_login_student_select
override fun createViewHolder(view: View, adapter: FlexibleAdapter<IFlexible<*>>): ItemViewHolder {
Timber.i("createViewHolder()")
Timber.i(alreadySaved.toString())
return ItemViewHolder(view, adapter)
}
@ -24,6 +30,10 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
holder.apply {
loginItemName.text = "${student.studentName} ${student.className}"
loginItemSchool.text = student.schoolName
loginItemName.isEnabled = !alreadySaved
loginItemSchool.isEnabled = !alreadySaved
loginItemCheck.isEnabled = !alreadySaved
loginItemSignedIn.visibility = if (alreadySaved) VISIBLE else GONE
}
}
@ -34,6 +44,7 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
other as LoginStudentSelectItem
if (student != other.student) return false
if (alreadySaved != other.alreadySaved) return false
return true
}
@ -42,7 +53,8 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
return student.hashCode()
}
class ItemViewHolder(view: View, adapter: FlexibleAdapter<*>) : FlexibleViewHolder(view, adapter), LayoutContainer {
class ItemViewHolder(view: View, val adapter: FlexibleAdapter<*>) :
FlexibleViewHolder(view, adapter), LayoutContainer {
override val containerView: View
get() = itemView
@ -53,7 +65,10 @@ class LoginStudentSelectItem(val student: Student) : AbstractFlexibleItem<LoginS
override fun onClick(view: View?) {
super.onClick(view)
loginItemCheck.apply { isChecked = !isChecked }
if (loginItemCheck.isEnabled) {
loginItemCheck.apply { isChecked = !isChecked }
}
}
}
}

31
app/src/main/java/io/github/wulkanowy/ui/modules/login/studentselect/LoginStudentSelectPresenter.kt
View File

@ -8,6 +8,7 @@ import io.github.wulkanowy.ui.modules.login.LoginErrorHandler
import io.github.wulkanowy.utils.FirebaseAnalyticsHelper
import io.github.wulkanowy.utils.SchedulersProvider
import io.github.wulkanowy.utils.ifNullOrBlank
import io.reactivex.Single
import timber.log.Timber
import java.io.Serializable
import javax.inject.Inject
@ -50,7 +51,7 @@ class LoginStudentSelectPresenter @Inject constructor(
}
fun onItemSelected(item: AbstractFlexibleItem<*>?) {
if (item is LoginStudentSelectItem) {
if (item is LoginStudentSelectItem && !item.alreadySaved) {
selectedStudents.removeAll { it == item.student }
.let { if (!it) selectedStudents.add(item.student) }
@ -58,11 +59,33 @@ class LoginStudentSelectPresenter @Inject constructor(
}
}
private fun compareStudents(a: Student, b: Student): Boolean {
return a.email == b.email
&& a.symbol == b.symbol
&& a.studentId == b.studentId
&& a.schoolSymbol == b.schoolSymbol
&& a.classId == b.classId
}
private fun loadData(students: List<Student>) {
this.students = students
view?.apply {
updateData(students.map { LoginStudentSelectItem(it) })
}
disposable.add(studentRepository.getSavedStudents()
.map { savedStudents ->
students.map { student ->
Pair(student, savedStudents.any { compareStudents(student, it) })
}
}
.subscribeOn(schedulers.backgroundThread)
.observeOn(schedulers.mainThread)
.subscribe({
view?.updateData(it.map { studentPair ->
LoginStudentSelectItem(studentPair.first, studentPair.second)
})
}, {
errorHandler.dispatch(it)
view?.updateData(students.map { student -> LoginStudentSelectItem(student, false) })
})
)
}
private fun registerStudents(students: List<Student>) {