Fix crash, add type to exam cards and small fix for subjects

jan-tennert · Sep 27, 2023 · ef4c429 · ef4c429
1 parent da60961
commit ef4c429
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/app/src/main/java/io/github/jan/kex/ui/components/ExamCard.kt b/app/src/main/java/io/github/jan/kex/ui/components/ExamCard.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -41,6 +42,7 @@ fun ExamCard(exam: Exam, selected: Boolean, modifier: Modifier = Modifier) {
             verticalArrangement = Arrangement.Center
         ) {
             Text(exam.subject, fontWeight = FontWeight.Bold, fontSize = 15.sp, maxLines = 1, overflow = TextOverflow.Ellipsis)
+            Text(stringResource(id = exam.type.nameId), fontSize = 10.sp)
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 Text(
                     text = exam.date.localizedDateString,

diff --git a/app/src/main/java/io/github/jan/kex/ui/components/ExamHomeCard.kt b/app/src/main/java/io/github/jan/kex/ui/components/ExamHomeCard.kt
@@ -9,6 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import io.github.jan.kex.data.remote.Exam
 
@@ -20,7 +21,7 @@ fun ExamHomeCard(exam: Exam, modifier: Modifier = Modifier, onClick: () -> Unit)
             verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier.padding(12.dp)
         ) {
-            Text(exam.subject)
+            Text("${exam.subject} (${stringResource(id = exam.type.nameId)})")
             Spacer(Modifier.weight(1f))
         }
     }

diff --git a/app/src/main/java/io/github/jan/kex/ui/screen/AuthScreen.kt b/app/src/main/java/io/github/jan/kex/ui/screen/AuthScreen.kt
@@ -76,7 +76,7 @@ fun AuthScreen(
                     }
                 },
             ) {
-                ProviderButtonContent(provider = Google)
+                ProviderButtonContent(provider = Google, text = stringResource(id = R.string.login_google))
             }
         }
     }

diff --git a/app/src/main/java/io/github/jan/kex/ui/screen/HomeScreen.kt b/app/src/main/java/io/github/jan/kex/ui/screen/HomeScreen.kt
@@ -66,7 +66,7 @@ fun HomeScreen(
     val subjects by subjectVm.subjects.collectAsStateWithLifecycle(emptyList())
     val tasksByDays by remember {
         derivedStateOf {
-            tasks.filter { it.doneDate == null }.groupBy { it.daysUntil }.entries.sortedBy { it.key }.filter { it.key >= 0 }.take(3)
+            tasks.filter { it.doneDate == null && it.dueDate > Clock.System.now() }.groupBy { it.daysUntil }.entries.sortedBy { it.key }.filter { it.key >= 0 }.take(3)
         }
     }
     val context = LocalContext.current
@@ -155,10 +155,8 @@ private fun LazyListScope.taskList(tasksByDay: List<Map.Entry<Long, List<Task>>>
             Text(stringResource(days.toInt().localizedDay, days), fontSize = 20.sp)
         }
         items(tasks) {
-            val subject by remember {
-                derivedStateOf {
-                    subjects.find { subject -> subject.id == it.subjectId }
-                }
+            val subject = remember(subjects) {
+                subjects.find { subject -> subject.id == it.subjectId }
             }
             TaskCard(
                 task = it,

diff --git a/app/src/main/java/io/github/jan/kex/ui/screen/exam/ExamCreateScreen.kt b/app/src/main/java/io/github/jan/kex/ui/screen/exam/ExamCreateScreen.kt
@@ -72,7 +72,7 @@ fun ExamCreateScreen(
                 val date = Instant.fromEpochMilliseconds(it).toLocalDateTime(
                     TimeZone.currentSystemDefault()
                 )
-                "${if(date.dayOfMonth < 10) "0" + date.dayOfMonth else date.dayOfMonth}.${date.monthNumber}.${date.year}"
+                "${if(date.dayOfMonth < 10) "0" + date.dayOfMonth else date.dayOfMonth}.${if (date.monthNumber < 10) "0" + date.monthNumber else date.dayOfMonth}.${date.year}"
             }
         }
         var type by remember {

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Kex</string>
-    <string name="past_exams">Vergangene Klassenarbeiten anzeigen</string>
+    <string name="past_exams">Vergangene Prüfungen anzeigen</string>
     <string name="score">Note/Punkte</string>
     <string name="theme">Themen</string>
     <string name="save">Speichern</string>
@@ -13,7 +13,7 @@
     <string name="home">Startseite</string>
     <string name="tasks">Hausaufgaben</string>
     <string name="settings">Einstellungen</string>
-    <string name="exams">Klassenarbeiten</string>
+    <string name="exams">Prüfungen</string>
     <string name="subject">Schulfach</string>
     <string name="date">Datum</string>
     <string name="exam">Klassenarbeit</string>
@@ -40,17 +40,17 @@
     <string name="password">Passwort</string>
     <string name="login">Einloggen</string>
     <string name="sign_out">Ausloggen</string>
-    <string name="exam_detail">Klassenarbeiten</string>
-    <string name="exam_create">Klassenarbeit erstellen</string>
-    <string name="exam_edit">Klassenarbeit bearbeiten</string>
+    <string name="exam_detail">Prüfungen</string>
+    <string name="exam_create">Prüfung erstellen</string>
+    <string name="exam_edit">Prüfung bearbeiten</string>
     <string name="create_task">Hausaufgabe erstellen</string>
     <string name="gfs">GFS</string>
     <string name="task">Hausaufgabe</string>
     <string name="tomorrow">Morgen</string>
     <string name="today">Heute</string>
     <string name="day_after_tomorrow">Übermorgen</string>
     <string name="in_days">In %s Tagen</string>
-    <string name="no_exams">Keine Klassenarbeiten verfügbar</string>
+    <string name="no_exams">Keine Prüfungen verfügbar</string>
     <string name="no_tasks">Keine Hausaufgaben verfügbar</string>
     <string name="install">Installieren</string>
     <string name="download">Herunterladen</string>
@@ -77,12 +77,12 @@
     <string name="delete_subject_fail">Schulfach konnte nicht gelöscht werden. Bitte überprüfe deine Internetverbindung!</string>
     <string name="create_subject_fail">Schulfach konnte nicht erstellt werden. Bitte überprüfe deine Internetverbindung!</string>
     <string name="notifications">Benachrichtigungen</string>
-    <string name="notifications_text">Willst du Benachrichtigungen für Hausaufgaben und Klassenarbeiten bekommen?</string>
+    <string name="notifications_text">Willst du Benachrichtigungen für Hausaufgaben und Prüfungen bekommen?</string>
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
     <string name="exam_notification">Du hast in 5 Tagen eine %s %s!</string>
     <string name="exam_notification_title">%s %s in 5 Tagen!</string>
-    <string name="upcoming_exams">Anstehende Klassenarbeiten</string>
+    <string name="upcoming_exams">Anstehende Prüfungen</string>
     <string name="pending_tasks">Anstehende Aufgaben</string>
     <string name="exam_import_screen">Klassenarbeit-Importierer</string>
     <string name="select_courses">Kurse auswählen zum Importieren</string>

diff --git a/gradle.properties b/gradle.properties
@@ -26,5 +26,5 @@ kotlin.experimental.tryK2=true
 android.lint.useK2Uast=true
 
 # App settings
-app.versionName=0.1.2
-app.versionCode=8
+app.versionName=0.1.3
+app.versionCode=9