sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Messages/Compose] Fix deselecting recipients in dialog.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2020-01-02 19:57:48 +01:00
parent f5b2c24ee3
commit 1553173300
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/messages/MessagesComposeFragment.kt
View File

@ -50,7 +50,6 @@ import pl.szczodrzynski.edziennik.utils.Themes.getPrimaryTextColor
import pl.szczodrzynski.edziennik.utils.models.Date import pl.szczodrzynski.edziennik.utils.models.Date
import pl.szczodrzynski.edziennik.utils.models.Time import pl.szczodrzynski.edziennik.utils.models.Time
import pl.szczodrzynski.navlib.elevateSurface import pl.szczodrzynski.navlib.elevateSurface
import java.util.*
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.text.replace import kotlin.text.replace
@ -190,22 +189,24 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
b.recipients.chipTokenizer = SpanChipTokenizer<ChipSpan>(activity, object : ChipSpanChipCreator() { b.recipients.chipTokenizer = SpanChipTokenizer<ChipSpan>(activity, object : ChipSpanChipCreator() {
override fun createChip(context: Context, text: CharSequence, data: Any?): ChipSpan? { override fun createChip(context: Context, text: CharSequence, data: Any?): ChipSpan? {
val teacher = data as Teacher? if (data == null || data !is Teacher)
if (teacher!!.id in -24L..0L) { return null
val type = (teacher.id * -1).toInt() if (data.id in -24L..0L) {
val type = (data.id * -1).toInt()
val textColorPrimary = android.R.attr.textColorPrimary.resolveAttr(activity) val textColorPrimary = android.R.attr.textColorPrimary.resolveAttr(activity)
val textColorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity) val textColorSecondary = android.R.attr.textColorSecondary.resolveAttr(activity)
val category: MutableList<Teacher> = ArrayList() val category = mutableListOf<Teacher>()
val categoryNames: MutableList<CharSequence> = ArrayList() val categoryNames = mutableListOf<CharSequence>()
teachers.forEach { val categoryCheckedItems = mutableListOf<Boolean>()
if (it.isType(type)) { teachers.forEach { teacher ->
category += it if (teacher.isType(type)) {
val name = it.fullName category += teacher
val name = teacher.fullName
val description = when (type) { val description = when (type) {
Teacher.TYPE_TEACHER -> null Teacher.TYPE_TEACHER -> null
Teacher.TYPE_PARENTS_COUNCIL -> it.typeDescription Teacher.TYPE_PARENTS_COUNCIL -> teacher.typeDescription
Teacher.TYPE_SCHOOL_PARENTS_COUNCIL -> null Teacher.TYPE_SCHOOL_PARENTS_COUNCIL -> null
Teacher.TYPE_PEDAGOGUE -> null Teacher.TYPE_PEDAGOGUE -> null
Teacher.TYPE_LIBRARIAN -> null Teacher.TYPE_LIBRARIAN -> null
@ -213,11 +214,11 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
Teacher.TYPE_SUPER_ADMIN -> null Teacher.TYPE_SUPER_ADMIN -> null
Teacher.TYPE_SECRETARIAT -> null Teacher.TYPE_SECRETARIAT -> null
Teacher.TYPE_PRINCIPAL -> null Teacher.TYPE_PRINCIPAL -> null
Teacher.TYPE_EDUCATOR -> it.typeDescription Teacher.TYPE_EDUCATOR -> teacher.typeDescription
Teacher.TYPE_PARENT -> it.typeDescription Teacher.TYPE_PARENT -> teacher.typeDescription
Teacher.TYPE_STUDENT -> it.typeDescription Teacher.TYPE_STUDENT -> teacher.typeDescription
Teacher.TYPE_SPECIALIST -> null Teacher.TYPE_SPECIALIST -> null
else -> it.typeDescription else -> teacher.typeDescription
} }
categoryNames += listOfNotNull( categoryNames += listOfNotNull(
name.asSpannable( name.asSpannable(
@ -228,6 +229,7 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
AbsoluteSizeSpan(14.dp) AbsoluteSizeSpan(14.dp)
) )
).concat("\n") ).concat("\n")
categoryCheckedItems += b.recipients.allChips.firstOrNull { it.data == teacher } != null
} }
} }
@ -236,13 +238,21 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
//.setMessage(getString(R.string.messages_compose_recipients_text_format, Teacher.typeName(activity, type))) //.setMessage(getString(R.string.messages_compose_recipients_text_format, Teacher.typeName(activity, type)))
.setPositiveButton("OK", null) .setPositiveButton("OK", null)
.setNeutralButton("Anuluj", null) .setNeutralButton("Anuluj", null)
.setMultiChoiceItems(categoryNames.toTypedArray(), categoryNames.map { false }.toBooleanArray()) { dialog, which, isChecked -> .setMultiChoiceItems(categoryNames.toTypedArray(), categoryCheckedItems.toBooleanArray()) { _, which, isChecked ->
val teacher = category[which]
if (isChecked) {
val chipInfoList = mutableListOf<ChipInfo>() val chipInfoList = mutableListOf<ChipInfo>()
val selected = category[which] teacher.image = getProfileImage(48, 24, 16, 12, 1, teacher.fullName)
selected.image = getProfileImage(48, 24, 16, 12, 1, selected.fullName) chipInfoList.add(ChipInfo(teacher.fullName, teacher))
chipInfoList.add(ChipInfo(selected.fullName, selected))
b.recipients.addTextWithChips(chipInfoList) b.recipients.addTextWithChips(chipInfoList)
} }
else {
b.recipients.allChips.forEach {
if (it.data == teacher)
b.recipients.chipTokenizer?.deleteChipAndPadding(it, b.recipients.text)
}
}
}
.show() .show()
/*MaterialDialog.Builder(activity) /*MaterialDialog.Builder(activity)
@ -264,8 +274,12 @@ class MessagesComposeFragment : Fragment(), CoroutineScope {
.show()*/ .show()*/
return null return null
} }
val chipSpan = ChipSpan(context, teacher.fullName, BitmapDrawable(context.resources, teacher.image), teacher) b.recipients.allChips.forEach {
chipSpan.setIconBackgroundColor(Colors.stringToMaterialColor(teacher.fullName)) if (it.data == data)
return null
}
val chipSpan = ChipSpan(context, data.fullName, BitmapDrawable(context.resources, data.image), data)
chipSpan.setIconBackgroundColor(Colors.stringToMaterialColor(data.fullName))
return chipSpan return chipSpan
} }