made new release 2.5.1

README.md

@@ -1,6 +1,6 @@
 ![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/-/releases/2.5/downloads/app-release.apk) (verze 2.5)
+# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/releases/2.5.1/downloads/app-release.apk) (verze 2.5.1)
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
      alt="Nyní na F-Droidu"
      height="80">](https://f-droid.org/packages/com.odweta.solon/)

mobile/app/build.gradle.kts

@@ -12,7 +12,7 @@ tasks.register("printVersionName") {
 
 tasks.register("deploy") {
     dependsOn("assembleDebug")
-    //dependsOn("installDebug")
+    dependsOn("installDebug")
     doLast {
         exec {
             commandLine("adb", "shell", "am", "start", "-n", "com.odweta.solon/.MainActivity")
@@ -32,8 +32,8 @@ android {
         applicationId = "com.odweta.solon"
         minSdk = 28
         targetSdk = 34
-        versionCode = 213
-        versionName = "2.5"
+        versionCode = 214
+        versionName = "2.5.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

mobile/app/src/main/java/com/odweta/solon/Launch.kt

@@ -103,8 +103,11 @@ fun launchContinue(
 
     // FIXME maybe? causes IndexOutOfBoundsException????? prob not tho
     if (!global.launched) {
-        // show the default (main) screen
-        global.currentScreen = Screen.Main
+        if (!global.refreshed) {
+            // show the default (main) screen
+            global.currentScreen = Screen.Main
+            showTempScreen(Screen.Main)
+        }
 
         // inside show the timetable
         global.currentScreenElement = ScreenElement.Timetable
@@ -142,4 +145,4 @@ private fun setOnInternetAvailListener(ctx: Context) {
             delay(1000) // Check for internet availability every second
         }
     }
-}
+}

mobile/app/src/main/java/com/odweta/solon/Marks.kt

@@ -306,6 +306,7 @@ fun MarksAll() {
             .verticalScroll(scrollState)
     ) {
         for ((subject, markList) in global.marks) {
+            if (markList.filter { it.grade in "0123456789" }.size == 0) continue
             val amoledModifier = if (settings.useAmoledMode.checked.value == true) {
                 Modifier
                     .width(150.dp)
@@ -374,13 +375,7 @@ fun MarksAll() {
                     .background(Color.Black)
             }
 
-            var marksString = ""
-            for (m in 0 until markList.size-1) {
-                if (markList[m].grade in "0123456789") {
-                    marksString += markList[m].grade + ", "
-                }
-            }
-            marksString += markList[markList.size-1].grade
+            var marksString = markList.filter { it.grade in "0123456789" }.joinToString(separator = ",") { it.grade } 
 
             if (global.marks.keys.indexOf(subject) > 0) {
                 Box(modifier = Modifier.height(10.dp))
@@ -812,4 +807,4 @@ fun MarksDetail() {
             }
         } // date
     }
-}
+}

mobile/app/src/main/java/com/odweta/solon/Navbar.kt

@@ -43,6 +43,7 @@ fun NavbarScreen() {
             Button(
                 onClick = {
                     if (Util.internetAvail(ctx)) {
+                        global.refreshed = false;
                         remoteLoad(ctx)
                         statusFactory.show(StatusType.Loading)
                         refreshButtonContentColor.value = PastelYellow
@@ -125,4 +126,4 @@ fun NavbarScreen() {
             )
         }
     }
-}
+}