diff --git a/README.md b/README.md index 1a26c75..914dca0 100755 --- a/README.md +++ b/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) [Nyní na F-Droidu](https://f-droid.org/packages/com.odweta.solon/) diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index 7e1f118..939cf6e 100644 --- a/mobile/app/build.gradle.kts +++ b/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" } 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 6d3ba00..f150691 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Launch.kt +++ b/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 } } -} \ No newline at end of file +} 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 45c6cb3..de08095 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt +++ b/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 } -} \ No newline at end of file +} diff --git a/mobile/app/src/main/java/com/odweta/solon/Navbar.kt b/mobile/app/src/main/java/com/odweta/solon/Navbar.kt index 62704d9..72b166c 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Navbar.kt +++ b/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() { ) } } -} \ No newline at end of file +}