diff --git a/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt b/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt index 5f2bd60..f66a188 100644 --- a/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt @@ -23,6 +23,7 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.HorizontalAlignmentLine import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -44,6 +45,7 @@ import com.google.accompanist.permissions.PermissionRequired import com.google.accompanist.permissions.PermissionState import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.systemuicontroller.rememberSystemUiController +import org.intellij.lang.annotations.JdkConstants class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -92,16 +94,23 @@ fun MainActivityLayout() { actions = { if (route != Screen.Home.route) return@TopAppBar val context = LocalContext.current - IconButton(onClick = { context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://discord.gg/${BuildConfig.SUPPORT_SERVER}"))) }) { + IconButton( + onClick = { context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://discord.gg/${BuildConfig.SUPPORT_SERVER}"))) }, + ) { Icon( painter = painterResource(R.drawable.ic_discord), contentDescription = stringResource(R.string.support_server), tint = MaterialTheme.colors.onPrimary ) } - IconButton(onClick = { navController.navigate(Screen.Plugins.route) { - popUpTo(Screen.Home.route) { saveState = true } - } }) { + IconButton( + onClick = { + navController.navigate(Screen.Plugins.route) { + popUpTo(Screen.Home.route) { saveState = true } + } + }, + modifier = Modifier.padding(bottom = 2.dp, start = 8.dp) // Make up for icon being off center + ) { Icon( painter = painterResource(R.drawable.ic_plugin_24dp), contentDescription = stringResource(id = R.string.launch_plugins), diff --git a/app/src/main/java/com/aliucord/manager/ui/components/CommitsList.kt b/app/src/main/java/com/aliucord/manager/ui/components/CommitsList.kt index 5a2d245..8bd569a 100644 --- a/app/src/main/java/com/aliucord/manager/ui/components/CommitsList.kt +++ b/app/src/main/java/com/aliucord/manager/ui/components/CommitsList.kt @@ -94,7 +94,12 @@ fun CommitsList(selectedCommit: MutableState, modifier: Modifier = Modi @Composable private fun CommitsHeader() { - Text(stringResource(R.string.commits), style = MaterialTheme.typography.subtitle1) + Text( + stringResource(R.string.commits), + style = MaterialTheme.typography.subtitle1, + color = MaterialTheme.colors.primary, + modifier = Modifier.padding(bottom = 6.dp) + ) } private class CommitsAdapter(private val commits: List, private val dark: Boolean) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt b/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt index ae14a81..00f4f24 100644 --- a/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt +++ b/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt @@ -5,13 +5,12 @@ package com.aliucord.manager.ui.screens -import android.content.pm.PackageManager import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* -import androidx.compose.material.icons.Icons import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -60,9 +59,9 @@ fun HomeScreen() { Column(modifier = Modifier.padding(8.dp)) { Card(modifier = Modifier.padding(bottom = 8.dp)) { - Row(modifier = Modifier.padding(16.dp).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { + Row(modifier = Modifier.padding(16.dp).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) { Column { - Text("Aliucord") + Text("Aliucord", style = MaterialTheme.typography.h5, color = MaterialTheme.colors.primary) Text(buildAnnotatedString { append("Supported version: ") withStyle(SpanStyle(fontWeight = FontWeight.Bold)) { @@ -83,7 +82,7 @@ fun HomeScreen() { ) -> R.drawable.ic_reinstall_24dp to R.string.reinstall else -> R.drawable.ic_update_24dp to R.string.update } - TextButton(onClick = { /* TODO */ }) { + IconButton(onClick = { /* TODO */ }) { Icon( painter = painterResource(drawable), contentDescription = stringResource(description), @@ -91,9 +90,8 @@ fun HomeScreen() { modifier = Modifier .padding(end = 8.dp) .background(MaterialTheme.colors.primary, CircleShape) - .padding(6.dp) + .padding(7.dp) ) - Text(stringResource(description), color = MaterialTheme.colors.primary) } } } diff --git a/app/src/main/res/drawable/ic_plugin_24dp.xml b/app/src/main/res/drawable/ic_plugin_24dp.xml index 34f0422..2a2f4e3 100644 --- a/app/src/main/res/drawable/ic_plugin_24dp.xml +++ b/app/src/main/res/drawable/ic_plugin_24dp.xml @@ -3,7 +3,12 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + + + + + + \ No newline at end of file