From 497548bd3278fc1eeef581839c09ee24d727ad3c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 19 Mar 2024 22:39:13 +0100 Subject: [PATCH] Update Theme.kt Add menu button on Main-screen --- .idea/inspectionProfiles/Project_Default.xml | 32 +++++++++++++++++ .../com/schoolapp/cleverclass/MainActivity.kt | 34 +++++++++++++------ .../com/schoolapp/cleverclass/PSEActivity.kt | 7 ++-- .../schoolapp/cleverclass/ui/theme/Color.kt | 12 +++---- .../schoolapp/cleverclass/ui/theme/Theme.kt | 24 ++++--------- 5 files changed, 73 insertions(+), 36 deletions(-) create mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..103e00c --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,32 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt index c945563..54f939f 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt @@ -10,12 +10,19 @@ 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.magnifier 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.ArrowBack +import androidx.compose.material.icons.filled.Menu import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults 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 @@ -52,25 +59,30 @@ class MainActivity : ComponentActivity() { @Composable fun MainContent(){ val context = LocalContext.current - Column() { + Column{ TopAppBar( - colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.background), + colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = MaterialTheme.colorScheme.primaryContainer), title = { Text(text = "CleverClass", - fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal))) + fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal)), + color = MaterialTheme.colorScheme.onPrimary) + }, + actions = { + IconButton(onClick = { /*TODO: menu*/ }) { + Icon(imageVector = Icons.Filled.Menu, + contentDescription = null, + modifier = Modifier.size(32.dp)) + } }, modifier = Modifier.fillMaxWidth() ) Column(modifier = Modifier.verticalScroll(rememberScrollState())) { - 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 = "...") + MainButton(onClick = { /*TODO: Stundenplan activity*/ }, color = Color(0xFFFF4081), text = "Stundenplan") + MainButton(onClick = { /*TODO: Noten activity*/ }, color = Color(0xFFFFAB40), text = "Noten") + MainButton(onClick = { switchToActivity(context, PSEActivity::class.java) }, color = Color(0xFF536DFE), text = "Periodensystem") + MainButton(onClick = { /*TODO: Mebis activity*/ }, color = Color(0xFFE040FB), text = "Mebis") + MainButton(onClick = { /*TODO: DSBmobile activity*/ }, color = Color(0xFFFF6E40), text = "DSBmobile") } } } diff --git a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt index c5c61ea..572ce00 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/PSEActivity.kt @@ -6,6 +6,7 @@ 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 @@ -21,6 +22,7 @@ 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 androidx.compose.ui.unit.dp import com.schoolapp.cleverclass.ui.theme.CleverClassTheme class PSEActivity : ComponentActivity() { @@ -43,7 +45,7 @@ class PSEActivity : ComponentActivity() { fun PSEContent(activity: ComponentActivity){ Column() { TopAppBar( - colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.background), + colors = TopAppBarDefaults.centerAlignedTopAppBarColors(MaterialTheme.colorScheme.primaryContainer), title = { Text(text = "Periodensystem", fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal)) @@ -53,7 +55,8 @@ fun PSEContent(activity: ComponentActivity){ IconButton(onClick = { activity.finish() }) { Icon( imageVector = Icons.Filled.ArrowBack, - contentDescription = null + contentDescription = null, + modifier = Modifier.size(28.dp) ) } }, diff --git a/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt b/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt index 333a180..2326888 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Color.kt @@ -2,10 +2,10 @@ package com.schoolapp.cleverclass.ui.theme import androidx.compose.ui.graphics.Color -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) +val Black100 = Color(0xFF000000) +val Black90 = Color(0xFF141414) +val Black70 = Color(0xFF1F1F1F) -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val White100 = Color(0xFFFFFFFF) +val White90 = Color(0xFFEBEBEB) +val White70 = Color(0xFFE0E0E0) \ No newline at end of file diff --git a/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt b/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt index 92dd3bb..69090a3 100644 --- a/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt +++ b/app/src/main/java/com/schoolapp/cleverclass/ui/theme/Theme.kt @@ -16,32 +16,22 @@ import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 + background = Black90, + primaryContainer = Black70, + onPrimary = White100 ) private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 - - /* Other default colors to override - background = Color(0xFFFFFBFE), - surface = Color(0xFFFFFBFE), - onPrimary = Color.White, - onSecondary = Color.White, - onTertiary = Color.White, - onBackground = Color(0xFF1C1B1F), - onSurface = Color(0xFF1C1B1F), - */ + background = White90, + primaryContainer = White70, + onPrimary = Black100 ) @Composable fun CleverClassTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ - dynamicColor: Boolean = true, + dynamicColor: Boolean = false, content: @Composable () -> Unit ) { val colorScheme = when {