diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 3379285..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/solon.iml b/.idea/solon.iml deleted file mode 100644 index d6ebd48..0000000 --- a/.idea/solon.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index b5c241b..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1709058824678 - - - - \ No newline at end of file diff --git a/README.md b/README.md index 7ce5013..1c54cbe 100755 --- a/README.md +++ b/README.md @@ -1,18 +1,3 @@ -# Solon - -An enhanced version of the ŠkolaOnLine (ŠOL) online school system. - -View your timetable and marks in a pleasing format. No extra bloat. - -Everything is colorful, animated and pretty, so your eyes should be pleased. - -It aims to provide more readable data than the web version and remove some of the annoyances of the mobile app. - -Named after the Greek philosopher. - -Insiration was taken from [@JakubAndrysek](https://github.com/JakubAndrysek)'s [skola-online-stahovani-znamek](https://github.com/JakubAndrysek/skola-online-stahovani-znamek) project. - - -
- -# APK availible [here](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false) +![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) diff --git a/mobile/.idea/.gitignore b/mobile/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/mobile/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/mobile/.idea/.name b/mobile/.idea/.name deleted file mode 100644 index 99e1610..0000000 --- a/mobile/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Solon \ No newline at end of file diff --git a/mobile/.idea/codeStyles/Project.xml b/mobile/.idea/codeStyles/Project.xml deleted file mode 100644 index 7643783..0000000 --- a/mobile/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/mobile/.idea/codeStyles/codeStyleConfig.xml b/mobile/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/mobile/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/mobile/.idea/compiler.xml b/mobile/.idea/compiler.xml deleted file mode 100644 index b589d56..0000000 --- a/mobile/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mobile/.idea/deploymentTargetDropDown.xml b/mobile/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 0c0c338..0000000 --- a/mobile/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/mobile/.idea/gradle.xml b/mobile/.idea/gradle.xml deleted file mode 100644 index 0897082..0000000 --- a/mobile/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/mobile/.idea/kotlinc.xml b/mobile/.idea/kotlinc.xml deleted file mode 100644 index 8d81632..0000000 --- a/mobile/.idea/kotlinc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/mobile/.idea/migrations.xml b/mobile/.idea/migrations.xml deleted file mode 100644 index f8051a6..0000000 --- a/mobile/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mobile/.idea/misc.xml b/mobile/.idea/misc.xml deleted file mode 100644 index 8978d23..0000000 --- a/mobile/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/mobile/.idea/vcs.xml b/mobile/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/mobile/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index 989b83a..6e6f243 100644 --- a/mobile/app/build.gradle.kts +++ b/mobile/app/build.gradle.kts @@ -12,7 +12,7 @@ android { minSdk = 28 targetSdk = 34 versionCode = 1 - versionName = "1.0.3" + versionName = "1.0.4" } buildTypes { diff --git a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt index 21639a2..98e6fa0 100644 --- a/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt +++ b/mobile/app/src/main/java/com/odweta/solon/MainFragment.kt @@ -152,29 +152,38 @@ class MainFragment : Fragment() { private fun fetchNewData() { lifecycleScope.launch { done = false - while (!done || !Util.internetAvail(requireContext())) { - toolbar.text = String.format("%s", "Načítání nových dat") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat.") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat..") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat...") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat..") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat.") - delay(300) - toolbar.text = String.format("%s", "Načítání nových dat") - delay(300) + + // variables for the loading animation + val loadingArray: Array = arrayOf( + "Načítání nových dat", + "Načítání nových dat.", + "Načítání nových dat..", + "Načítání nových dat..." + ) + val delayTime: Long = 300 // delay in ms + + // show a loading animation + while (!done && Util.internetAvail(requireContext())) { + for (text in loadingArray) { + toolbar.text = text + delay(delayTime) + } + for (text in loadingArray.reversedArray()) { + if (loadingArray.indexOf(text) != 0) { + toolbar.text = text + delay(delayTime) + } + } } + // determine the role of the student role = if (Parsing.userIsParent()) { " – Rodič" } else { " – Student" } + // display the full name of the user in the toolbar toolbar.text = String.format( "%s", diff --git a/mobile/app/src/main/res/Infinity-1s-200px(2).gif b/mobile/app/src/main/res/Infinity-1s-200px(2).gif deleted file mode 100644 index 3cce103..0000000 Binary files a/mobile/app/src/main/res/Infinity-1s-200px(2).gif and /dev/null differ diff --git a/mobile/app/src/main/res/left_arrow.png b/mobile/app/src/main/res/left_arrow.png deleted file mode 100644 index ede46af..0000000 Binary files a/mobile/app/src/main/res/left_arrow.png and /dev/null differ diff --git a/mobile/app/src/main/res/solen.png b/mobile/app/src/main/res/solen.png deleted file mode 100755 index ec2b804..0000000 Binary files a/mobile/app/src/main/res/solen.png and /dev/null differ diff --git a/mobile/app/src/main/res/solen3.png b/mobile/app/src/main/res/solen3.png deleted file mode 100644 index 3f4cc7e..0000000 Binary files a/mobile/app/src/main/res/solen3.png and /dev/null differ diff --git a/mobile/app/src/main/res/solen4.png b/mobile/app/src/main/res/solen4.png deleted file mode 100644 index 360275b..0000000 Binary files a/mobile/app/src/main/res/solen4.png and /dev/null differ diff --git a/mobile/app/src/main/res/squiggly_line_100.png b/mobile/app/src/main/res/squiggly_line_100.png deleted file mode 100644 index 60d84e5..0000000 Binary files a/mobile/app/src/main/res/squiggly_line_100.png and /dev/null differ diff --git a/mobile/app/src/main/res/squiggly_line_100_yellow_transparent.png b/mobile/app/src/main/res/squiggly_line_100_yellow_transparent.png deleted file mode 100644 index 63150aa..0000000 Binary files a/mobile/app/src/main/res/squiggly_line_100_yellow_transparent.png and /dev/null differ diff --git a/mobile/app/src/main/res/squiggly_line_20x20.png b/mobile/app/src/main/res/squiggly_line_20x20.png deleted file mode 100644 index 9d9c14a..0000000 Binary files a/mobile/app/src/main/res/squiggly_line_20x20.png and /dev/null differ diff --git a/mobile/app/src/main/res/values/strings.xml b/mobile/app/src/main/res/values/strings.xml index 0b9ea6f..b146760 100644 --- a/mobile/app/src/main/res/values/strings.xml +++ b/mobile/app/src/main/res/values/strings.xml @@ -12,7 +12,7 @@ O aplikaci Opravdu se chcete odhlásit? Tato akce zavře aplikaci. Přehlednost je podstata. - Vylepšená verze mobilní aplikace ŠkolaOnLine + Odlehčená verze mobilní aplikace Škola OnLine \@Odweta Vývoj: Zdrojový kód diff --git a/solon_logo.png b/solon_logo.png new file mode 100644 index 0000000..b7974e9 Binary files /dev/null and b/solon_logo.png differ