update AboutActivity

3 month --> 3 months

app/build.gradle.kts

@@ -23,6 +23,7 @@ android {
     buildTypes {
         release {
             isMinifyEnabled = false
+            isDebuggable = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"

app/src/main/java/com/schoolapp/cleverclass/AboutActivity.kt

@@ -83,7 +83,7 @@ fun AboutContent(activity: ComponentActivity){
         {
             AboutTextElement("This Product is published under the\nGNU General Public License\nVersion 3, 29 June 2007", 16.dp)
             AboutTextElement("Developed by:\n- Paul Posch\n- Matthias Meyer\n- Jakub Szarko\n- Emilian Bührer", 32.dp)
-            AboutTextElement("Fun Facts:\nThis app consists of 2.873 lines of code\nThe repository is 413KB big\nThe development took about 3 month", 64.dp)  //TODO: Update before launch
+            AboutTextElement("Fun Facts:\nThis app consists of 4.189 lines of code\nThe repository is 768KB big\nThe development took about 3 months", 64.dp)
 
             Spacer(modifier = Modifier.height(32.dp))
             Divider()
@@ -98,7 +98,7 @@ fun AboutContent(activity: ComponentActivity){
             ) {
                 Row {
                     Text(
-                        text = "Unterstütze die Entwickler",
+                        text = "Support the Devs",
                         style = MaterialTheme.typography.bodySmall,
                         color = MaterialTheme.colorScheme.onBackground,
                         modifier = Modifier.padding(16.dp)

app/src/main/java/com/schoolapp/cleverclass/DSBDownloader.kt

@@ -127,7 +127,19 @@ private fun decompressGZIPAndDecodeBase64(compressedData: String): String {
 private fun downloadImagesTask(jsonResponse: JSONObject, mainDir : File) : Int {
     clearFolder(mainDir)
 
-    val jsonDaysObject = jsonResponse.getJSONArray("ResultMenuItems").getJSONObject(0).getJSONArray("Childs").getJSONObject(0).getJSONObject("Root").getJSONArray("Childs")
+    var jsonDaysObject = jsonResponse.getJSONArray("ResultMenuItems")
+    for (i in 0 until jsonDaysObject.length()) {
+        if (jsonDaysObject.getJSONObject(i).get("Index") == 0) {
+            jsonDaysObject = jsonDaysObject.getJSONObject(i).getJSONArray("Childs")
+            break
+        }
+    }
+    for (i in 0 until jsonDaysObject.length()) {
+        if (jsonDaysObject.getJSONObject(i).get("Index") == 0) {
+            jsonDaysObject = jsonDaysObject.getJSONObject(i).getJSONObject("Root").getJSONArray("Childs")
+            break
+        }
+    }
 
     for (d in 0 until jsonDaysObject.length()) {
         val jsonDayObject = jsonDaysObject.getJSONObject(d)

app/src/main/java/com/schoolapp/cleverclass/SettingsActivity.kt

@@ -105,8 +105,8 @@ fun SettingsContent(activity: ComponentActivity) {
             Setting(text = "Stundenplan", sharedPreferences, editor)
             Setting(text = "Noten", sharedPreferences, editor)
             Setting(text = "Periodensystem", sharedPreferences, editor)
-            Setting(text = "Mebis", sharedPreferences, editor)
             Setting(text = "DSBmobile", sharedPreferences, editor)
+            Setting(text = "Mebis", sharedPreferences, editor)
             Spacer(modifier = Modifier.height(16.dp))
 
             Divider()

app/src/main/java/com/schoolapp/cleverclass/StundenplanActivity.kt

@@ -239,7 +239,7 @@ fun StundenplanContent(activity: ComponentActivity, loadedLessons: List<List<Les
             text = {
                 Text(
                     text = "Die Breite der Spalten ist auf eine bestimmte Größe festgelegt.\n\n" +
-                            "Zu lange eingaben können horizontal gescrollt werden.",
+                            "Zu lange Eingaben können horizontal gescrollt werden.",
                     color = MaterialTheme.colorScheme.onPrimaryContainer,
                     style = MaterialTheme.typography.labelMedium)
             },

app/src/main/java/com/schoolapp/cleverclass/TimeTableSetupActivity.kt

@@ -189,9 +189,18 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
                 IconButton(
                     onClick = {
                         activity.finish()
-                        val intent = Intent(activity, StundenplanActivity::class.java)
-                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                        startActivity(activity, intent, null)
+                        if (setupDone) {
+                            val intent = Intent(activity, StundenplanActivity::class.java)
+                            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                            startActivity(activity, intent, null)
+                        }
+                        else {
+                            val intent = Intent(activity, MainActivity::class.java)
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                            startActivity(activity, intent, null)
+                        }
                     }
                 ) {
                     Icon(
@@ -383,11 +392,20 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
                                     editor.putInt("breakAmnt", breakAmnt.toInt())
                                     editor.apply()
                                     activity.finish()
-                                    //Reopen of activity so values will be updated
-                                    val intent = Intent(activity, StundenplanActivity::class.java)
-                                    //Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
-                                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-                                    startActivity(activity, intent, null)
+                                    if (setupDone) {
+                                        //Reopen of activity so values will be updated
+                                        val intent = Intent(activity, StundenplanActivity::class.java)
+                                        //Remove previous StundenplanActivity from activity stack so when going back later it won't exist twice
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                                        startActivity(activity, intent, null)
+                                    }
+                                    else {
+                                        val intent = Intent(activity, MainActivity::class.java)
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                                        startActivity(activity, intent, null)
+                                    }
                                 },
                                 modifier = Modifier
                                     .padding(5.dp)
@@ -605,7 +623,6 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
                                         }
                                         startActivity(activity, intent, null)
                                     }
-
                                 },
                                 modifier = Modifier
                                     .padding(5.dp)

app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt

@@ -8,9 +8,9 @@ val Black80 = Color(0xFF333333)
 val Black70 = Color(0xFF4B4B4B)
 
 val White100 = Color(0xFFFFFFFF)
-val White90 = Color(0xFFEBEBEB)
+val White90 = Color(0xFFFAFAFA)
 val White80 = Color(0xFFD3D3D3)
-val White70 = Color(0xFFBBBBBB)
+val White70 = Color(0xFFAFAFAF)
 
 
 val TextOnColouredButton = Color(0xFF121212)