made new release 2.1 (204)

.idea/material_theme_project_new.xml

@@ -3,7 +3,9 @@
   <component name="MaterialThemeProjectNewConfig">
     <option name="metadata">
       <MTProjectMetadataState>
-        <option name="userId" value="35ed75a3:192c279f3e0:-7ffa" />
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-239e49af:192a4be9597:-7ffe" />
       </MTProjectMetadataState>
     </option>
   </component>

README.md

@@ -1,3 +1,3 @@
 ![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/com.odweta.solon_2.0.3.apk?ref_type=heads&inline=false) (verze 2.0.3)
+# Odkaz na stažení aplikace pro Android [zde](https://gitlab.com/Odweta/solon/-/raw/master/release/com.odweta.solon_2.1.apk?ref_type=heads&inline=false) (verze 2.1)

mobile/.idea/assetWizardSettings.xml

@@ -62,6 +62,18 @@
                                 <PersistentState>
                                   <option name="children">
                                     <map>
+                                      <entry key="backgroundImage">
+                                        <value>
+                                          <PersistentState>
+                                            <option name="values">
+                                              <map>
+                                                <entry key="imagePath" value="$PROJECT_DIR$/app/src/main/res/drawable/black.png" />
+                                                <entry key="scalingPercent" value="172" />
+                                              </map>
+                                            </option>
+                                          </PersistentState>
+                                        </value>
+                                      </entry>
                                       <entry key="foregroundClipArt">
                                         <value>
                                           <PersistentState>

mobile/.idea/caches/deviceStreaming.xml

@@ -262,7 +262,7 @@
           <option name="codename" value="q6q" />
           <option name="id" value="q6q" />
           <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-F956B" />
+          <option name="name" value="Galaxy Z Fold6" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1856" />
           <option name="screenY" value="2160" />

mobile/.idea/deploymentTargetSelector.xml

@@ -4,19 +4,19 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-10-20T07:27:51.115175643Z">
+        <DropdownSelection timestamp="2024-11-29T17:18:42.354545820Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/thinker/.android/avd/Motorola_Moto_e22_API_31.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/thinker/.config/.android/avd/Medium_Phone_API_35.avd" />
             </handle>
           </Target>
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="DefaultPreview">
+      <SelectionState runConfigName="TimetablePreview">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
-      <SelectionState runConfigName="Preview">
+      <SelectionState runConfigName="RBPreview">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>

mobile/.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

mobile/app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.odweta.solon"
         minSdk = 28
         targetSdk = 34
-        versionCode = 203
-        versionName = "2.0.3"
+        versionCode = 204
+        versionName = "2.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -22,7 +22,7 @@ android {
         this.outputs
             .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
             .forEach { output ->
-                var apkName = "com.odweta.solon_" + this.versionName + ".apk"
+                val apkName = "com.odweta.solon_" + this.versionName + ".apk"
                 output.outputFileName = apkName
             }
     }

mobile/app/src/main/AndroidManifest.xml

@@ -18,10 +18,12 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
+            android:screenOrientation="portrait"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Solon"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            tools:ignore="DiscouragedApi">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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

@@ -2,6 +2,7 @@ package com.odweta.solon
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -9,6 +10,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -25,6 +27,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import com.odweta.solon.ui.theme.PastelYellow
 import androidx.compose.ui.res.painterResource
