diff --git a/app/src/main/java/ru/n08i40k/polytechnic/next/model/LessonType.kt b/app/src/main/java/ru/n08i40k/polytechnic/next/model/LessonType.kt index f3e0509..ff7b4c5 100644 --- a/app/src/main/java/ru/n08i40k/polytechnic/next/model/LessonType.kt +++ b/app/src/main/java/ru/n08i40k/polytechnic/next/model/LessonType.kt @@ -18,4 +18,5 @@ enum class LessonType(val value: Int) { INDEPENDENT_WORK(4), EXAM(5), EXAM_WITH_GRADE(6), + EXAM_DEFAULT(7) } \ No newline at end of file diff --git a/app/src/main/java/ru/n08i40k/polytechnic/next/network/request/schedule/ScheduleGet.kt b/app/src/main/java/ru/n08i40k/polytechnic/next/network/request/schedule/ScheduleGet.kt index 9c1a5a8..44b51ee 100644 --- a/app/src/main/java/ru/n08i40k/polytechnic/next/network/request/schedule/ScheduleGet.kt +++ b/app/src/main/java/ru/n08i40k/polytechnic/next/network/request/schedule/ScheduleGet.kt @@ -14,7 +14,7 @@ class ScheduleGet( ) : CachedRequest( context, Method.GET, - "v3/schedule/group", + "v4/schedule/group", { listener.onResponse(Json.decodeFromString(it)) }, errorListener ) { diff --git a/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt b/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt index a58223a..e8ee421 100644 --- a/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt +++ b/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt @@ -150,6 +150,7 @@ fun DayCard( LessonType.INDEPENDENT_WORK -> customCardColors LessonType.EXAM -> examCardColors LessonType.EXAM_WITH_GRADE -> examCardColors + LessonType.EXAM_DEFAULT -> examCardColors } val mutableExpanded = remember { mutableStateOf(false) } diff --git a/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt b/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt index 5d31bdc..203ad9f 100644 --- a/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt +++ b/app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt @@ -194,6 +194,7 @@ private fun LessonViewRow( LessonType.INDEPENDENT_WORK -> stringResource(R.string.lesson_type_independent_work) LessonType.EXAM -> stringResource(R.string.lesson_type_exam) LessonType.EXAM_WITH_GRADE -> stringResource(R.string.lesson_type_exam_with_grade) + LessonType.EXAM_DEFAULT -> stringResource(R.string.lesson_type_exam_default) else -> throw Error("Unknown lesson type!") }, fontWeight = FontWeight.Bold, diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fb6f9f0..b23dfe2 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -84,4 +84,5 @@ Самостоятельная работа ЗАЧЁТ ЗАЧЁТ С ОЦЕНКОЙ + ЭКЗАМЕН \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ff2246..06c22d3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,6 +82,7 @@ Failed to fetch teacher names! Consultation Independent work - EXAM - EXAM WITH GRADE + EXAM* + EXAM* WITH GRADE + EXAM \ No newline at end of file