mat.mey/CleverClass
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Type.kt

Browse Source 
Change settings button on Main-screen
Add SettingsActivity
Add AboutActivity
This commit is contained in:
BuildTools
2024-03-20 21:12:51 +01:00
parent 497548bd32
commit 3fc3b58152
8 changed files with 250 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/com/schoolapp/cleverclass/MainActivity.kt
View File

@@ -11,13 +11,11 @@ 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.material.icons.filled.Settings
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -32,11 +30,7 @@ import androidx.compose.runtime.Composable
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
class MainActivity : ComponentActivity() {
@@ -59,19 +53,22 @@ class MainActivity : ComponentActivity() {
@Composable
fun MainContent(){
val context = LocalContext.current
Column{
TopAppBar(
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(containerColor = MaterialTheme.colorScheme.primaryContainer),
title = {
Text(text = "CleverClass",
fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal)),
style = MaterialTheme.typography.headlineMedium,
color = MaterialTheme.colorScheme.onPrimary)
},
actions = {
IconButton(onClick = { /*TODO: menu*/ }) {
Icon(imageVector = Icons.Filled.Menu,
IconButton(
onClick = { switchToActivity(context, SettingsActivity::class.java) }) {
Icon(
imageVector = Icons.Filled.Settings,
contentDescription = null,
modifier = Modifier.size(32.dp))
modifier = Modifier.size(28.dp))
}
},
modifier = Modifier.fillMaxWidth()
@@ -102,8 +99,7 @@ fun MainButton(onClick: () -> Unit, color : Color, text : String) {
) {
Text(text,
color = MaterialTheme.colorScheme.background,
fontFamily = FontFamily(Font(R.font.arlrdbd, FontWeight.Normal)),
fontSize = 20.sp)
style = MaterialTheme.typography.labelMedium)
}
}