Better align icons, remove install button text

This commit is contained in:
Vendicated 2021-11-11 00:57:55 +01:00
parent 8698ac687c
commit 7a45d2834d
No known key found for this signature in database
GPG key ID: EC781ADFB93EFFA3
4 changed files with 32 additions and 15 deletions

View file

@ -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),

View file

@ -94,7 +94,12 @@ fun CommitsList(selectedCommit: MutableState<String?>, 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<CommitData>, private val dark: Boolean) : RecyclerView.Adapter<CommitsAdapter.ViewHolder>() {

View file

@ -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)
}
}
}

View file

@ -3,7 +3,12 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#ffffff"
android:pathData="M10.5,4.5c0.28,0 0.5,0.22 0.5,0.5v2h6v6h2c0.28,0 0.5,0.22 0.5,0.5s-0.22,0.5 -0.5,0.5h-2v6h-2.12c-0.68,-1.75 -2.39,-3 -4.38,-3s-3.7,1.25 -4.38,3H4v-2.12c1.75,-0.68 3,-2.39 3,-4.38 0,-1.99 -1.24,-3.7 -2.99,-4.38L4,7h6V5c0,-0.28 0.22,-0.5 0.5,-0.5m0,-2C9.12,2.5 8,3.62 8,5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8h0.29c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-0.3c0,-1.49 1.21,-2.7 2.7,-2.7s2.7,1.21 2.7,2.7v0.3H17c1.1,0 2,-0.9 2,-2v-4c1.38,0 2.5,-1.12 2.5,-2.5S20.38,11 19,11V7c0,-1.1 -0.9,-2 -2,-2h-4c0,-1.38 -1.12,-2.5 -2.5,-2.5z" />
<group>
<path
android:fillColor="#ffffff"
android:pathData="M 20.835 11.512 L 19.37 11.512 L 19.37 7.607 C 19.37 6.533 18.492 5.655 17.418 5.655 L 13.513 5.655 L 13.513 4.19 C 13.513 2.824 12.439 1.75 11.073 1.75 C 9.706 1.75 8.632 2.824 8.632 4.19 L 8.632 5.655 L 4.727 5.655 C 3.654 5.655 2.775 6.533 2.775 7.607 L 2.775 11.317 L 4.239 11.317 C 5.704 11.317 6.875 12.488 6.875 13.952 C 6.875 15.417 5.704 16.588 4.239 16.588 L 2.775 16.588 L 2.775 20.298 C 2.775 21.371 3.654 22.25 4.727 22.25 L 8.437 22.25 L 8.437 20.786 C 8.437 19.321 9.608 18.15 11.073 18.15 C 12.537 18.15 13.708 19.321 13.708 20.786 L 13.708 22.25 L 17.418 22.25 C 18.492 22.25 19.37 21.371 19.37 20.298 L 19.37 16.393 L 20.835 16.393 C 22.201 16.393 23.275 15.319 23.275 13.952 C 23.275 12.586 22.201 11.512 20.835 11.512 Z" />
<group>
</group>
</group>
</vector>