Avoid error caused by unknown attendance type

kyori19 · Jan 17, 2021 · eb25111 · eb25111
1 parent 88f902c
commit eb25111
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/app/src/main/java/net/accelf/itc_lms_unofficial/coursedetail/AttendancesAdapter.kt b/app/src/main/java/net/accelf/itc_lms_unofficial/coursedetail/AttendancesAdapter.kt
@@ -18,13 +18,17 @@ class AttendancesAdapter(
                 setImageResource(
                     when (item.status) {
                         Attendance.AttendanceStatus.PRESENT -> R.drawable.ic_check
-                        Attendance.AttendanceStatus.ABSENT -> R.drawable.ic_cancel
+                        Attendance.AttendanceStatus.LATE -> R.drawable.ic_time
+                        Attendance.AttendanceStatus.ABSENT -> R.drawable.ic_none
+                        else -> R.drawable.ic_cancel
                     }
                 )
                 contentDescription = context.getString(
                     when (item.status) {
                         Attendance.AttendanceStatus.PRESENT -> R.string.hint_icon_present
+                        Attendance.AttendanceStatus.LATE -> R.string.hint_icon_late
                         Attendance.AttendanceStatus.ABSENT -> R.string.hint_icon_absent
+                        else -> R.string.hint_icon_unknown
                     }
                 )
             }

diff --git a/app/src/main/java/net/accelf/itc_lms_unofficial/models/Attendance.kt b/app/src/main/java/net/accelf/itc_lms_unofficial/models/Attendance.kt
@@ -9,12 +9,15 @@ data class Attendance(
     val status: AttendanceStatus
 ) : Serializable {
     enum class AttendanceStatus(private val texts: Set<String>) {
+        UNKNOWN(setOf()),
         PRESENT(setOf("出席", "Present")),
-        ABSENT(setOf("欠席"));
+        LATE(setOf("遅刻", "Late")),
+        ABSENT(setOf("欠席", "Absent")),
+        ;
 
         companion object {
             fun String.toAttendanceStatus(): AttendanceStatus {
-                return values().first { this in it.texts }
+                return values().firstOrNull { this in it.texts } ?: UNKNOWN
             }
         }
     }

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -143,4 +143,5 @@
     <string name="dialog_title_send_attendance_success">送信完了</string>
     <string name="text_attendance_already_sent">この講義の出席は既に送信済みです。</string>
     <string name="text_attendance_error">エラーが発見されました。</string>
+    <string name="hint_icon_late">遅刻</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -72,6 +72,7 @@
     <string name="hint_icon_waiting_for_answer">Waiting for answer</string>
 
     <string name="hint_icon_absent">Absent</string>
+    <string name="hint_icon_late">Late</string>
     <string name="hint_icon_present">Present</string>
 
     <string name="hint_icon_not_taken">Not taken</string>