From 24dbb3969c1ed526ec0bedde68bece68c4743382 Mon Sep 17 00:00:00 2001 From: Odweta Date: Mon, 16 Dec 2024 10:57:02 +0100 Subject: [PATCH] improved some stuff --- mobile/app/src/main/java/com/odweta/solon/Global.kt | 3 ++- mobile/app/src/main/java/com/odweta/solon/Marks.kt | 10 ++++------ mobile/app/src/main/java/com/odweta/solon/Settings.kt | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mobile/app/src/main/java/com/odweta/solon/Global.kt b/mobile/app/src/main/java/com/odweta/solon/Global.kt index db240bc..bf802c1 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Global.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Global.kt @@ -88,7 +88,8 @@ enum class SettingsId { Svoboda, Amoled, RefreshButton, - TagNewMarks + TagNewMarks, + DeleteLocalData } class SettingsData { diff --git a/mobile/app/src/main/java/com/odweta/solon/Marks.kt b/mobile/app/src/main/java/com/odweta/solon/Marks.kt index 422a7de..d334499 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Marks.kt @@ -368,7 +368,7 @@ fun MarksSubject() { }, shape = RoundedCornerShape(roundedCornerDimen) ) - .padding(vertical = 20.dp) + .padding(vertical = 20.dp, horizontal = 10.dp) ) // subject Spacer(modifier = Modifier.height(20.dp)) @@ -428,11 +428,9 @@ fun MarksSubject() { } // only add if mark date is not older than one week - if ( - ( - LocalDate - .parse(mark.date, DateTimeFormatter.ISO_LOCAL_DATE_TIME) - .isAfter(LocalDate.now().minusWeeks(1)) + if ((LocalDate + .parse(mark.date, DateTimeFormatter.ISO_LOCAL_DATE_TIME) + .isAfter(LocalDate.now().minusWeeks(1)) ) && settings.tagNewMarks.checked.value ) { Icon( diff --git a/mobile/app/src/main/java/com/odweta/solon/Settings.kt b/mobile/app/src/main/java/com/odweta/solon/Settings.kt index 3b68a32..a5f8173 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Settings.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Settings.kt @@ -122,6 +122,7 @@ fun SettingsTableRow(setting: Setting) { SettingsId.Amoled -> settings.useAmoledMode = setting SettingsId.RefreshButton -> settings.showRefreshButton = setting SettingsId.TagNewMarks -> settings.tagNewMarks = setting + else -> {} } Util.saveStringToFile(settingsDataFilePath, settings.toString()) },