From 5011534783801626c8fa124baa500b2eedf36102 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Mon, 18 Mar 2024 20:13:12 +0100
Subject: [PATCH] Update Main-screen and add PSEActivity

---
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  1 -
 app/build.gradle.kts                          |  2 +
 app/src/main/AndroidManifest.xml              |  5 ++
 .../com/schoolapp/cleverclass/MainActivity.kt | 37 ++++++----
 .../com/schoolapp/cleverclass/PSEActivity.kt  | 67 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d89050..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 02b4f98..fb413b4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -59,11 +59,13 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
+    implementation(platform("androidx.compose:compose-bom:2023.03.00"))
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 973052e..7935e30 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,11 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.CleverClass"
         tools:targetApi="31">
+        <activity
+            android:name=".PSEActivity"
+            android:exported="false"
+            android:label="@string/title_activity_pseactivity"
+            android:theme="@style/Theme.CleverClass" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt
index cab72e2..c945563 100644
--- a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt
+++ b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt
@@ -1,5 +1,7 @@
 package com.schoolapp.cleverclass
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -20,12 +22,13 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
 
@@ -36,7 +39,7 @@ class MainActivity : ComponentActivity() {
             CleverClassTheme {
                 Surface(modifier = Modifier.fillMaxSize(),
                         color = MaterialTheme.colorScheme.background) {
-                    Content()
+                    MainContent()
                 }
             }
         }
@@ -47,7 +50,8 @@ class MainActivity : ComponentActivity() {
 // Content of Main-screen
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun Content(){
+fun MainContent(){
+    val context = LocalContext.current
     Column() {
         TopAppBar(
             colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.background),
@@ -59,14 +63,14 @@ fun Content(){
         )
 
         Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
-            Button(onClick = { /*TODO*/ }, color = Color(0xFFFF8A80), text = "Periodensystem")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFF8C9EFF), text = "Stundenplan")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFFEA80FC), text = "Noten")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFF40C4FF), text = "Mebis")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFFB2FF59), text = "DSBmobile")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFF69F0AE), text = "...")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFFFFD740), text = "...")
-            Button(onClick = { /*TODO*/ }, color = Color(0xFFE040FB), text = "...")
+            MainButton(onClick = { switchToActivity(context, PSEActivity::class.java) }, color = Color(0xFFFF8A80), text = "Periodensystem")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFF8C9EFF), text = "Stundenplan")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFFEA80FC), text = "Noten")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFF40C4FF), text = "Mebis")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFFB2FF59), text = "DSBmobile")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFF69F0AE), text = "...")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFFFFD740), text = "...")
+            MainButton(onClick = { /*TODO*/ }, color = Color(0xFFE040FB), text = "...")
         }
     }
 }
@@ -74,9 +78,9 @@ fun Content(){
 
 // Main-menu Buttons
 @Composable
-fun Button(onClick: () -> Unit, color : Color, text : String) {
+fun MainButton(onClick: () -> Unit, color : Color, text : String) {
     Button(
-        onClick = { onClick() },
+        onClick = onClick,
         shape = RoundedCornerShape(40),
         colors = ButtonDefaults.outlinedButtonColors(containerColor = color),
         modifier = Modifier
@@ -89,4 +93,9 @@ fun Button(onClick: () -> Unit, color : Color, text : String) {
             fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal)),
             fontSize = 20.sp)
     }
+}
+
+fun switchToActivity(context : Context, activity : Class<*>){
+    val intent = Intent(context, activity)
+    context.startActivity(intent)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt
new file mode 100644
index 0000000..c5c61ea
--- /dev/null
+++ b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt
@@ -0,0 +1,67 @@
+package com.schoolapp.cleverclass
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
+
+class PSEActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CleverClassTheme {
+                Surface(modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background) {
+                    PSEContent(activity = this)
+                }
+            }
+        }
+    }
+}
+
+// Content of PSE
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PSEContent(activity: ComponentActivity){
+    Column() {
+        TopAppBar(
+            colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.background),
+            title = {
+                Text(text = "Periodensystem",
+                    fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal))
+                )
+            },
+            navigationIcon = {
+                IconButton(onClick = { activity.finish() }) {
+                    Icon(
+                        imageVector = Icons.Filled.ArrowBack,
+                        contentDescription = null
+                    )
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        )
+
+        Column() {
+
+        }
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 988ed96..fb86f16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">CleverClass</string>
+    <string name="title_activity_pseactivity">PSEActivity</string>
 </resources>
\ No newline at end of file