diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 0000000..b268ef3 --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/material_theme_project_new.xml b/.idea/material_theme_project_new.xml new file mode 100644 index 0000000..e0538a6 --- /dev/null +++ b/.idea/material_theme_project_new.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..16660f1 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 43452ec..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,7 +2,5 @@ - - \ No newline at end of file diff --git a/README.md b/README.md index a6f5311..50d1f3d 100755 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ ![solon-logo](./solon_logo.png) # Zorientujte se rychleji v této odlehčené verzi Školy OnLine -# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false) (verze 2.0) +# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false) (verze 2.0.1) diff --git a/mobile/.idea/caches/deviceStreaming.xml b/mobile/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..5a2f866 --- /dev/null +++ b/mobile/.idea/caches/deviceStreaming.xml @@ -0,0 +1,329 @@ + + + + + + \ No newline at end of file diff --git a/mobile/.idea/vcs.xml b/mobile/.idea/vcs.xml index 8a1c0ed..288b36b 100644 --- a/mobile/.idea/vcs.xml +++ b/mobile/.idea/vcs.xml @@ -1,7 +1,7 @@ + - \ No newline at end of file diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index bfb5f44..5b98ff3 100644 --- a/mobile/app/build.gradle.kts +++ b/mobile/app/build.gradle.kts @@ -13,7 +13,7 @@ android { minSdk = 28 targetSdk = 34 versionCode = 1 - versionName = "2.0" + versionName = "2.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt index d067d20..f47a6d4 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt @@ -85,6 +85,18 @@ fun isTimeBetween(givenTime: LocalTime, startTime: LocalTime, endTime: LocalTime @SuppressLint("ModifierFactoryExtensionFunction") @Composable fun subjectModifier(d: Day, s: Subject, lectureNumber: Int): Modifier { + var day = d.date.split(".")[0].replace(" ", "") + var month = d.date.split(".")[1].replace(" ", "") + if (day.length < 2) { + day = "0$day" + } + + if (month.length < 2) { + month = "0$month" + } + + d.date = "$day. $month." + val dayFormatter = DateTimeFormatter.ofPattern("dd. MM. yyyy") val hourFormatter = DateTimeFormatter.ofPattern("HH:mm:ss") val dateParsed = LocalDate.parse(d.date + " " + LocalDate.now().year, dayFormatter) diff --git a/release/solon.apk b/release/solon.apk index 28e9b70..7be5dcc 100644 Binary files a/release/solon.apk and b/release/solon.apk differ