odweta/solon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update README and About App and fix 'fetch new data animation in the toolbar'

Browse Source
This commit is contained in:
Odweta
2024-02-29 19:52:26 +01:00
parent 836418ebf0
commit 8d06e4dec9
29 changed files with 29 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
.idea/modules.xml
Generated
-8
View File
@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/solon.iml" filepath="$PROJECT_DIR$/.idea/solon.iml" />
</modules>
</component>
</project>
.idea/solon.iml
Generated
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
.idea/vcs.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
.idea/workspace.xml
Generated
-54
View File
@@ -1,54 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="e24eff9b-1b5c-4df1-b20f-0daae7929800" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/mobile/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/mobile/.idea/deploymentTargetDropDown.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/CalWeekFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/MarksFragment.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/Util.kt" beforeDir="false" afterPath="$PROJECT_DIR$/mobile/app/src/main/java/com/odweta/solon/Util.kt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="ProjectId" id="2cxgpH3ugs5qma8IaiCuxigOdGT" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
"cf.first.check.clang-format": "false",
"cidr.known.project.marker": "true",
"git-widget-placeholder": "master",
"last_opened_file_path": "/home/thinker/solon/mobile"
}
}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="e24eff9b-1b5c-4df1-b20f-0daae7929800" name="Changes" comment="" />
<created>1709058824678</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1709058824678</updated>
</task>
<servers />
</component>
</project>
README.md
+3 -18
View File
@@ -1,18 +1,3 @@
# Solon ![solon-logo](./solon_logo.png)
# Zorientujte se rychleji v této odlehčené verzi Školy OnLine
An enhanced version of the ŠkolaOnLine (ŠOL) online school system. # Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false)
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.
<hr>
# APK availible [here](https://gitlab.com/Odweta/solon/-/raw/master/release/solon.apk?ref_type=heads&inline=false)
mobile/.idea/.gitignore
Generated
-3
View File
@@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml
mobile/.idea/.name
Generated
-1
View File
@@ -1 +0,0 @@
Solon
mobile/.idea/codeStyles/Project.xml
Generated
-123
View File
@@ -1,123 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML">
<option name="FORCE_REARRANGE_MODE" value="1" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
<arrangement>
<rules>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme>
</component>
mobile/.idea/codeStyles/codeStyleConfig.xml
Generated
-5
View File
@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>
mobile/.idea/compiler.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="17" />
</component>
</project>
mobile/.idea/deploymentTargetDropDown.xml
Generated
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="app">
<State />
</entry>
</value>
</component>
</project>
mobile/.idea/gradle.xml
Generated
-19
View File
@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
</project>
mobile/.idea/kotlinc.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="KotlinJpsPluginSettings">
<option name="version" value="1.9.22" />
</component>
</project>
mobile/.idea/migrations.xml
Generated
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>
mobile/.idea/misc.xml
Generated
-9
View File
@@ -1,9 +0,0 @@
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
mobile/.idea/vcs.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
mobile/app/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ android {
minSdk = 28 minSdk = 28
targetSdk = 34 targetSdk = 34
versionCode = 1 versionCode = 1
versionName = "1.0.3" versionName = "1.0.4"
} }
buildTypes { buildTypes {
mobile/app/src/main/java/com/odweta/solon/MainFragment.kt
+24 -15
View File
@@ -152,29 +152,38 @@ class MainFragment : Fragment() {
private fun fetchNewData() { private fun fetchNewData() {
lifecycleScope.launch { lifecycleScope.launch {
done = false done = false
while (!done || !Util.internetAvail(requireContext())) {
toolbar.text = String.format("%s", "Načítání nových dat") // variables for the loading animation
delay(300) val loadingArray: Array<String> = arrayOf(
toolbar.text = String.format("%s", "Načítání nových dat.") "Načítání nových dat",
delay(300) "Načítání nových dat.",
toolbar.text = String.format("%s", "Načítání nových dat..") "Načítání nových dat..",
delay(300) "Načítání nových dat..."
toolbar.text = String.format("%s", "Načítání nových dat...") )
delay(300) val delayTime: Long = 300 // delay in ms
toolbar.text = String.format("%s", "Načítání nových dat..")
delay(300) // show a loading animation
toolbar.text = String.format("%s", "Načítání nových dat.") while (!done && Util.internetAvail(requireContext())) {
delay(300) for (text in loadingArray) {
toolbar.text = String.format("%s", "Načítání nových dat") toolbar.text = text
delay(300) 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()) { role = if (Parsing.userIsParent()) {
" – Rodič" " – Rodič"
} else { } else {
" – Student" " – Student"
} }
// display the full name of the user in the toolbar
toolbar.text = toolbar.text =
String.format( String.format(
"%s", "%s",
mobile/app/src/main/res/Infinity-1s-200px(2).gif
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 122 KiB

mobile/app/src/main/res/left_arrow.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 719 B

mobile/app/src/main/res/solen.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

mobile/app/src/main/res/solen3.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

mobile/app/src/main/res/solen4.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.9 KiB

mobile/app/src/main/res/squiggly_line_100.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

mobile/app/src/main/res/squiggly_line_100_yellow_transparent.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

mobile/app/src/main/res/squiggly_line_20x20.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 292 B

mobile/app/src/main/res/values/strings.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<string name="about_app">O aplikaci</string> <string name="about_app">O aplikaci</string>
<string name="sign_out_warning">Opravdu se chcete odhlásit? Tato akce zavře aplikaci.</string> <string name="sign_out_warning">Opravdu se chcete odhlásit? Tato akce zavře aplikaci.</string>
<string name="slogan">Přehlednost je podstata.</string> <string name="slogan">Přehlednost je podstata.</string>
<string name="desc_about">Vylepšená verze mobilní aplikace ŠkolaOnLine</string> <string name="desc_about">Odlehčená verze mobilní aplikace Škola OnLine</string>
<string name="odweta"> \@Odweta</string> <string name="odweta"> \@Odweta</string>
<string name="development_vyvoj">Vývoj: </string> <string name="development_vyvoj">Vývoj: </string>
<string name="source_code">Zdrojový kód</string> <string name="source_code">Zdrojový kód</string>
solon_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB