made new release 2.2 (205)

made the toolbar font size adaptively large relative to the user's name length, shrunk down the height of subjects and marks and made back gestures work properly - not close the app but show the previous screen

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/material_theme_project_new.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MaterialThemeProjectNewConfig">
+    <option name="metadata">
+      <MTProjectMetadataState>
+        <option name="migrated" value="true" />
+        <option name="pristineConfig" value="false" />
+        <option name="userId" value="-239e49af:192a4be9597:-7ffe" />
+      </MTProjectMetadataState>
+    </option>
+  </component>
+</project>

.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

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

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

TODO.md

@@ -0,0 +1,4 @@
+- add settings
+    - color schemes
+    - modes
+- new logo

fastlane/metadata/android/cz/full_description.txt

@@ -0,0 +1 @@
+Optimalizovana a zbavena nesmyslu verze skolniho online systemu SkolaOnLine

fastlane/metadata/android/cz/short_description.txt

@@ -0,0 +1 @@
+Odlehcena verze aplikace SkolaOnLine

fastlane/metadata/android/cz/title.txt

@@ -0,0 +1 @@
+Solon

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1 @@
+A more optimized and debloated version of the SkolaOnLine online school system

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+A light-weight Android frontend to SkolaOnLine

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+Solon

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/deploymentTargetSelector.xml

@@ -4,16 +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="RBPreview">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
     </selectionStates>

mobile/.idea/inspectionProfiles/Project_Default.xml

@@ -3,15 +3,19 @@
     <option name="myName" value="Project Default" />
     <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
@@ -27,21 +31,27 @@
     </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
     </inspection_tool>
   </profile>
 </component>

mobile/.idea/vcs.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/help" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
   </component>
 </project>

mobile/app/build.gradle.kts

@@ -12,12 +12,25 @@ android {
         applicationId = "com.odweta.solon"
         minSdk = 28
         targetSdk = 34
-        versionCode = 1
-        versionName = "2.0"
+        versionCode = 205
+        versionName = "2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    applicationVariants.all {
+        this.outputs
+            .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+            .forEach { output ->
+                val apkName = "com.odweta.solon_" + this.versionName + ".apk"
+                output.outputFileName = apkName
+            }
+    }
+
+    buildFeatures {
+        compose = true
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = false
@@ -27,15 +40,21 @@ android {
             )
         }
     }
+    
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
+    
     kotlinOptions {
         jvmTarget = "11"
     }
-    buildFeatures {
-        compose = true
+        
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
     }
 }
 

mobile/app/src/main/AndroidManifest.xml

@@ -18,9 +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:theme="@style/Theme.Solon"
+            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

@@ -1,6 +1,8 @@
 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
