diff --git a/README.md b/README.md index 914dca0..488c034 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,13 @@  # 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.1/downloads/app-release.apk) (verze 2.5.1) +# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/releases/2.5.2/downloads/app-release.apk) (verze 2.5.2) + +
](https://f-droid.org/packages/com.odweta.solon/)
+ alt="Nyní na F-Droidu"
+ height="80">](https://f-droid.org/packages/com.odweta.solon/)
+
+[
](https://play.google.com/store/apps/details?id=com.odweta.solon)
diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts
index 939cf6e..bc5c8d0 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 = 214
- versionName = "2.5.1"
+ versionCode = 215
+ versionName = "2.5.2"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
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 54148d4..c69b651 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Global.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Global.kt
@@ -193,7 +193,8 @@ enum class ScreenElement {
FinalMarks,
Menu,
About,
- SignOut
+ SignOut,
+ Temp
}
class Global {
@@ -225,6 +226,7 @@ class Global {
var currentLectureNumber: Int = 0
var tempScreen by mutableStateOf(Screen.Settings)
+ var tempScreenElement by mutableStateOf(ScreenElement.Timetable)
var currentScreen by mutableStateOf(Screen.Main)
var currentScreenElement by mutableStateOf(ScreenElement.Timetable)
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 f150691..99cb244 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Launch.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Launch.kt
@@ -103,11 +103,8 @@ fun launchContinue(
// FIXME maybe? causes IndexOutOfBoundsException????? prob not tho
if (!global.launched) {
- if (!global.refreshed) {
- // show the default (main) screen
- global.currentScreen = Screen.Main
- showTempScreen(Screen.Main)
- }
+ // show the default (main) screen
+ global.currentScreen = Screen.Main
// inside show the timetable
global.currentScreenElement = ScreenElement.Timetable
@@ -117,6 +114,8 @@ fun launchContinue(
global.refreshed = true
refreshButtonContentColor.value = Color.White
+ showTempScreen(Screen.Main)
+
// show the full name of the user in the toolbar as a status
if (Util.internetAvail(ctx)) {
statusFactory.show(StatusType.NameRole)
diff --git a/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt b/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt
index edc45bf..59ea21e 100644
--- a/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt
@@ -80,6 +80,7 @@ fun MainScreen() {
ScreenElement.Menu -> MenuScreen()
ScreenElement.About -> AboutScreen()
ScreenElement.SignOut -> SignOutScreen()
+ ScreenElement.Temp -> {}
}
}
}
@@ -91,4 +92,4 @@ fun MainScreen() {
NavbarScreen()
}
}
-}
\ 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 de08095..6f0008f 100644
--- a/mobile/app/src/main/java/com/odweta/solon/Marks.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/Marks.kt
@@ -123,6 +123,7 @@ fun NewMarksScreen() {
modifier = Modifier.verticalScroll(ss)
) {
for ((k, v) in global.newMarks) {
+ if (v.filter { it.grade in "0123456789" }.size == 0) continue
if (v.isNotEmpty()) {
Column(
modifier = Modifier
diff --git a/mobile/app/src/main/java/com/odweta/solon/TempScreen.kt b/mobile/app/src/main/java/com/odweta/solon/TempScreen.kt
index 7c8dfed..7181dbc 100644
--- a/mobile/app/src/main/java/com/odweta/solon/TempScreen.kt
+++ b/mobile/app/src/main/java/com/odweta/solon/TempScreen.kt
@@ -19,4 +19,23 @@ fun showTempScreen(screen: Screen) {
global.returnToTempScreen = true
global.tempScreen = screen
global.currentScreen = Screen.Temp
-}
\ No newline at end of file
+}
+
+@Composable
+fun TempScreenElement() {
+ when (global.tempScreenElement) {
+ ScreenElement.Timetable -> {}
+ ScreenElement.Marks -> {}
+ ScreenElement.NewMarks -> {}
+ ScreenElement.FinalMarks -> {}
+ ScreenElement.Menu -> {}
+ ScreenElement.About -> {}
+ ScreenElement.SignOut -> {}
+ ScreenElement.Temp -> {}
+ }
+}
+
+fun showTempScreenElement(element: ScreenElement) {
+ global.tempScreenElement = element
+ global.currentScreenElement = ScreenElement.Temp
+}