From f4d3759d473ca31f9895bd2f33ad6ec2e032e615 Mon Sep 17 00:00:00 2001 From: N08I40K Date: Fri, 13 Dec 2024 06:33:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=AD=D0=BA=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=20?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BD=D0=B5=20=D0=BA=D0=B0=D0=BA=20=D0=B7=D0=B0?= =?UTF-8?q?=D1=87=D1=91=D1=82.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/n08i40k/polytechnic/next/model/LessonType.kt | 1 + .../polytechnic/next/network/request/schedule/ScheduleGet.kt | 2 +- .../ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt | 1 + .../n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values/strings.xml | 5 +++-- 6 files changed, 8 insertions(+), 3 deletions(-) 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