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 59718e7..db240bc 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Global.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Global.kt @@ -87,7 +87,8 @@ class Setting(auxId: SettingsId, auxName: String, auxChecked: Boolean) { enum class SettingsId { Svoboda, Amoled, - RefreshButton + RefreshButton, + TagNewMarks } class SettingsData { @@ -109,7 +110,13 @@ class SettingsData { true ) - override fun toString() = "$useSvobodaMode\n$useAmoledMode\n$showRefreshButton" + var tagNewMarks: Setting = Setting( + SettingsId.TagNewMarks, + "Označit nové známky", + true + ) + + override fun toString() = "$useSvobodaMode\n$useAmoledMode\n$showRefreshButton\n$tagNewMarks" } var settings : SettingsData = 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 7882e5a..422a7de 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Marks.kt @@ -237,7 +237,7 @@ fun MarksAll() { modifier = Modifier.fillMaxSize().weight(1f), contentAlignment = Alignment.TopStart ) { - if (subjectContainsNewMark) { + if (subjectContainsNewMark && settings.tagNewMarks.checked.value) { Icon( modifier = Modifier.padding(start = 4.dp, top = 4.dp), imageVector = Icons.Default.AutoAwesome, @@ -428,7 +428,13 @@ 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( modifier = Modifier.padding(start = 7.dp, top = 4.dp), imageVector = Icons.Default.AutoAwesome, 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 8794846..3b68a32 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Settings.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Settings.kt @@ -88,6 +88,10 @@ fun SettingsScreen(modifier: Modifier = Modifier) { Spacer(Modifier.height(10.dp)) SettingsTableRow(settings.showRefreshButton) + + Spacer(Modifier.height(10.dp)) + + SettingsTableRow(settings.tagNewMarks) } } @@ -117,6 +121,7 @@ fun SettingsTableRow(setting: Setting) { SettingsId.Svoboda -> settings.useSvobodaMode = setting SettingsId.Amoled -> settings.useAmoledMode = setting SettingsId.RefreshButton -> settings.showRefreshButton = setting + SettingsId.TagNewMarks -> settings.tagNewMarks = setting } Util.saveStringToFile(settingsDataFilePath, settings.toString()) },