diff --git a/README.md b/README.md
index 228b070..1a26c75 100755
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Zorientujte se rychleji v této odlehčené verzi Školy OnLine
-# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/releases/2.4/downloads/app-release.apk) (verze 2.4)
+# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/releases/2.5/downloads/app-release.apk) (verze 2.5)
[
](https://f-droid.org/packages/com.odweta.solon/)
\ No newline at end of file
+ height="80">](https://f-droid.org/packages/com.odweta.solon/)
diff --git a/mobile/.idea/caches/deviceStreaming.xml b/mobile/.idea/caches/deviceStreaming.xml
new file mode 100644
index 0000000..406736c
--- /dev/null
+++ b/mobile/.idea/caches/deviceStreaming.xml
@@ -0,0 +1,340 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts
index b92750a..30e075d 100644
--- a/mobile/app/build.gradle.kts
+++ b/mobile/app/build.gradle.kts
@@ -32,8 +32,8 @@ android {
applicationId = "com.odweta.solon"
minSdk = 28
targetSdk = 34
- versionCode = 211
- versionName = "2.4"
+ versionCode = 212
+ versionName = "2.4.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/mobile/app/src/main/java/com/odweta/solon/Launch.kt b/mobile/app/src/main/java/com/odweta/solon/Launch.kt
index fa3bda9..ad1eac5 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Launch.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Launch.kt
@@ -90,9 +90,6 @@ fun launchContinue(
global.newMarks = Parsing.parseNewMarks(marks)
global.finalMarks = Parsing.parseFinalMarks(finalMarks)
-// // load the settings
-// global.settings = Util.fileToString(global.filePaths.settings).toSettingsData()
-
// load the lecture notes
Util.loadLectureNotes()
Util.csvToLectureNotes()
@@ -101,6 +98,7 @@ fun launchContinue(
if (!global.internetAwaitListenerRunning)
setOnInternetAvailListener(ctx)
+ // FIXME maybe? causes IndexOutOfBoundsException????? prob not tho
if (!global.launched) {
// show the default (main) screen
global.currentScreen = Screen.Main
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 621ded4..b0c4f7c 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Marks.kt
@@ -1,5 +1,6 @@
package com.odweta.solon
+import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -25,6 +26,7 @@ import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
@@ -244,6 +246,9 @@ fun FinalMarksScreen() {
) {
Text(Util.fileToString(global.filePaths.finalMarks), color = Color.White)
for ((subject, mark) in global.finalMarks) {
+ // LaunchedEffect(Unit) {
+ // Log.d("debug", networkRequestFactory.perform(NetworkRequestType.Apologies).body.string?.toString())
+ //}
Row {
Text(subject, color = Color.White)
Text(mark.toString(), color = Color.White, modifier = Modifier.padding(10.dp))
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 e170f93..e6258e0 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Timetable.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Timetable.kt
@@ -233,7 +233,23 @@ fun DayPager() {
state = pagerState,
modifier = Modifier.fillMaxSize()
) { pageIndex ->
- DayScreen(global.timetable[pageIndex])
+ if (global.timetable.isNotEmpty()) {
+ DayScreen(global.timetable[pageIndex])
+ } else {
+ NoDayScreen()
+ }
+ }
+}
+
+@Composable
+fun NoDayScreen() {
+ Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+ Text(
+ "Zatím žádný rozvrh.",
+ color = Color.White,
+ fontSize = 30.sp,
+ fontStyle = FontStyle.Italic
+ )
}
}
@@ -537,7 +553,7 @@ private fun DayScreen(day: Day) {
.clickable {
global.selectedLecture = lectureId
showDetailDialog = true
- })
+ })
if (
(global.lectureNotes[global.selectedLecture] != null &&