@@ -33,7 +36,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import java.time.format.TextStyle
 
 @Composable
 fun AboutScreen(modifier: Modifier = Modifier) {
@@ -51,6 +53,7 @@ fun AboutScreen(modifier: Modifier = Modifier) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
+                .padding(start = 5.dp)
         ) {
             Button(
                 onClick = {
@@ -106,30 +109,71 @@ fun AboutScreen(modifier: Modifier = Modifier) {
                     .padding(10.dp)
             )
 
-            Row(
-                modifier = Modifier
-                    .padding(10.dp)
-            ) {
-                val uriHandler = LocalUriHandler.current
+            HorizontalLine()
 
-                Text(
-                    text = "Vývoj: ",
-                    textAlign = TextAlign.Start,
-                    color = Color.White,
-                    fontSize = 30.sp
+            AboutTableRow(
+                "Vývoj",
+                "@Odweta",
+                "https://www.gitlab.com/Odweta/solon"
             )
 
+            AboutTableRow(
+                "Verze aplikace",
+                Util.getAppVersion(LocalContext.current)?.versionName ?: "N/A"
+            )
+        }
+    }
+}
+
+@Composable
+fun HorizontalLine(modifier: Modifier = Modifier) {
+    Spacer(modifier = Modifier.height(20.dp))
+
+    Spacer(modifier = Modifier
+        .height(2.dp)
+        .background(color = PastelYellow)
+        .fillMaxWidth(fraction = 0.8f)
+    )
+
+    Spacer(modifier = Modifier.height(20.dp))
+}
+
+@Composable
+fun AboutTableRow(key: String, value: String, href: String = "") {
+    Row(
+        modifier = Modifier
+            .padding(10.dp)
+            .background(color = Color.Black, shape = RoundedCornerShape(roundedCornerDimen))
+            .fillMaxWidth()
+    ) {
         Text(
-                    text = "@Odweta",
+            text = key,
+            textAlign = TextAlign.Start,
+            color = Color.White,
+            fontSize = 20.sp
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        if (href != "") {
+            val uriHandler = LocalUriHandler.current
+            Text(
+                text = value,
                 color = PastelYellow,
-                    fontSize = 30.sp,
+                fontSize = 20.sp,
                 textAlign = TextAlign.End,
                 textDecoration = TextDecoration.Underline,
                 modifier = Modifier.clickable {
-                        uriHandler.openUri("https://www.gitlab.com/Odweta/solon")
+                    uriHandler.openUri(href)
                 }
+            )
+        } else {
+            Text(
+                text = value,
+                color = Color.White,
+                fontSize = 20.sp,
+                textAlign = TextAlign.End
             )
         }
     }
-    }
 }

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

@@ -1,22 +1,18 @@
 package com.odweta.solon
 
 import android.view.Window
-import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
-import androidx.core.view.WindowCompat
 import com.odweta.solon.ui.theme.PastelYellow
-import com.odweta.solon.ui.theme.PastelYellowTransparent
 import okhttp3.OkHttpClient
 import java.io.File
 
@@ -44,6 +40,7 @@ const val accountDataFilePath: String = "account_data.txt"
 const val timeTableFilePath: String = "timetable.json"
 const val userDataFilePath: String = "userdata.json"
 const val marksFilePath: String = "marks.json"
+const val settingsDataFilePath: String = "settings.txt"
 lateinit var fileDir: File
 var width: Int = 0
 var height: Int = 0
@@ -59,7 +56,8 @@ enum class IsShowing {
     Timetable,
     Marks,
     Menu,
-    About
+    About,
+    Settings
 }
 
 enum class Screen {
@@ -76,6 +74,44 @@ var isShowing: MutableState<IsShowing> = mutableStateOf(IsShowing.Timetable)
 
 var toolbarText: MutableState<String> = mutableStateOf("")
 
+// default settings (will get overwritten by the saved settings)
+class Setting(auxId: SettingsId, auxName: String, auxChecked: Boolean) {
+    var id: SettingsId = auxId
+    var name: String = auxName
+    var checked: MutableState<Boolean> = mutableStateOf(auxChecked)
+    override fun toString() = "$id#$name#${checked.value}"
+}
+
+enum class SettingsId {
+    Svoboda,
+    Amoled,
+    RefreshButton
+}
+
+class SettingsData {
+    var useSvobodaMode: Setting = Setting(
+        SettingsId.Svoboda,
+        "Používat Svoboda mód",
+        false
+    )
+
+    var useAmoledMode: Setting = Setting(
+        SettingsId.Amoled,
+        "Používat AMOLED mód",
+        false
+    )
+
+    var showRefreshButton: Setting = Setting(
+        SettingsId.RefreshButton,
+        "Zobrazovat tlačítko obnovení dat",
+        true
+    )
+
+    override fun toString() = "$useSvobodaMode\n$useAmoledMode\n$showRefreshButton"
+}
+
+var settings : SettingsData = SettingsData()
+
 var done: Boolean = false
 
 var timeTableAvailOffline: Boolean = false

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

@@ -1,15 +1,12 @@
 package com.odweta.solon
 
-import android.app.Activity
 import android.content.Context
-import android.content.Intent
 import android.widget.Toast
+import androidx.compose.ui.graphics.Color
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.delay
 import org.json.JSONObject
-import kotlin.math.cos
 
 private var week: List<Day> = mutableListOf()
 private var toastShowing: Boolean = false
@@ -37,7 +34,7 @@ private fun setOnInternetAvailListener(ctx: Context, coscope: CoroutineScope) {
     }
 }
 
-private fun fetchNewData(ctx: Context, coscope: CoroutineScope) {
+fun fetchNewData(ctx: Context, coscope: CoroutineScope) {
     coscope.launch {
         done = false
 
@@ -46,23 +43,19 @@ private fun fetchNewData(ctx: Context, coscope: CoroutineScope) {
             "Načítání nových dat",
             "Načítání nových dat.",
             "Načítání nových dat..",
-            "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(ctx)) {
             for (text in loadingArray) {
+                if (done) break
                 toolbarText.value = text
                 delay(delayTime)
             }
-
-            for (text in loadingArray.reversedArray().slice(1..<loadingArray.size)) {
-                toolbarText.value = text
-                delay(delayTime)
-            }
-
-            delay(delayTime)
         }
 
         // determine the role of the student
@@ -145,7 +138,7 @@ private suspend fun launchPhase1(ctx: Context) {
         toast2.show()
     }
 
-    if (!timeTableAvailOffline || internetAvail) {
+    if (!timeTableAvailOffline || !marksAvailOffline || internetAvail) {
         // set up the API (required for later uses of it)
         Network.setupAPI()
 
@@ -156,23 +149,31 @@ private suspend fun launchPhase1(ctx: Context) {
             }
 
             // get the JSON data
-            val timeTableJSON = Network.getTimeTableJSON()
-
-            // try to save them into a file for later use
-            timeTableAvailOffline =
-                Util.saveStringToFile(timeTableFilePath, timeTableJSON)
-
-            // parse the data
-            week = Parsing.parseTimeTableJSON(timeTableJSON)
+            var timeTableJSON = Network.getTimeTableJSON()
+            if (timeTableJSON == """{"error": "network"}""") {
+                timeTableJSON = Util.fileToString(timeTableFilePath)
+            }
 
             // fetch and parse marks
             marksJSON = Network.getMarksJSON()
+            if (marksJSON == """{"error": "network"}""") {
+                marksJSON = Util.fileToString(marksFilePath)
+            }
 
+            timeTableAvailOffline =
+                Util.saveStringToFile(timeTableFilePath, timeTableJSON)
             marksAvailOffline =
                 Util.saveStringToFile(marksFilePath, marksJSON)
 
+            // parse the data
+            week = Parsing.parseTimeTableJSON(timeTableJSON)
             marks = Parsing.parseMarksJSON(marksJSON)
 
+            // set the settings
+            if (Util.fileExists(settingsDataFilePath) && !Util.fileIsEmpty(settingsDataFilePath)) {
+                settings = Util.stringToSettingsData(Util.fileToString(settingsDataFilePath))
+            } // else load the default settings
+
             // continue to launch phase 2
             done = true
             launchPhase2(ctx)
@@ -288,8 +289,13 @@ private fun launchPhase2(ctx: Context) {
             Util.fileToString(
                 userDataFilePath
             )
-        ).getString("fullName")}$role"
+        ).getString("fullName")
+    }$role"
 
     // set the main content view
     screenToShow.value = Screen.Main
+
+    if (settings.showRefreshButton.checked.value) {
+        refreshButtonContentColor.value = Color.White
+    }
 }

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

@@ -69,6 +69,7 @@ class MainActivity : ComponentActivity() {
                     IsShowing.Marks -> MarksScreen()
                     IsShowing.Menu -> MenuScreen()
                     IsShowing.About -> AboutScreen()
+                    IsShowing.Settings -> SettingsScreen()
                 }
             }
 

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

@@ -113,6 +113,64 @@ fun MarksAll() {
             .verticalScroll(scrollState)
     ) {
         for ((subject, markList) in marks) {
+            val amoledModifier = if (settings.useAmoledMode.checked.value) {
+                Modifier
+                    .width(150.dp)
+                    .fillMaxHeight()
+                    .border(
+                        width = borderWidthDimen,
+                        color = getAvgColor(Util.avg(markList), true), // decide on the color (transparent)
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+            } else {
+                Modifier
+                    .width(150.dp)
+                    .fillMaxHeight()
+                    .background(
+                        color = getAvgColor(Util.avg(markList)), // decide on the color (not transparent)
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+            }
+
+            val amoledModifierBackground = if (settings.useAmoledMode.checked.value) {
+                Modifier
+                    .fillMaxWidth()
+                    .height(70.dp)
+                    .border(
+                        width = borderWidthDimen,
+                        color = getAvgColor(Util.avg(markList), true), // decide on the color (transparent)
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+                    .clickable {
+                        marksShow.value = MarksShow.Subject
+                        subjectToShow = subject
+                    }
+            } else {
+                Modifier
+                    .fillMaxWidth()
+                    .height(70.dp)
+                    .background(
+                        color = getAvgColor(Util.avg(markList)), // decide on the color (transparent)
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+                    .clickable {
+                        marksShow.value = MarksShow.Subject
+                        subjectToShow = subject
+                    }
+            }
+
+            val amoledSpacerModifier = if (settings.useAmoledMode.checked.value) {
+                Modifier
+                    .width(10.dp)
+                    .fillMaxHeight()
+                    .background(getAvgColor(Util.avg(markList)))
+            } else {
+                Modifier
+                    .width(10.dp)
+                    .fillMaxHeight()
+                    .background(Color.Black)
+            }
+
             var marksString = ""
             for (m in 0 until markList.size-1) {
                 if (markList[m].grade in "0123456789") {
@@ -126,26 +184,10 @@ fun MarksAll() {
             }
 
             Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(70.dp)
-                    .background(
-                        color = getAvgColor(Util.avg(markList)), // decide on the color (transparent)
-                        shape = RoundedCornerShape(roundedCornerDimen)
-                    )
-                    .clickable {
-                        marksShow.value = MarksShow.Subject
-                        subjectToShow = subject
-                    }
+                modifier = amoledModifierBackground
             ) {
                 Row(
-                    modifier = Modifier
-                        .width(150.dp)
-                        .fillMaxHeight()
-                        .background(
-                            color = getAvgColor(Util.avg(markList)), // decide on the color (not transparent)
-                            shape = RoundedCornerShape(roundedCornerDimen)
-                        ),
+                    modifier = amoledModifier,
                     verticalAlignment = Alignment.CenterVertically,
                     horizontalArrangement = Arrangement.Center
                 ) {
@@ -160,14 +202,16 @@ fun MarksAll() {
                     )
 
                     Box(
-                        modifier = Modifier
-                            .width(10.dp)
-                            .fillMaxHeight()
-                            .background(Color.Black)
+                        modifier = amoledSpacerModifier
                     )
 
+                    val currAvg = Util.avg(markList).replace(".", ",")
+                    var textToShow = currAvg
+                    if (currAvg.length == 3 && currAvg[2] == '0') {
+                        textToShow = currAvg[0].toString()
+                    }
                     Text(
-                        text = Util.avg(markList).replace(".", ","),
+                        text = textToShow,
                         fontSize = 28.sp,
                         color = Color.White,
                         textAlign = TextAlign.Center,
@@ -251,16 +295,25 @@ fun MarksSubject() {
                         ),
                         shape = RoundedCornerShape(roundedCornerDimen)
                     )
-                    .background(
+                    .background(color = if (settings.useAmoledMode.checked.value) {
+                            Color.Black
+                        } else {
                             getAvgColor(
                                 Util.avg(marks[subjectToShow]!!)
                             )
+                        },
+                        shape = RoundedCornerShape(roundedCornerDimen)
                     )
                     .padding(vertical = 15.dp),
                 contentAlignment = Alignment.Center
             ) {
+                val currAvg = Util.avg(marks[subjectToShow]!!).replace(".", ",")
+                var textToShow = currAvg
+                if (currAvg.length == 3 && currAvg[2] == '0') {
+                    textToShow = currAvg[0].toString()
+                }
                 Text(
-                    text = Util.avg(marks[subjectToShow]!!).replace(".", ","),
+                    text = textToShow,
                     color = Color.White,
                     textAlign = TextAlign.Center,
                     fontSize = 25.sp
@@ -270,7 +323,6 @@ fun MarksSubject() {
 
         Spacer(modifier = Modifier.height(20.dp))
 
-        //Box(modifier = Modifier.height(100.dp)) {
         Text(
             text = subjectNameMap[subjectToShow]!!,
             color = Color.White,
@@ -283,10 +335,15 @@ fun MarksSubject() {
                     color = PastelYellow,
                     shape = RoundedCornerShape(roundedCornerDimen)
                 )
-                    .background(PastelYellowTransparent)
+                .background(color = if (settings.useAmoledMode.checked.value) {
+                        Color.Black
+                    } else {
+                        PastelYellowTransparent
+                    },
+                    shape = RoundedCornerShape(roundedCornerDimen)
+                )
                 .padding(vertical = 20.dp)
         ) // subject
-        //}
 
         Spacer(modifier = Modifier.height(20.dp))
 
@@ -300,8 +357,14 @@ fun MarksSubject() {
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(horizontal = 5.dp)
-                        .background(
-                            color = getAvgColor(mark.grade),
+                        .background(color = if (settings.useAmoledMode.checked.value) {
+                                Color.Black
+                            } else {
+                                getAvgColor(
+                                    Util.avg(marks[subjectToShow]!!)
+                                )
+
+                            },
                             shape = RoundedCornerShape(roundedCornerDimen)
                         )
                         .padding(vertical = 10.dp)
@@ -400,9 +463,13 @@ fun MarksDetail() {
                         shape = RoundedCornerShape(roundedCornerDimen)
                     )
                     .background(
+                        if (settings.useAmoledMode.checked.value) {
+                            Color.Black
+                        } else {
                             getAvgColor(
                                 Util.avg(marks[subjectToShow]!!)
                             )
+                        }
                     )
                     .padding(vertical = 15.dp),
                 contentAlignment = Alignment.Center
@@ -432,7 +499,12 @@ fun MarksDetail() {
                             color = PastelYellow,
                             shape = RoundedCornerShape(roundedCornerDimen)
                         )
-                        .background(PastelYellowTransparent)
+                        .background(if (settings.useAmoledMode.checked.value) {
+                                Color.Black
+                            } else {
+                                PastelYellowTransparent
+                            }
+                        )
                         .padding(vertical = 20.dp)
                 ) // description
             //}
@@ -445,7 +517,11 @@ fun MarksDetail() {
                 .fillMaxWidth()
                 .padding(horizontal = 5.dp)
                 .background(
-                    color = PastelYellowTransparent,
+                    color = if (settings.useAmoledMode.checked.value) {
+                        Color.Black
+                    } else {
+                        PastelYellowTransparent
+                    },
                     shape = RoundedCornerShape(roundedCornerDimen)
                 )
                 .padding(vertical = 20.dp, horizontal = 10.dp)
@@ -484,7 +560,11 @@ fun MarksDetail() {
                 .fillMaxWidth()
                 .padding(horizontal = 5.dp)
                 .background(
-                    color = PastelYellowTransparent,
+                    color = if (settings.useAmoledMode.checked.value) {
+                        Color.Black
+                    } else {
+                        PastelYellowTransparent
+                    },
                     shape = RoundedCornerShape(roundedCornerDimen)
                 )
                 .padding(vertical = 20.dp, horizontal = 10.dp)

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

@@ -36,29 +36,20 @@ fun MenuScreen(modifier: Modifier = Modifier) {
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center
     ) {
-        // Button to trigger the dialog
-        Button(
-            onClick = { showDialog = true },
-            colors = ButtonDefaults.buttonColors(
-                contentColor = Color.White,
-                containerColor = Color.Black
-            ),
-            modifier = Modifier
-                .border(
-                    width = 5.dp,
-                    shape = RoundedCornerShape(roundedCornerDimen),
-                    color = PastelYellow
-                )
-                .width(230.dp)
-                .height(80.dp)
-        ) {
-            Text(
-                text = "Odhlásit se",
-                fontSize = 23.sp
-            )
-        }
+        MenuButton({ showDialog = true }, "Odhlásit se")
 
-        Spacer(modifier = Modifier.height(100.dp))
+        Spacer(modifier = Modifier.height(80.dp))
+
+        MenuButton({ screenToShow.value = Screen.SignIn }, "Změnit přihlášení")
+
+        Spacer(modifier = Modifier.height(80.dp))
+
+        MenuButton({ isShowing.value = IsShowing.About }, "O aplikaci")
+
+        Spacer(modifier = Modifier.height(80.dp))
+
+        MenuButton({ isShowing.value = IsShowing.Settings }, "Nastavení")
+    }
 
     // Dialog implementation
     if (showDialog) {
@@ -114,10 +105,12 @@ fun MenuScreen(modifier: Modifier = Modifier) {
             }
         )
     }
+}
 
-        Button(onClick = {
-                screenToShow.value = Screen.SignIn
-            },
+@Composable
+fun MenuButton(onClick: () -> Unit, text: String) {
+    Button(
+        onClick = onClick,
         colors = ButtonDefaults.buttonColors(
             contentColor = Color.White,
             containerColor = Color.Black
@@ -132,33 +125,8 @@ fun MenuScreen(modifier: Modifier = Modifier) {
             .height(80.dp)
     ) {
         Text(
-                text = "Změnit přihlášení",
+            text = text,
             fontSize = 23.sp
         )
     }
-
-        Spacer(modifier = Modifier.height(100.dp))
-
-        Button(onClick = {
-                isShowing.value = IsShowing.About
-            },
-            colors = ButtonDefaults.buttonColors(
-                contentColor = Color.White,
-                containerColor = Color.Black
-            ),
-            modifier = Modifier
-                .border(
-                    width = 5.dp,
-                    shape = RoundedCornerShape(roundedCornerDimen),
-                    color = PastelYellow
-                )
-                .width(230.dp)
-                .height(80.dp)
-        ) {
-            Text(
-                text = "O aplikaci",
-                fontSize = 23.sp
-            )
-        }
-    }
 }

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

@@ -4,10 +4,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material.icons.filled.Schedule
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
@@ -15,24 +17,54 @@ import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.odweta.solon.ui.theme.PastelYellow
+import kotlinx.coroutines.CoroutineScope
 
 private var timetableColor: MutableState<Color> = mutableStateOf(PastelYellow)
 private var marksColor: MutableState<Color> = mutableStateOf(Color.White)
 private var menuColor: MutableState<Color> = mutableStateOf(Color.White)
+var refreshButtonContentColor: MutableState<Color> = mutableStateOf(Color.White)
 
 @Composable
 fun NavbarScreen(modifier: Modifier = Modifier) {
+    val ctx = LocalContext.current
+    val coscope = rememberCoroutineScope()
     Row(
         modifier = Modifier.fillMaxWidth(),
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically
     ) {
+        var spacerModifier = 30.dp
+        if (settings.showRefreshButton.checked.value) {
+            spacerModifier = 15.dp
+            Button(
+                onClick = {
+                    fetchNewData(ctx, coscope)
+                    refreshButtonContentColor.value = PastelYellow
+                },
+                colors = ButtonDefaults.buttonColors(
+                    contentColor = refreshButtonContentColor.value,
+                    containerColor = Color.Black
+                )
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Refresh,
+                    contentDescription = "Refresh Button",
+                    modifier = Modifier.size(25.dp)
+                )
+            }
+
+            Spacer(modifier = Modifier.width(spacerModifier))
+        }
+
         Button(
             onClick = {
                 isShowing.value = IsShowing.Timetable
@@ -52,7 +84,7 @@ fun NavbarScreen(modifier: Modifier = Modifier) {
             )
         }
 
-        Spacer(modifier = Modifier.width(30.dp))
+        Spacer(modifier = Modifier.width(spacerModifier))
 
         Button(
             onClick = {
@@ -74,7 +106,7 @@ fun NavbarScreen(modifier: Modifier = Modifier) {
             )
         }
 
-        Spacer(modifier = Modifier.width(30.dp))
+        Spacer(modifier = Modifier.width(spacerModifier))
 
         Button(
             onClick = {

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

@@ -58,10 +58,15 @@ class Network {
                 internetAvail = true
                 userData = getUserDataJSON()
                 Util.saveStringToFile(userDataFilePath, userData)
-                if (!Parsing.userIsParent()) {
-                    studentClass = JSONObject(
+                studentClass = if (!Parsing.userIsParent()) {
+                    JSONObject(
                         Util.fileToString(userDataFilePath)
                     ).getJSONObject("class").get("name").toString()
+                } else {
+                    // if the user is a parent, the class will be of their first child
+                    JSONObject(
+                        Util.fileToString(userDataFilePath)
+                    ).getJSONArray("children").getJSONObject(0).getString("className")
                 }
                 studentId = getStudentId()
                 //syid = getSYID()

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

@@ -269,6 +269,23 @@ class Parsing {
                     auxSubjects.add(Subject.empty())
                 }
 
+                // prepend free subjects when day does not start with subject number 1
+                val newSubjects: MutableList<Subject> = mutableListOf()
+                var n = auxSubjects[0].number.toInt()
+                while (n > 1) {
+                    newSubjects.add(
+                        Subject.freeSubject(
+                            number = (n - 1).toString(),
+                            start = "00:00",
+                            end = "00:00"
+                        )
+                    )
+                    n -= 1
+                }
+                val finalSubjects: MutableList<Subject> = mutableListOf()
+                finalSubjects.addAll(newSubjects.reversed())
+                finalSubjects.addAll(auxSubjects)
+
                 for ((i, s) in auxSubjects.withIndex()) {
                     if (s.free) {
                         s.start = auxSubjects[i-1].end
@@ -279,7 +296,7 @@ class Parsing {
                 val day = Day()
                 day.name = name
                 day.date = date
-                day.subjects = auxSubjects
+                day.subjects = finalSubjects
 
                 // get rid of duplicates
                 val nextSubjects: MutableList<Subject> = mutableListOf()

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

@@ -0,0 +1,143 @@
+package com.odweta.solon
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBackIosNew
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchColors
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.odweta.solon.ui.theme.PastelYellow
+
+@Composable
+fun SettingsScreen(modifier: Modifier = Modifier) {
+    // handle the back gesture (back swipe form side or back button on bottom android navbar)
+    BackHandler {
+        isShowing.value = IsShowing.Menu
+    }
+
+    val scrollState = rememberScrollState()
+
+    Column(modifier = Modifier
+        .fillMaxSize()
+        .background(color = Color.Black)
+        .verticalScroll(scrollState)
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 5.dp)
+        ) {
+            Button(
+                onClick = {
+                    isShowing.value = IsShowing.Menu
+                },
+                colors = ButtonDefaults.buttonColors(
+                    contentColor = Color.White,
+                    containerColor = Color.Black
+                ),
+                modifier = Modifier
+                    .border(
+                        width = 5.dp,
+                        shape = RoundedCornerShape(roundedCornerDimen),
+                        color = PastelYellow
+                    )
+                    .width(70.dp)
+                    .height(70.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.ArrowBackIosNew,
+                    contentDescription = "Back icon",
+                    modifier = Modifier.size(40.dp)
+                )
+            }
+        } // back button
+
+        Spacer(Modifier.height(10.dp))
+
+        SettingsTableRow(settings.useSvobodaMode)
+
+        Spacer(Modifier.height(10.dp))
+
+        SettingsTableRow(settings.useAmoledMode)
+
+        Spacer(Modifier.height(10.dp))
+
+        SettingsTableRow(settings.showRefreshButton)
+    }
+}
+
+@Composable
+fun SettingsTableRow(setting: Setting) {
+    Row(
+        modifier = Modifier
+            .padding(10.dp)
+            .background(color = Color.Black, shape = RoundedCornerShape(roundedCornerDimen))
+            .fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = setting.name,
+            textAlign = TextAlign.Start,
+            color = Color.White,
+            fontSize = 20.sp
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+
+        Switch(
+            checked = setting.checked.value,
+            onCheckedChange = {
+                setting.checked.value = it
+                when (setting.id) {
+                    SettingsId.Svoboda -> settings.useSvobodaMode = setting
+                    SettingsId.Amoled -> settings.useAmoledMode = setting
+                    SettingsId.RefreshButton -> settings.showRefreshButton = setting
+                }
+                Util.saveStringToFile(settingsDataFilePath, settings.toString())
+            },
+            colors = SwitchColors(
+                uncheckedThumbColor = Color.Black,
+                uncheckedTrackColor = Color.DarkGray,
+                uncheckedBorderColor = Color.DarkGray,
+                checkedThumbColor = Color.Black,
+                checkedTrackColor = PastelYellow,
+                checkedBorderColor = PastelYellow,
+                checkedIconColor = Color.White,
+                uncheckedIconColor = Color.White,
+                disabledCheckedThumbColor = Color.Black,
+                disabledCheckedTrackColor = Color.Black,
+                disabledCheckedBorderColor = Color.Black,
+                disabledCheckedIconColor = Color.Black,
+                disabledUncheckedThumbColor = Color.Black,
+                disabledUncheckedTrackColor = Color.Black,
+                disabledUncheckedBorderColor = Color.Black,
+                disabledUncheckedIconColor = Color.Black
+            )
+        )
+    }
+}

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

@@ -39,12 +39,6 @@ import kotlinx.coroutines.launch
 import androidx.compose.foundation.layout.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.animation.core.animateDpAsState
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.ime
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.tooling.preview.Preview
 
 private var buttonText: MutableState<String> = mutableStateOf("Přihlásit se")
 
@@ -101,6 +95,7 @@ fun signInButtonCallback(ctx: Context, coscope: CoroutineScope, buttonText: Stri
             Account.save(acc)
             signedInAndReadyToLaunch.value = true
             screenToShow.value = Screen.Splash
+            fetchNewData(ctx, coscope)
         } else {
             Toast.makeText(
                 ctx,

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

@@ -1,7 +1,6 @@
 package com.odweta.solon
 
 import android.annotation.SuppressLint
-import android.text.format.Time
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -14,22 +13,30 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Refresh
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.odweta.solon.ui.theme.PastelGreen
@@ -38,16 +45,29 @@ import com.odweta.solon.ui.theme.PastelRed
 import com.odweta.solon.ui.theme.PastelRedTransparent
 import com.odweta.solon.ui.theme.PastelYellow
 import com.odweta.solon.ui.theme.PastelYellowTransparent
-import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun TimetableScreen() {
-    val pagerState = rememberPagerState( pageCount = { days.size } )
+    Box(
+        modifier = Modifier
+            .fillMaxSize(),
+        contentAlignment = Alignment.BottomCenter
+    ) {
+        DayPager()
+        //if (settings.showRefreshButton.checked.value) {
+        //    RefreshButton()
+        //}
+    }
+}
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun DayPager(modifier: Modifier = Modifier) {
+    val pagerState = rememberPagerState(pageCount = { days.size })
     HorizontalPager(
         state = pagerState,
         modifier = Modifier.fillMaxSize()
@@ -56,6 +76,45 @@ fun TimetableScreen() {
     }
 }
 
+//@Composable
+/*fun RefreshButton(modifier: Modifier = Modifier) {
+    val coscope = rememberCoroutineScope()
+    val ctx = LocalContext.current
+
+    Box(
+        modifier = Modifier
+            .padding(bottom = 10.dp)
+            .background(color = Color.Black, shape = RoundedCornerShape(roundedCornerDimen))
+    ) {
+        Button(
+            onClick = {
+                coscope.launch {
+                    fetchNewData(ctx, coscope)
+
+                }
+            },
+            colors = ButtonDefaults.buttonColors(
+                contentColor = Color.White,
+                containerColor = Color.Black
+            ),
+            modifier = Modifier
+                .border(
+                    width = 5.dp,
+                    shape = RoundedCornerShape(roundedCornerDimen),
+                    color = PastelYellow
+                )
+                .padding(vertical = 10.dp)
+        ) {
+            Icon(
+                imageVector = Icons.Default.Refresh,
+                contentDescription = "Refresh icon",
+                modifier = Modifier.size(25.dp)
+            )
+        }
+    }
+}
+ */
+
 private fun getSubjectColor(s: Subject, transparent: Boolean): Color {
     return if (s.free) {
         if (transparent) {
@@ -109,17 +168,28 @@ fun subjectModifier(d: Day, s: Subject, lectureNumber: Int): Modifier {
         currentLectureNumber = lectureNumber
     }
 
-    val m = Modifier
+    val m = if (settings.useAmoledMode.checked.value) {
+        Modifier
+            .fillMaxWidth()
+            .height(70.dp)
+            .border(
+                width = borderWidthDimen,
+                color = getSubjectColor(s, false), // decide on the color (transparent)
+                shape = RoundedCornerShape(roundedCornerDimen)
+            )
+    } else {
+        Modifier
             .fillMaxWidth()
             .height(70.dp)
             .background(
                 color = getSubjectColor(s, true), // decide on the color (transparent)
                 shape = RoundedCornerShape(roundedCornerDimen)
             )
+    }
 
     return if (lectureNumber == currentLectureNumber && dateParsed == todayDate) {
         m.border(
-            width = 5.dp,
+            width = borderWidthDimen,
             color = getSubjectColor(s, false),
             shape = RoundedCornerShape(roundedCornerDimen)
         )
@@ -159,11 +229,40 @@ private fun DayScreen(day: Day) {
                 .verticalScroll(scrollState)
         ) {
             for (subject in day.subjects) {
+                val amoledModifier = if (settings.useAmoledMode.checked.value) {
+                    Modifier
+                        .width(50.dp)
+                        .fillMaxHeight()
+                        .border(
+                            width = borderWidthDimen,
+                            color = getSubjectColor(
+                                subject,
+                                false
+                            ),
+                            shape = RoundedCornerShape(roundedCornerDimen)
+                        )
+                } else {
+                    Modifier
+                        .width(50.dp)
+                        .fillMaxHeight()
+                        .background(
+                            color = getSubjectColor(
+                                subject,
+                                true
+                            ),
+                            shape = RoundedCornerShape(roundedCornerDimen)
+                        )
+                }
+
                 if (day.subjects.indexOf(subject) > 0) {
                     Box(modifier = Modifier.height(10.dp)) {
                         if (subject.name == day.subjects[day.subjects.indexOf(subject) - 1].name) {
+                            val drawable =
+                                if (subject.free) { R.drawable.squiggly_line_green }
+                                else { R.drawable.squiggly_line_yellow }
+
                             Image(
-                                painter = painterResource(R.drawable.squiggly_line_yellow),
+                                painter = painterResource(drawable),
                                 contentDescription = "Spojovač stejných předmětů",
                                 modifier = Modifier.fillMaxSize()
                             )
@@ -176,16 +275,7 @@ private fun DayScreen(day: Day) {
                 ) {
                     if (subject.substitute != "2") {
                         Box(
-                            modifier = Modifier
-                                .width(50.dp)
-                                .fillMaxHeight()
-                                .background(
-                                    color = getSubjectColor(
-                                        subject,
-                                        true
-                                    ), // decide on the color (not transparent)
-                                    shape = RoundedCornerShape(roundedCornerDimen)
-                                ),
+                            modifier = amoledModifier,
                             contentAlignment = Alignment.Center
                         ) {
                             Text(
@@ -205,12 +295,31 @@ private fun DayScreen(day: Day) {
                             horizontalAlignment = Alignment.Start
                         ) {
                             if (!subject.free) {
+                                if (subject.substitute == "1") {
+                                    Row {
                                         Text(
                                             text = subject.name.uppercase(),
                                             color = Color.White,
                                             fontSize = 25.sp,
                                             fontWeight = FontWeight.Bold
                                         )
+
+                                        Spacer(modifier = Modifier.width(10.dp))
+
+                                        Text(
+                                            text = " supl ",
+                                            color = Color.Black,
+                                            modifier = Modifier.background(color = Color.White)
+                                        )
+                                    }
+                                } else {
+                                    Text(
+                                        text = subject.name.uppercase(),
+                                        color = Color.White,
+                                        fontSize = 25.sp,
+                                        fontWeight = FontWeight.Bold
+                                    )
+                                }
                             }
 
                             Text(
@@ -243,8 +352,7 @@ private fun DayScreen(day: Day) {
                             .padding(vertical = 5.dp),
                         contentAlignment = Alignment.Center
                     ) {
-                        // add this to the 'Svoboda' mode maybe later; for now, it is left out
-                        /*if (!Parsing.userIsParent()) {
+                        if (settings.useSvobodaMode.checked.value) {
                             if (
                                 subject.teacher == "Jindřich Svoboda" &&
                                 studentClass == "5. G"
@@ -255,7 +363,7 @@ private fun DayScreen(day: Day) {
                                     modifier = Modifier.fillMaxSize()
                                 )
                             }
-                        }*/
+                        }
                     }
 
                     if (subject.substitute != "2") {
@@ -266,11 +374,14 @@ private fun DayScreen(day: Day) {
                             verticalArrangement = Arrangement.Center,
                             horizontalAlignment = Alignment.End
                         ) {
+                            // show only for non prepended free lectures
+                            if ((subject.free && subject.start != "00:00" && subject.end != "00:00") || !subject.free) {
                                 Text(
                                     text = "${subject.start}–${subject.end}",
                                     color = Color.White,
                                     fontSize = 21.sp
                                 )
+                            }
 
                             if (!subject.free) {
                                 Box (
@@ -287,6 +398,9 @@ private fun DayScreen(day: Day) {
                     }
                 }
             }
+            //if (settings.showRefreshButton.checked.value) {
+            //    Spacer(modifier = Modifier.height(90.dp))
+            //}
         }
     }
 }

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

@@ -1,6 +1,8 @@
 package com.odweta.solon
 
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable

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

@@ -1,33 +1,18 @@
 package com.odweta.solon
 
-import android.animation.Animator
-import android.animation.AnimatorInflater
-import android.animation.AnimatorListenerAdapter
-import android.animation.ArgbEvaluator
-import android.animation.ValueAnimator
 import android.app.ActivityManager
 import android.content.Context
-import android.content.res.ColorStateList
-import android.content.res.Resources
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.GradientDrawable
+import android.content.pm.PackageManager
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
-import android.os.Handler
+import android.os.Build
 import android.util.DisplayMetrics
 import android.view.WindowManager
-import android.view.animation.AnimationUtils
-import android.widget.Button
-import androidx.compose.ui.graphics.Color
-import androidx.core.content.ContextCompat
-import androidx.core.content.res.ResourcesCompat
-import com.odweta.solon.ui.theme.PastelGreenTransparent
-import com.odweta.solon.ui.theme.PastelOrangeTransparent
-import com.odweta.solon.ui.theme.PastelRedTransparent
-import com.odweta.solon.ui.theme.PastelYellowTransparent
+import androidx.core.content.pm.PackageInfoCompat
 import java.io.File
 import java.io.IOException
 import java.nio.charset.Charset
+import kotlin.math.round
 
 class Util {
     companion object {
@@ -142,10 +127,6 @@ class Util {
             return false
         }
 
-        fun pixelsToDp(pixels: Int, resources: Resources): Int {
-            return (pixels * resources.displayMetrics.density).toInt()
-        }
-
         fun avg(marks: MutableList<Mark>): String {
             var sum = 0f
             var len = 0
@@ -166,7 +147,8 @@ class Util {
                 weights.add(mark.weight.toFloat())
             }
 
-            return String.format("%.2f", (sum / sum(weights))).replace(',', '.')
+            return "${Math.round(sum/sum(weights) * 100f) / 100f}".replace(",", ".")
+            //return String.format("%.2f", (sum / sum(weights))).replace(',', '.')
         }
 
         private fun sum(nums: List<Float>): Float {
@@ -220,5 +202,52 @@ class Util {
 
             return d
         }*/
+
+        data class AppVersion(
+            val versionName: String,
+            val versionNumber: Long,
+        )
+
+        fun getAppVersion(
+            context: Context,
+        ): AppVersion? {
+            return try {
+                val packageManager = context.packageManager
+                val packageName = context.packageName
+                val packageInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0))
+                } else {
+                    packageManager.getPackageInfo(packageName, 0)
+                }
+                AppVersion(
+                    versionName = packageInfo.versionName,
+                    versionNumber = PackageInfoCompat.getLongVersionCode(packageInfo),
+                )
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        fun stringToSettingsData(s: String): SettingsData {
+            val settings = s.split("\n")
+            val auxSettingsData = SettingsData()
+            val useSvobodaMode = settings[0].split("#")
+            val useAmoledMode = settings[1].split("#")
+            val showRefreshButton = settings[2].split("#")
+
+            auxSettingsData.useSvobodaMode.id = SettingsId.Svoboda
+            auxSettingsData.useSvobodaMode.name = useSvobodaMode[1]
+            auxSettingsData.useSvobodaMode.checked.value = useSvobodaMode[2].toBoolean()
+
+            auxSettingsData.useAmoledMode.id = SettingsId.Amoled
+            auxSettingsData.useAmoledMode.name = useAmoledMode[1]
+            auxSettingsData.useAmoledMode.checked.value = useAmoledMode[2].toBoolean()
+
+            auxSettingsData.showRefreshButton.id = SettingsId.RefreshButton
+            auxSettingsData.showRefreshButton.name = showRefreshButton[1]
+            auxSettingsData.showRefreshButton.checked.value = showRefreshButton[2].toBoolean()
+
+            return auxSettingsData
+        }
     }
 }

mobile/app/src/main/res/drawable/launcher_background.xml

@@ -1,53 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="108dp"
     android:width="108dp"
     android:viewportHeight="108"
-    android:viewportWidth="108">
-
-    <!-- Background Color -->
-    <path android:fillColor="#000000"
+    android:viewportWidth="108"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3DDC84"
           android:pathData="M0,0h108v108h-108z"/>
-
-    <!-- Vertical Grid Lines -->
-    <path android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat the lines for remaining grid -->
-
-    <!-- Horizontal Grid Lines -->
-    <path android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat the lines for remaining grid -->
-
-    <!-- Additional Grid Lines within the Central Area -->
-    <path android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeColor="#000000"
-        android:strokeWidth="0.8"/>
-    <!-- Repeat similar paths for the remaining inner lines -->
+    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
+          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
 </vector>

mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/launcher_background"/>
+    <background android:drawable="@mipmap/launcher_background"/>
     <foreground android:drawable="@mipmap/launcher_foreground"/>
 </adaptive-icon>

mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/launcher_background"/>
+    <background android:drawable="@mipmap/launcher_background"/>
     <foreground android:drawable="@mipmap/launcher_foreground"/>
 </adaptive-icon>

mobile/gradle.properties

@@ -21,3 +21,4 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+sdk.dir=/home/thinker/Android/Sdk