Add DSBActivity and MebisActivity

.idea/deploymentTargetDropDown.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <value>
-      <entry key="All Tests">
-        <State />
-      </entry>
-      <entry key="PSEActivity">
-        <State />
-      </entry>
-      <entry key="app">
-        <State />
-      </entry>
-    </value>
-  </component>
-</project>

app/build.gradle.kts

@@ -60,11 +60,15 @@ dependencies {
     implementation(platform("androidx.compose:compose-bom:2023.03.00"))
     implementation("androidx.datastore:datastore-preferences:1.0.0")
     implementation("com.google.code.gson:gson:2.9.0")
+    implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    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("androidx.compose.ui:ui-test-junit4")
     androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 }

app/src/main/AndroidManifest.xml

@@ -12,6 +12,16 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.CleverClass"
         tools:targetApi="31">
+        <activity
+            android:name=".MebisActivity"
+            android:exported="false"
+            android:label="@string/title_activity_mebis"
+            android:theme="@style/Theme.CleverClass" />
+        <activity
+            android:name=".DSBActivity"
+            android:exported="false"
+            android:label="@string/title_activity_dsbactivity"
+            android:theme="@style/Theme.CleverClass" />
         <activity
             android:name=".FachActivity"
             android:exported="false"

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

@@ -0,0 +1,68 @@
+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.foundation.layout.size
+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.unit.dp
+import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
+
+class DSBActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CleverClassTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    DSBContent(activity = this)
+                }
+            }
+        }
+    }
+}
+
+// Content of DSBmobile
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DSBContent(activity: ComponentActivity){
+    Column() {
+        TopAppBar(
+            colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.primaryContainer),
+            title = {
+                Text(text = "DSBmobile",
+                    style = MaterialTheme.typography.headlineSmall
+                )},
+            navigationIcon = {
+                IconButton(onClick = { activity.finish() }) {
+                    Icon(
+                        imageVector = Icons.Filled.ArrowBack,
+                        contentDescription = null,
+                        modifier = Modifier.size(28.dp)
+                    )
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        )
+
+        Column() {
+
+        }
+    }
+}

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

@@ -85,8 +85,8 @@ fun MainContent(activity: ComponentActivity){
             MainButton(onClick = { switchToActivity(activity, StundenplanActivity::class.java) }, color = Color(0xFFFF4081), text = "Stundenplan", sharedPreferences)
             MainButton(onClick = { switchToActivity(activity, NotenActivity::class.java) }, color = Color(0xFFE040FB), text = "Noten", sharedPreferences)
             MainButton(onClick = { switchToActivity(activity, PSEActivity::class.java) }, color = Color(0xFF536DFE), text = "Periodensystem", sharedPreferences)
-            MainButton(onClick = { /*TODO: Mebis activity*/ }, color = Color(0xFF7C4DFF), text = "Mebis", sharedPreferences)
+            MainButton(onClick = { switchToActivity(activity, MebisActivity::class.java) }, color = Color(0xFF7C4DFF), text = "Mebis", sharedPreferences)
-            MainButton(onClick = { /*TODO: DSBmobile activity*/ }, color = Color(0xFFFF6E40), text = "DSBmobile", sharedPreferences)
+            MainButton(onClick = { switchToActivity(activity, DSBActivity::class.java) }, color = Color(0xFFFF6E40), text = "DSBmobile", sharedPreferences)
         }
     }
 }

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

@@ -0,0 +1,68 @@
+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.foundation.layout.size
+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.unit.dp
+import com.schoolapp.cleverclass.ui.theme.CleverClassTheme
+
+class MebisActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            CleverClassTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    MebisContent(activity = this)
+                }
+            }
+        }
+    }
+}
+
+// Content of Mebis
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MebisContent(activity: ComponentActivity){
+    Column() {
+        TopAppBar(
+            colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.primaryContainer),
+            title = {
+                Text(text = "Mebis",
+                    style = MaterialTheme.typography.headlineSmall
+                )},
+            navigationIcon = {
+                IconButton(onClick = { activity.finish() }) {
+                    Icon(
+                        imageVector = Icons.Filled.ArrowBack,
+                        contentDescription = null,
+                        modifier = Modifier.size(28.dp)
+                    )
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        )
+
+        Column() {
+
+        }
+    }
+}

app/src/main/res/values/strings.xml

@@ -7,4 +7,6 @@
     <string name="title_activity_noten">NotenActivity</string>
     <string name="title_activity_fach">FachActivity</string>
     <string name="dialog_schließen">Schließen</string>
+    <string name="title_activity_dsbactivity">DSBActivity</string>
+    <string name="title_activity_mebis">MebisActivity</string>
 </resources>