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

[Timetable] Fix showing question marks in lesson changes.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-11-26 23:10:38 +01:00
parent 6d8960f089
commit eaed4b76aa
1 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/v2/day/TimetableDayFragment.kt
View File

@ -265,26 +265,26 @@ class TimetableDayFragment : Fragment(), CoroutineScope {
} }
Lesson.TYPE_CHANGE -> { Lesson.TYPE_CHANGE -> {
lb.annotationVisible = true lb.annotationVisible = true
if (lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId) { when {
lesson.subjectId != lesson.oldSubjectId && lesson.teacherId != lesson.oldTeacherId
&& lesson.oldSubjectName != null && lesson.oldTeacherName != null ->
lb.annotation.setText( lb.annotation.setText(
R.string.timetable_lesson_change_format, R.string.timetable_lesson_change_format,
"${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}" "${lesson.oldSubjectName ?: "?"}, ${lesson.oldTeacherName ?: "?"}"
) )
}
else if (lesson.subjectId != lesson.oldSubjectId) { lesson.subjectId != lesson.oldSubjectId && lesson.oldSubjectName != null ->
lb.annotation.setText( lb.annotation.setText(
R.string.timetable_lesson_change_format, R.string.timetable_lesson_change_format,
lesson.oldSubjectName ?: "?" lesson.oldSubjectName ?: "?"
) )
}
else if (lesson.teacherId != lesson.oldTeacherId) { lesson.teacherId != lesson.oldTeacherId && lesson.oldTeacherName != null ->
lb.annotation.setText( lb.annotation.setText(
R.string.timetable_lesson_change_format, R.string.timetable_lesson_change_format,
lesson.oldTeacherName ?: "?" lesson.oldTeacherName ?: "?"
) )
} else -> lb.annotation.setText(R.string.timetable_lesson_change)
else {
lb.annotation.setText(R.string.timetable_lesson_change)
} }
lb.annotation.background.colorFilter = PorterDuffColorFilter( lb.annotation.background.colorFilter = PorterDuffColorFilter(
@ -295,15 +295,19 @@ class TimetableDayFragment : Fragment(), CoroutineScope {
Lesson.TYPE_SHIFTED_SOURCE -> { Lesson.TYPE_SHIFTED_SOURCE -> {
lb.annotationVisible = true lb.annotationVisible = true
when { when {
lesson.date != lesson.oldDate -> lb.annotation.setText( lesson.date != lesson.oldDate && lesson.date != null ->
lb.annotation.setText(
R.string.timetable_lesson_shifted_other_day, R.string.timetable_lesson_shifted_other_day,
lesson.date?.stringY_m_d ?: "?", lesson.date?.stringY_m_d ?: "?",
lesson.startTime?.stringHM ?: "?" lesson.startTime?.stringHM ?: ""
) )
lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
lesson.startTime != lesson.oldStartTime && lesson.startTime != null ->
lb.annotation.setText(
R.string.timetable_lesson_shifted_same_day, R.string.timetable_lesson_shifted_same_day,
lesson.startTime?.stringHM ?: "?" lesson.startTime?.stringHM ?: "?"
) )
else -> lb.annotation.setText(R.string.timetable_lesson_shifted) else -> lb.annotation.setText(R.string.timetable_lesson_shifted)
} }
@ -315,15 +319,19 @@ class TimetableDayFragment : Fragment(), CoroutineScope {
Lesson.TYPE_SHIFTED_TARGET -> { Lesson.TYPE_SHIFTED_TARGET -> {
lb.annotationVisible = true lb.annotationVisible = true
when { when {
lesson.date != lesson.oldDate -> lb.annotation.setText( lesson.date != lesson.oldDate && lesson.oldDate != null ->
lb.annotation.setText(
R.string.timetable_lesson_shifted_from_other_day, R.string.timetable_lesson_shifted_from_other_day,
lesson.oldDate?.stringY_m_d ?: "?", lesson.oldDate?.stringY_m_d ?: "?",
lesson.oldStartTime?.stringHM ?: "?" lesson.oldStartTime?.stringHM ?: ""
) )
lesson.startTime != lesson.oldStartTime -> lb.annotation.setText(
lesson.startTime != lesson.oldStartTime && lesson.oldStartTime != null ->
lb.annotation.setText(
R.string.timetable_lesson_shifted_from_same_day, R.string.timetable_lesson_shifted_from_same_day,
lesson.oldStartTime?.stringHM ?: "?" lesson.oldStartTime?.stringHM ?: "?"
) )
else -> lb.annotation.setText(R.string.timetable_lesson_shifted_from) else -> lb.annotation.setText(R.string.timetable_lesson_shifted_from)
} }
@ -337,7 +345,8 @@ class TimetableDayFragment : Fragment(), CoroutineScope {
// The day view needs the event time ranges in the start minute/end minute format, // The day view needs the event time ranges in the start minute/end minute format,
// so calculate those here // so calculate those here
val startMinute = 60 * (lesson.displayStartTime?.hour ?: 0) + (lesson.displayStartTime?.minute ?: 0) val startMinute = 60 * (lesson.displayStartTime?.hour
?: 0) + (lesson.displayStartTime?.minute ?: 0)
val endMinute = startMinute + 45 val endMinute = startMinute + 45
eventTimeRanges.add(DayView.EventTimeRange(startMinute, endMinute)) eventTimeRanges.add(DayView.EventTimeRange(startMinute, endMinute))
} }