UI improvements

This commit is contained in:
Abdelilah El Aissaoui 2022-01-31 15:15:05 +01:00
parent d3c1664f45
commit 6ca1e15ce8
9 changed files with 31 additions and 15 deletions

View File

@ -10,7 +10,7 @@ val mainText = Color(0xFF212934)
val mainTextDark = Color(0xFFFFFFFF) val mainTextDark = Color(0xFFFFFFFF)
val secondaryText = Color(0xFF595858) val secondaryText = Color(0xFF595858)
val secondaryTextDark = Color(0xFFCCCBCB) val secondaryTextDark = Color(0xFFCCCBCB)
val errorColor = Color(0xFFFA4B4B) val errorColor = Color(0xFFc93838)
val primaryGrayLight = Color(0xFF464646) val primaryGrayLight = Color(0xFF464646)
val accentGrayLight = Color(0xFFCCCCCC) val accentGrayLight = Color(0xFFCCCCCC)
@ -26,4 +26,4 @@ val deleteFileLight = errorColor
val modifyFileLight = primary val modifyFileLight = primary
val conflictFileLight = Color(0xFFFFB638) val conflictFileLight = Color(0xFFFFB638)
val dialogBackgroundColor = Color(0xAA000000) val dialogBackgroundColor = Color(0xAA000000)

View File