@@ -8,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
@@ -24,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
@@ -32,10 +36,14 @@ 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) {
+    // handle the back gesture (back swipe form side or back button on bottom android navbar)
+    BackHandler {
+        isShowing.value = IsShowing.Menu
+    }
+
     Column(
         modifier = Modifier
             .fillMaxSize(),
@@ -45,6 +53,7 @@ fun AboutScreen(modifier: Modifier = Modifier) {
         Box(
             modifier = Modifier
                 .fillMaxWidth()
+                .padding(start = 5.dp)
         ) {
             Button(
                 onClick = {
@@ -60,13 +69,13 @@ fun AboutScreen(modifier: Modifier = Modifier) {
                         shape = RoundedCornerShape(roundedCornerDimen),
                         color = PastelYellow
                     )
-                    .width(100.dp)
-                    .height(100.dp)
+                    .width(70.dp)
+                    .height(70.dp)
             ) {
                 Icon(
-                    imageVector = Icons.Default.ArrowBackIosNew,  // Replace with your desired icon
+                    imageVector = Icons.Default.ArrowBackIosNew,
                     contentDescription = "Back icon",
-                    modifier = Modifier.size(35.dp)  // Adjust size if needed
+                    modifier = Modifier.size(40.dp)
                 )
             }
         }
@@ -100,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,8 @@ 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"
+const val lectureNotesFilePath: String = "lecture_notes.csv"
 lateinit var fileDir: File
 var width: Int = 0
 var height: Int = 0
@@ -59,7 +57,8 @@ enum class IsShowing {
     Timetable,
     Marks,
     Menu,
-    About
+    About,
+    Settings
 }
 
 enum class Screen {
@@ -76,8 +75,48 @@ 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 internetAwaitListenerRunning: Boolean = false
+
 var timeTableAvailOffline: Boolean = false
 var marksAvailOffline: Boolean = false
 
@@ -99,6 +138,9 @@ var resetNav: Boolean = false
 
 var isAPISetUp: Boolean = false
 
+var lectureNotes: HashMap<Int, MutableState<String>> = hashMapOf()
+var selectedLecture: Int = 0
+
 var selectedDay: Int = 0
 var dayEndString: String = ""
 

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
@@ -19,6 +16,7 @@ private var toast2Shown: Boolean = false
 private lateinit var coscope_: CoroutineScope
 
 private fun setOnInternetAvailListener(ctx: Context, coscope: CoroutineScope) {
+    internetAwaitListenerRunning = true
     coscope.launch {
         while (true) {
             if (Util.internetAvail(ctx) && !internetAvail) {
@@ -37,7 +35,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 +44,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
@@ -119,6 +113,7 @@ fun launchPhase0(ctx: Context, coscope: CoroutineScope) {
 }
 
 private suspend fun launchPhase1(ctx: Context) {
+    // TODO: CONVERT TO SNACKBARS
     val toast: Toast = Toast.makeText(
         ctx,
         "Nelze načíst data, zkuste se připojit k internetu.",
@@ -144,9 +139,11 @@ 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)
+        if (!isAPISetUp) {
             Network.setupAPI()
+        }
 
         if (internetAvail) {
             // cancel a toast, if any
@@ -155,23 +152,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)
@@ -270,11 +275,15 @@ private fun launchPhase2(ctx: Context) {
         dayList.add(day)
     }
 
+    Util.loadLectureIds()
+
     loaded = true
 
     coscope_.launch {
+        if (!internetAwaitListenerRunning) {
             setOnInternetAvailListener(ctx, coscope_)
         }
+    }
 
     val role = if (Parsing.userIsParent()) {
         " – Rodič"
@@ -287,8 +296,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

@@ -15,6 +15,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.core.view.WindowCompat
 import com.odweta.solon.ui.theme.SolonTheme
 import kotlin.math.sign
 
@@ -68,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

@@ -1,5 +1,6 @@
 package com.odweta.solon
 
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -20,6 +21,7 @@ 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.material.icons.filled.AutoAwesome
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
@@ -37,11 +39,15 @@ import androidx.compose.ui.unit.sp
 import com.odweta.solon.ui.theme.PastelGreen
 import com.odweta.solon.ui.theme.PastelGreenTransparent
 import com.odweta.solon.ui.theme.PastelOrange
+import com.odweta.solon.ui.theme.PastelOrangeDark
+import com.odweta.solon.ui.theme.PastelOrangeDarkTransparent
 import com.odweta.solon.ui.theme.PastelOrangeTransparent
 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 java.time.LocalDate
+import java.time.format.DateTimeFormatter
 
 enum class MarksShow {
     All,
@@ -63,25 +69,31 @@ fun MarksScreen() {
 }
 
 private fun getAvgColor(avg: String, isBorder: Boolean = false): Color {
-    val aux = avg.replace(",", ".").toFloat().toInt()
-    return if (aux in 1..<2) {
+    val aux = avg.replace(",", ".").toFloat()
+    return if (aux in 1f..<1.5f) {
         if (isBorder) {
             PastelGreen
         } else {
             PastelGreenTransparent
         }
-    } else if (aux in 2..<3) {
+    } else if (aux in 1.5f..<2.5f) {
         if (isBorder) {
             PastelYellow
         } else {
             PastelYellowTransparent
         }
-    } else if (aux in 3..<4) {
+    } else if (aux in 2.5f..<3.5f) {
         if (isBorder) {
             PastelOrange
         } else {
             PastelOrangeTransparent
         }
+    } else if (aux in 3.5f..<4.5f) {
+        if (isBorder) {
+            PastelOrangeDark
+        } else {
+            PastelOrangeDarkTransparent
+        }
     } else {
         if (isBorder) {
             PastelRed
@@ -104,6 +116,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") {
@@ -116,61 +186,70 @@ fun MarksAll() {
                 Box(modifier = Modifier.height(10.dp))
             }
 
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(100.dp)
-                    .background(
-                        color = getAvgColor(Util.avg(markList)), // decide on the color (transparent)
-                        shape = RoundedCornerShape(roundedCornerDimen)
-                    )
-                    .clickable {
-                        marksShow.value = MarksShow.Subject
-                        subjectToShow = subject
+            // only add if mark date is not older than one week
+            var subjectContainsNewMark = false
+            for (mark in markList) {
+                if (LocalDate.parse(mark.date, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+                    .isAfter(LocalDate.now().minusWeeks(1))
+                ) {
+                    subjectContainsNewMark = true
                 }
+            }
+
+            Row(
+                modifier = amoledModifierBackground
             ) {
                 Row(
-                    modifier = Modifier
-                        .width(210.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
                 ) {
                     Text(
                         text = subject.uppercase(),
-                        fontSize = 35.sp,
+                        fontSize = 30.sp,
                         color = Color.White,
                         fontWeight = FontWeight.Bold,
                         textAlign = TextAlign.Center,
                         modifier = Modifier
-                            .width(100.dp)
+                            .width(70.dp)
                     )
 
                     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(".", ","),
-                        fontSize = 30.sp,
+                        text = textToShow,
+                        fontSize = 28.sp,
                         color = Color.White,
                         textAlign = TextAlign.Center,
                         modifier = Modifier
-                            .width(100.dp)
+                            .width(70.dp)
+                    )
+                }
+
+                Box(
+                    modifier = Modifier.fillMaxSize().weight(1f),
+                    contentAlignment = Alignment.TopStart
+                ) {
+                    if (subjectContainsNewMark) {
+                        Icon(
+                            modifier = Modifier.padding(start = 4.dp, top = 4.dp),
+                            imageVector = Icons.Default.AutoAwesome,
+                            contentDescription = "New marks in subject",
+                            tint = Color.White // You can customize the icon color
                         )
                     }
 
                     Box(
                         modifier = Modifier
-                        .weight(1f)
-                        .fillMaxHeight(),
+                            .fillMaxSize()
+                            .padding(horizontal = 10.dp),
                         contentAlignment = Alignment.Center
                     ) {
                         Text(
@@ -182,10 +261,16 @@ fun MarksAll() {
                 }
             }
         }
+    }
 }
 
 @Composable
 fun MarksSubject() {
+    // handle the back gesture (back swipe form side or back button on bottom android navbar)
+    BackHandler {
+        marksShow.value = MarksShow.All
+    }
+
     val scrollState = rememberScrollState()
 
     Column(
@@ -194,6 +279,9 @@ fun MarksSubject() {
         modifier = Modifier
             .fillMaxWidth()
             .padding(horizontal = 5.dp)
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth()
         ) {
             Button(
                 onClick = {
@@ -209,19 +297,58 @@ fun MarksSubject() {
                         shape = RoundedCornerShape(roundedCornerDimen),
                         color = PastelYellow
                     )
-                .width(100.dp)
-                .height(100.dp)
+                    .width(70.dp)
+                    .height(70.dp)
             ) {
                 Icon(
-                imageVector = Icons.Default.ArrowBackIosNew,  // Replace with your desired icon
+                    imageVector = Icons.Default.ArrowBackIosNew,
                     contentDescription = "Back icon",
-                modifier = Modifier.size(35.dp)  // Adjust size if needed
+                    modifier = Modifier.size(40.dp)
                 )
             }
 
+            Box(modifier = Modifier.weight(1f))
+
+            Box(
+                modifier = Modifier
+                    .width(70.dp)
+                    .height(70.dp)
+                    .border(
+                        width = 5.dp,
+                        color = getAvgColor(
+                            Util.avg(marks[subjectToShow]!!),
+                            true
+                        ),
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+                    .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 = textToShow,
+                    color = Color.White,
+                    textAlign = TextAlign.Center,
+                    fontSize = 25.sp
+                ) // average
+            }
+        }
+
         Spacer(modifier = Modifier.height(20.dp))
 
-        Box(modifier = Modifier.height(100.dp)) {
         Text(
             text = subjectNameMap[subjectToShow]!!,
             color = Color.White,
@@ -234,39 +361,15 @@ fun MarksSubject() {
                     color = PastelYellow,
                     shape = RoundedCornerShape(roundedCornerDimen)
                 )
-                    .background(PastelYellowTransparent)
-                    .padding(vertical = 20.dp)
-            ) // subject
-        }
-
-        Box(
-            modifier = Modifier.fillMaxWidth(),
-            contentAlignment = Alignment.Center
-        ) {
-            Text(
-                text = Util.avg(marks[subjectToShow]!!).replace(".", ","),
-                color = Color.White,
-                textAlign = TextAlign.Center,
-                fontSize = 30.sp,
-                modifier = Modifier
-                    .width(100.dp)
-                    .height(100.dp)
-                    .border(
-                        width = 5.dp,
-                        color = getAvgColor(
-                            Util.avg(marks[subjectToShow]!!),
-                            true
-                        ),
+                .background(color = if (settings.useAmoledMode.checked.value) {
+                        Color.Black
+                    } else {
+                        PastelYellowTransparent
+                    },
                     shape = RoundedCornerShape(roundedCornerDimen)
                 )
-                    .background(
-                        getAvgColor(
-                            Util.avg(marks[subjectToShow]!!)
-                        )
-                    )
-                    .padding(vertical = 32.5.dp)
-            ) // average
-        }
+                .padding(vertical = 20.dp)
+        ) // subject
 
         Spacer(modifier = Modifier.height(20.dp))
 
@@ -276,15 +379,22 @@ fun MarksSubject() {
                     Spacer(modifier = Modifier.height(10.dp))
                 }
 
+                Box(
+                    modifier = Modifier.fillMaxWidth(),
+                    contentAlignment = Alignment.TopStart
+                ) {
                     Row(
                         modifier = Modifier
                             .fillMaxWidth()
                             .padding(horizontal = 5.dp)
-                        .background(
-                            color = getAvgColor(mark.grade),
+                            .background(color = if (settings.useAmoledMode.checked.value) {
+                                Color.Black
+                            } else {
+                                getAvgColor(mark.grade)
+                            },
                                 shape = RoundedCornerShape(roundedCornerDimen)
                             )
-                        .padding(vertical = 20.dp)
+                            .padding(vertical = 10.dp)
                             .clickable {
                                 markToShow = mark
                                 marksShow.value = MarksShow.Detail
@@ -292,7 +402,7 @@ fun MarksSubject() {
                     ) {
                         Box(
                             modifier = Modifier
-                            .width(100.dp)
+                                .width(70.dp)
                                 .align(Alignment.CenterVertically),
                             contentAlignment = Alignment.Center
                         ) {
@@ -312,10 +422,21 @@ fun MarksSubject() {
                             Text(
                                 text = mark.theme,
                                 color = Color.White,
-                            fontSize = 23.sp
+                                fontSize = 20.sp
                             ) // theme
                         }
                     }
+
+                    // only add if mark date is not older than one week
+                    if (LocalDate.parse(mark.date, DateTimeFormatter.ISO_LOCAL_DATE_TIME).isAfter(LocalDate.now().minusWeeks(1))) {
+                        Icon(
+                            modifier = Modifier.padding(start = 7.dp, top = 4.dp),
+                            imageVector = Icons.Default.AutoAwesome,
+                            contentDescription = "A new mark",
+                            tint = Color.White // You can customize the icon color
+                        )
+                    }
+                }
             }
         }
     }
@@ -323,6 +444,11 @@ fun MarksSubject() {
 
 @Composable
 fun MarksDetail() {
+    // handle the back gesture (back swipe form side or back button on bottom android navbar)
+    BackHandler {
+        marksShow.value = MarksShow.Subject
+    }
+
     val scrollState = rememberScrollState()
 
     Column(
@@ -332,6 +458,9 @@ fun MarksDetail() {
             .fillMaxWidth()
             .padding(horizontal = 5.dp)
             .verticalScroll(scrollState)
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth()
         ) {
             Button(
                 onClick = {
@@ -347,20 +476,54 @@ fun MarksDetail() {
                         shape = RoundedCornerShape(roundedCornerDimen),
                         color = PastelYellow
                     )
-                .width(100.dp)
-                .height(100.dp)
+                    .width(70.dp)
+                    .height(70.dp)
             ) {
                 Icon(
-                imageVector = Icons.Default.ArrowBackIosNew,  // Replace with your desired icon
+                    imageVector = Icons.Default.ArrowBackIosNew,
                     contentDescription = "Back icon",
-                modifier = Modifier.size(35.dp)  // Adjust size if needed
+                    modifier = Modifier.size(40.dp)
                 )
             }
 
+            Box(modifier = Modifier.weight(1f))
+
+            Box(
+                modifier = Modifier
+                    .width(70.dp)
+                    .height(70.dp)
+                    .border(
+                        width = 5.dp,
+                        color = getAvgColor(
+                            Util.avg(marks[subjectToShow]!!),
+                            true
+                        ),
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+                    .background(
+                        if (settings.useAmoledMode.checked.value) {
+                            Color.Black
+                        } else {
+                            getAvgColor(
+                                Util.avg(marks[subjectToShow]!!)
+                            )
+                        }
+                    )
+                    .padding(vertical = 15.dp),
+                contentAlignment = Alignment.Center
+            ) {
+                Text(
+                    text = markToShow.grade,
+                    color = Color.White,
+                    textAlign = TextAlign.Center,
+                    fontSize = 25.sp
+                ) // average
+            }
+        }
+
         Spacer(modifier = Modifier.height(20.dp))
 
         Row {
-            Box(modifier = Modifier.height(100.dp)) {
             Text(
                 text = markToShow.theme,
                 color = Color.White,
@@ -373,43 +536,16 @@ fun MarksDetail() {
                         color = PastelYellow,
                         shape = RoundedCornerShape(roundedCornerDimen)
                     )
-                        .background(PastelYellowTransparent)
+                    .background(if (settings.useAmoledMode.checked.value) {
+                            Color.Black
+                        } else {
+                            PastelYellowTransparent
+                        }
+                    )
                     .padding(vertical = 20.dp)
             ) // description
-            }
         } // description
 
-        Row {
-            Box(
-                modifier = Modifier.fillMaxWidth(),
-                contentAlignment = Alignment.Center
-            ) {
-                Text(
-                    text = markToShow.grade,
-                    color = Color.White,
-                    textAlign = TextAlign.Center,
-                    fontSize = 35.sp,
-                    modifier = Modifier
-                        .width(100.dp)
-                        .height(100.dp)
-                        .border(
-                            width = 5.dp,
-                            color = getAvgColor(
-                                Util.avg(mutableListOf(markToShow)),
-                                true
-                            ),
-                            shape = RoundedCornerShape(roundedCornerDimen)
-                        )
-                        .background(
-                            getAvgColor(
-                                Util.avg(mutableListOf(markToShow))
-                            )
-                        )
-                        .padding(vertical = 32.5.dp)
-                ) // average
-            }
-        } // grade
-
         Spacer(modifier = Modifier.height(20.dp))
 
         Row(
@@ -417,7 +553,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)
@@ -431,7 +571,7 @@ fun MarksDetail() {
                 Text(
                     text = "Váha:",
                     color = Color.White,
-                    fontSize = 30.sp
+                    fontSize = 20.sp
                 )
             }
 
@@ -444,7 +584,7 @@ fun MarksDetail() {
                 Text(
                     text = markToShow.weight.replace(".", ","),
                     color = Color.White,
-                    fontSize = 23.sp
+                    fontSize = 20.sp
                 )
             }
         } // weight
@@ -456,7 +596,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)
@@ -470,7 +614,7 @@ fun MarksDetail() {
                 Text(
                     text = "Datum:",
                     color = Color.White,
-                    fontSize = 30.sp
+                    fontSize = 20.sp
                 )
             }
 
@@ -489,7 +633,7 @@ fun MarksDetail() {
                 Text(
                     text = date,
                     color = Color.White,
-                    fontSize = 23.sp
+                    fontSize = 20.sp
                 )
             }
         } // date

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) {
@@ -112,36 +103,14 @@ fun MenuScreen(modifier: Modifier = Modifier) {
                     Text("Ne")
                 }
             }
-            ) // TODO: THEME DIALOG
-        }
-
-        Button(onClick = {
-                screenToShow.value = Screen.SignIn
-            },
-            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 = "Změnit přihlášení",
-                fontSize = 23.sp
-            )
     }
+}
 
-        Spacer(modifier = Modifier.height(100.dp))
-
-        Button(onClick = {
-                isShowing.value = IsShowing.About
-            },
+@Composable
+fun MenuButton(onClick: () -> Unit, text: String) {
+    Button(
+        onClick = onClick,
         colors = ButtonDefaults.buttonColors(
             contentColor = Color.White,
             containerColor = Color.Black
@@ -156,9 +125,8 @@ fun MenuScreen(modifier: Modifier = Modifier) {
             .height(80.dp)
     ) {
         Text(
-                text = "O aplikaci",
+            text = text,
             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

@@ -2,20 +2,18 @@ package com.odweta.solon
 
 import android.content.Context
 import android.widget.Toast
+import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 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.Visibility
 import androidx.compose.material.icons.filled.VisibilityOff
@@ -27,8 +25,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -40,6 +36,9 @@ import com.odweta.solon.ui.theme.PastelYellow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import androidx.compose.foundation.layout.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 
 private var buttonText: MutableState<String> = mutableStateOf("Přihlásit se")
 
@@ -96,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,
@@ -106,41 +106,48 @@ fun signInButtonCallback(ctx: Context, coscope: CoroutineScope, buttonText: Stri
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun SignInScreen() {
+    // handle the back gesture (back swipe form side or back button on bottom android navbar)
+    BackHandler {
+        screenToShow.value = Screen.Main
+    }
+
     var usernameText by remember { mutableStateOf("") }
     var passwordText by remember { mutableStateOf("") }
     val ctx = LocalContext.current
     val coscope = rememberCoroutineScope()
     var isPasswordVisible by remember { mutableStateOf(false) } // State for visibility toggle
     val visualTransformation = if (isPasswordVisible) VisualTransformation.None else PasswordVisualTransformation()
-    val scrollState = rememberScrollState()
 
-    Box(
-        modifier = Modifier.fillMaxSize(),
-        contentAlignment = Alignment.Center
-    ) {
     Column(
         modifier = Modifier
             .fillMaxSize()
             .background(Color.Black)
-                .verticalScroll(scrollState),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
+            .imePadding(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Column(
+            modifier = Modifier
+                .wrapContentSize(),
+            horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Image(
                 painter = painterResource(R.drawable.solon_just_yellow),
                 contentDescription = "Solon logo",
-                modifier = Modifier.size(230.dp)
+                modifier = Modifier.size(200.dp)
             )
 
             TextField(
                 value = usernameText,
                 onValueChange = { input -> usernameText = input },
                 modifier = Modifier
-                    .border(width = 5.dp, color = PastelYellow, shape = RoundedCornerShape(
-                        roundedCornerDimen))
+                    .border(
+                        width = 5.dp, color = PastelYellow, shape = RoundedCornerShape(
+                            roundedCornerDimen
+                        )
+                    )
                     .width(230.dp),
                 colors = TextFieldDefaults.colors(
                     focusedTextColor = Color.White,               // White text

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

@@ -1,7 +1,7 @@
 package com.odweta.solon
 
 import android.annotation.SuppressLint
-import android.text.format.Time
+import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -13,16 +13,29 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 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.text.selection.TextSelectionColors
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldColors
+import androidx.compose.material3.TextFieldDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -31,22 +44,89 @@ import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.compose.ui.window.DialogProperties
+import androidx.compose.ui.zIndex
 import com.odweta.solon.ui.theme.PastelGreen
 import com.odweta.solon.ui.theme.PastelGreenTransparent
 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 java.security.MessageDigest
 import java.time.LocalDate
-import java.time.LocalDateTime
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
+import kotlin.math.abs
+
+var showDetailDialog = mutableStateOf(false)
+
+@Composable
+fun TimetableScreen() {
+    Box(
+        modifier = Modifier
+            .fillMaxSize(),
+        contentAlignment = Alignment.BottomCenter
+    ) {
+        DayPager()
+        if (showDetailDialog.value) {
+            DetailDialog()
+        }
+    }
+}
+
+@SuppressLint("UnrememberedMutableState")
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DetailDialog(modifier: Modifier = Modifier) {
+    Dialog(
+        onDismissRequest = { showDetailDialog.value = false },  // Close the dialog on dismiss
+        properties = DialogProperties(
+            dismissOnBackPress = true,
+            dismissOnClickOutside = true
+        ),
+        content = {
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 20.dp)
+                    .background(
+                        color = Color.Black,
+                        shape = RoundedCornerShape(roundedCornerDimen)
+                    )
+            ) {
+                if (lectureNotes[selectedLecture] == null) {
+                    lectureNotes[selectedLecture] = mutableStateOf("")
+                }
+
+                TextField(
+                    value = lectureNotes[selectedLecture]!!.value,
+                    onValueChange = { newText: String ->
+                        lectureNotes[selectedLecture]!!.value = newText
+                        Util.saveLectureIds()
+                    },
+                    placeholder = { Text("Sem můžete napsat poznámky k\u00A0této hodině.") },
+                    colors = TextFieldDefaults.textFieldColors(
+                        focusedTextColor = Color.White,
+                        containerColor = Color.Black,
+                        selectionColors = TextSelectionColors(
+                            handleColor = PastelYellow,
+                            backgroundColor = PastelYellowTransparent
+                        ),
+                        cursorColor = PastelYellow,
+                        focusedIndicatorColor = PastelYellow,
+                        unfocusedIndicatorColor = PastelYellowTransparent
+                    )
+                )
+            }
+        }
+    )
+}
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun TimetableScreen() {
-    val pagerState = rememberPagerState( pageCount = { days.size } )
+fun DayPager(modifier: Modifier = Modifier) {
+    val pagerState = rememberPagerState(pageCount = { days.size })
     HorizontalPager(
         state = pagerState,
         modifier = Modifier.fillMaxSize()
@@ -85,9 +165,19 @@ fun isTimeBetween(givenTime: LocalTime, startTime: LocalTime, endTime: LocalTime
 @SuppressLint("ModifierFactoryExtensionFunction")
 @Composable
 fun subjectModifier(d: Day, s: Subject, lectureNumber: Int): Modifier {
+    var day = d.date.split(".")[0].replace(" ", "")
+    var month = d.date.split(".")[1].replace(" ", "")
+    if (day.length < 2) {
+        day = "0$day"
+    }
+
+    if (month.length < 2) {
+        month = "0$month"
+    }
+
     val dayFormatter = DateTimeFormatter.ofPattern("dd. MM. yyyy")
     val hourFormatter = DateTimeFormatter.ofPattern("HH:mm:ss")
-    val dateParsed = LocalDate.parse(d.date + " " + LocalDate.now().year, dayFormatter)
+    val dateParsed = LocalDate.parse("$day. $month." + " " + LocalDate.now().year, dayFormatter)
     val startTimeParsed = LocalTime.parse(s.start + ":00", hourFormatter)
     val endTimeParsed = LocalTime.parse(s.end + ":00", hourFormatter)
 
@@ -98,28 +188,34 @@ fun subjectModifier(d: Day, s: Subject, lectureNumber: Int): Modifier {
         currentLectureNumber = lectureNumber
     }
 
-    return if (lectureNumber == currentLectureNumber && dateParsed == todayDate) {
+    val m = if (settings.useAmoledMode.checked.value) {
         Modifier
             .fillMaxWidth()
-            .height(100.dp)
-            .background(
-                color = getSubjectColor(s, true), // decide on the color (transparent)
-                shape = RoundedCornerShape(roundedCornerDimen)
-            )
+            .height(70.dp)
             .border(
-                width = 5.dp,
-                color = getSubjectColor(s, false),
+                width = borderWidthDimen,
+                color = getSubjectColor(s, false), // decide on the color (transparent)
                 shape = RoundedCornerShape(roundedCornerDimen)
             )
     } else {
         Modifier
             .fillMaxWidth()
-            .height(100.dp)
+            .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 = borderWidthDimen,
+            color = getSubjectColor(s, false),
+            shape = RoundedCornerShape(roundedCornerDimen)
+        )
+    } else {
+        m
+    }
 }
 
 @Composable
@@ -138,7 +234,7 @@ private fun DayScreen(day: Day) {
             Text(
                 text = "${day.name} ${day.date}",
                 color = Color.White,
-                fontSize = 30.sp,
+                fontSize = 26.sp,
                 fontWeight = FontWeight.Bold,
                 fontStyle = FontStyle.Italic
             )
@@ -152,12 +248,42 @@ private fun DayScreen(day: Day) {
                 .padding(horizontal = 5.dp)
                 .verticalScroll(scrollState)
         ) {
-            for (subject in day.subjects) {
+            for ((subjectIndex, subject) in day.subjects.withIndex()) {
+                val lectureId = Util.getLectureId(day.date, subjectIndex)
+                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()
                             )
@@ -165,21 +291,11 @@ private fun DayScreen(day: Day) {
                     }
                 }
 
-                Row(
-                    modifier = subjectModifier(day, subject, subject.number.toInt())
-                ) {
+                Box (modifier = subjectModifier(day, subject, subject.number.toInt())) {
+                    Row {
                         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(
@@ -199,12 +315,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(
@@ -237,7 +372,7 @@ private fun DayScreen(day: Day) {
                                 .padding(vertical = 5.dp),
                             contentAlignment = Alignment.Center
                         ) {
-                        if (!Parsing.userIsParent()) {
+                            if (settings.useSvobodaMode.checked.value) {
                                 if (
                                     subject.teacher == "Jindřich Svoboda" &&
                                     studentClass == "5. G"
@@ -255,17 +390,23 @@ private fun DayScreen(day: Day) {
                             Column(
                                 modifier = Modifier
                                     .fillMaxHeight()
-                                .padding(end = 20.dp),
+                                    .padding(end = 10.dp),
                                 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 (
+                                        contentAlignment = Alignment.BottomEnd
+                                    ) {
                                         Text(
                                             text = subject.teacher,
                                             color = Color.White,
@@ -276,6 +417,16 @@ private fun DayScreen(day: Day) {
                             }
                         }
                     }
+
+                    Box(modifier = Modifier
+                        .fillMaxSize()
+                        .zIndex(99f)
+                        .clickable {
+                            selectedLecture = lectureId
+                            showDetailDialog.value = true
+                        })
+                }
+            }
         }
     }
 }

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

@@ -1,15 +1,46 @@
 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
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
 fun ToolbarScreen() {
+    // make the font size adaptive relative to the length of the user's name
+    var toolbarTextSizeAdaptive by remember { mutableStateOf(25.sp) }
+
+    if (toolbarText.value.length > 28) {
+        toolbarTextSizeAdaptive = 20.sp
+    }
+
+    if (toolbarText.value.length > 32) {
+        toolbarTextSizeAdaptive = 16.sp
+    }
+
+    if (toolbarText.value.length > 40) {
+        toolbarTextSizeAdaptive = 12.sp
+    }
+
+    if (toolbarText.value.length > 45) {
+        toolbarTextSizeAdaptive = 10.sp
+    }
+
+    Box(modifier = Modifier.padding(10.dp)) {
         Text(
             text = toolbarText.value,
-        fontSize = 25.sp,
+            fontSize = toolbarTextSizeAdaptive,
             color = Color.White
         )
+    }
 }

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

@@ -1,33 +1,22 @@
 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.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.core.content.pm.PackageInfoCompat
 import java.io.File
 import java.io.IOException
 import java.nio.charset.Charset
+import java.security.MessageDigest
+import kotlin.math.abs
+import kotlin.math.round
 
 class Util {
     companion object {
@@ -130,22 +119,20 @@ class Util {
         }
 
         fun isAppInForeground(context: Context, packageName: String): Boolean {
-            val activityManager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+            val activityManager =
+                context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
             val runningAppProcesses = activityManager.runningAppProcesses ?: return false
 
             for (processInfo in runningAppProcesses) {
                 if (processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND &&
-                    processInfo.processName == packageName) {
+                    processInfo.processName == packageName
+                ) {
                     return true
                 }
             }
             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 +153,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 +208,100 @@ 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
+        }
+
+        fun getLectureId(date: String, subjectIndex: Int): Int {
+            val concat = "$date[$subjectIndex]"
+            val bytes = concat.toByteArray()
+            val md5AsBytes = MessageDigest.getInstance("MD5").digest(bytes)
+            return abs(md5AsBytes.take(4).fold(0) { acc, byte ->
+                (acc shl 8) or (byte.toInt() and 0xff)
+            })
+        }
+
+        fun csvToHashMap(filePath: String): HashMap<Int, MutableState<String>> {
+            val hashMap = HashMap<Int, MutableState<String>>()
+            val lines = fileToString(filePath).lines()
+            for (line in lines) {
+                if (line.isBlank()) continue
+
+                val parts = line.split(",")
+
+                if (parts.size == 2) {
+                    val key = parts[0].trim().toInt()
+                    val value = parts[1].trim()
+                    hashMap[key] = mutableStateOf("")
+                    hashMap[key]!!.value = value
+                }
+            }
+
+            return hashMap
+        }
+
+        fun hashMapToCsv(hashMap: HashMap<Int, MutableState<String>>): String {
+            var result = ""
+            for ((key, value) in hashMap) {
+                result += "$key,${value.value}\n"
+            }
+            return result
+        }
+
+        fun loadLectureIds() {
+            lectureNotes = csvToHashMap(lectureNotesFilePath)
+        }
+
+        fun saveLectureIds() {
+            val toSave = hashMapToCsv(lectureNotes)
+            saveStringToFile(lectureNotesFilePath, toSave)
+        }
     }
 }

mobile/app/src/main/java/com/odweta/solon/ui/theme/Color.kt

@@ -19,11 +19,13 @@ val White = Color(0xFFFFFFFF)
 val Transparent = Color(0x00000000)
 
 val PastelRed = Color(0xFFFF6666)
+val PastelOrangeDark = Color(0xFFDC6421)
 val PastelGreen = Color(0xFF00CC99)
 val PastelOrange = Color(0xFFFF9933)
 val PastelYellow = Color(0xFFFFCC33)
 
 val PastelRedTransparent = Color(0x50FF6666)
+val PastelOrangeDarkTransparent = Color(0x50DC6421)
 val PastelGreenTransparent = Color(0x5000CC99)
 val PastelOrangeTransparent = Color(0x50FF9933)
 val PastelYellowTransparent = Color(0x50FFCC33)

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/app/src/main/res/xml/data_extraction_rules.xml

@@ -5,7 +5,7 @@
 -->
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <!-- xTODO: Use <include> and <exclude> to control what is backed up.
         <include .../>
         <exclude .../>
         -->

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=~/Android/Sdk

mobile/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 accompanistCoil = "0.30.1"
-agp = "8.7.1"
+agp = "8.7.2"
 coilCompose = "2.4.0"
 glide = "4.16.0"
 kotlin = "2.0.0"

mobile/prepare_release.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp app/build/outputs/apk/release/com.odweta.solon_$1.apk ../release/