@ -13,6 +13,7 @@ private val DarkColorPalette = darkColors(
secondary = secondary, secondary = secondary,
surface = surfaceColorDark, surface = surfaceColorDark,
background = backgroundColorDark, background = backgroundColorDark,
error = errorColor
) )
private val LightColorPalette = lightColors( private val LightColorPalette = lightColors(
@ -101,6 +102,14 @@ val Colors.tabColorActive: Color
val Colors.tabColorInactive: Color val Colors.tabColorInactive: Color
get() = if (isLight) backgroundColorLight else backgroundColorDark get() = if (isLight) backgroundColorLight else backgroundColorDark
val Colors.stageButton: Color
get() = if (isLight) primary else primaryDark
val Colors.unstageButton: Color
get() = error
enum class Themes(val displayName: String) { enum class Themes(val displayName: String) {
LIGHT("Light"), LIGHT("Light"),

View File

@ -63,7 +63,7 @@ fun CommitChangesView(
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(8.dp), .padding(horizontal = 8.dp),
) { ) {
SelectionContainer { SelectionContainer {
Text( Text(

View File

@ -24,6 +24,8 @@ import app.git.diff.Hunk
import app.git.diff.Line import app.git.diff.Line
import app.git.diff.LineType import app.git.diff.LineType
import app.theme.primaryTextColor import app.theme.primaryTextColor
import app.theme.stageButton
import app.theme.unstageButton
import app.ui.components.ScrollableLazyColumn import app.ui.components.ScrollableLazyColumn
import app.ui.components.SecondaryButton import app.ui.components.SecondaryButton
import app.viewmodels.DiffViewModel import app.viewmodels.DiffViewModel
@ -213,10 +215,10 @@ fun HunkHeader(
val color: Color val color: Color
if (diffEntryType is DiffEntryType.StagedDiff) { if (diffEntryType is DiffEntryType.StagedDiff) {
buttonText = "Unstage hunk" buttonText = "Unstage hunk"
color = MaterialTheme.colors.error color = MaterialTheme.colors.unstageButton
} else { } else {
buttonText = "Stage hunk" buttonText = "Stage hunk"
color = MaterialTheme.colors.primary color = MaterialTheme.colors.stageButton
} }
SecondaryButton( SecondaryButton(

View File

@ -1,6 +1,8 @@
package app.ui package app.ui
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -87,6 +89,10 @@ fun RepositoryOpenPage(tabViewModel: TabViewModel) {
Box( Box(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.border(
width = 2.dp,
color = MaterialTheme.colors.primary,
)
) { ) {
when (diffSelected) { when (diffSelected) {
null -> { null -> {

View File

@ -28,9 +28,7 @@ import app.extensions.filePath
import app.extensions.isMerging import app.extensions.isMerging
import app.git.DiffEntryType import app.git.DiffEntryType
import app.git.StatusEntry import app.git.StatusEntry
import app.theme.headerBackground import app.theme.*
import app.theme.headerText
import app.theme.primaryTextColor
import app.ui.components.ScrollableLazyColumn import app.ui.components.ScrollableLazyColumn
import app.ui.components.SecondaryButton import app.ui.components.SecondaryButton
import app.viewmodels.StageStatus import app.viewmodels.StageStatus
@ -91,13 +89,13 @@ fun UncommitedChanges(
EntriesList( EntriesList(
modifier = Modifier modifier = Modifier
.padding(8.dp) .padding(start = 8.dp, end = 8.dp, bottom = 4.dp)
.weight(5f) .weight(5f)
.fillMaxWidth(), .fillMaxWidth(),
title = "Staged", title = "Staged",
allActionTitle = "Unstage all", allActionTitle = "Unstage all",
actionTitle = "Unstage", actionTitle = "Unstage",
actionColor = MaterialTheme.colors.error, actionColor = MaterialTheme.colors.unstageButton,
diffEntries = staged, diffEntries = staged,
onDiffEntrySelected = onStagedDiffEntrySelected, onDiffEntrySelected = onStagedDiffEntrySelected,
onDiffEntryOptionSelected = { onDiffEntryOptionSelected = {
@ -113,12 +111,12 @@ fun UncommitedChanges(
EntriesList( EntriesList(
modifier = Modifier modifier = Modifier
.padding(8.dp) .padding(start = 8.dp, end = 8.dp, top = 4.dp)
.weight(5f) .weight(5f)
.fillMaxWidth(), .fillMaxWidth(),
title = "Unstaged", title = "Unstaged",
actionTitle = "Stage", actionTitle = "Stage",
actionColor = MaterialTheme.colors.primary, actionColor = MaterialTheme.colors.stageButton,
diffEntries = unstaged, diffEntries = unstaged,
onDiffEntrySelected = onUnstagedDiffEntrySelected, onDiffEntrySelected = onUnstagedDiffEntrySelected,
onDiffEntryOptionSelected = { onDiffEntryOptionSelected = {

View File

@ -141,7 +141,7 @@ fun Tab(title: MutableState<String>, selected: Boolean, onClick: () -> Unit, onC
.width(180.dp) .width(180.dp)
.shadow(elevation = elevation) .shadow(elevation = elevation)
.padding(start = 2.dp, end = 2.dp, top = 2.dp) .padding(start = 2.dp, end = 2.dp, top = 2.dp)
.clip(RoundedCornerShape(topStart = 5.dp, topEnd = 5.dp)) .clip(RoundedCornerShape(topStart = 8.dp, topEnd = 8.dp))
.clickable { onClick() } .clickable { onClick() }
.background(backgroundColor), .background(backgroundColor),
) { ) {

View File

@ -14,11 +14,13 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import app.theme.primaryTextColor
@Composable @Composable
fun SecondaryButton( fun SecondaryButton(
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
text: String, text: String,
textColor: Color = Color.White,
backgroundButton: Color, backgroundButton: Color,
onClick: () -> Unit, onClick: () -> Unit,
) { ) {
@ -32,7 +34,7 @@ fun SecondaryButton(
Text( Text(
text = text, text = text,
fontSize = 12.sp, fontSize = 12.sp,
color = MaterialTheme.colors.contentColorFor(backgroundButton), color = textColor,
modifier = Modifier.padding(vertical = 4.dp, horizontal = 16.dp) modifier = Modifier.padding(vertical = 4.dp, horizontal = 16.dp)
) )
} }

View File

@ -106,7 +106,6 @@ fun Log(
Column( Column(
modifier = Modifier modifier = Modifier
.padding(8.dp)
.background(MaterialTheme.colors.background) .background(MaterialTheme.colors.background)
.fillMaxSize() .fillMaxSize()
) { ) {