diff --git a/src/main/kotlin/app/theme/Color.kt b/src/main/kotlin/app/theme/Color.kt index 6cee88f..efa866e 100644 --- a/src/main/kotlin/app/theme/Color.kt +++ b/src/main/kotlin/app/theme/Color.kt @@ -14,6 +14,7 @@ val lightTheme = ColorsScheme( background = Color(0xFFFFFFFF), backgroundSelected = Color(0xC0cee1f2), surface = Color(0xFFe9ecf7), + secondarySurface = Color(0xFFedeef2), headerBackground = Color(0xFFF4F6FA), borderColor = Color(0xFF989898), graphHeaderBackground = Color(0xFFF4F6FA), @@ -39,6 +40,7 @@ val darkBlueTheme = ColorsScheme( background = Color(0xFF0E1621), backgroundSelected = Color(0xFF2f3640), surface = Color(0xFF182533), + secondarySurface = Color(0xFF1a2c40), headerBackground = Color(0xFF0a335c), borderColor = Color(0xFF989898), graphHeaderBackground = Color(0xFF303132), @@ -63,6 +65,7 @@ val darkGrayTheme = ColorsScheme( background = Color(0xFF16181F), backgroundSelected = Color(0xFF32373e), surface = Color(0xFF212731), + secondarySurface = Color(0xFF282d36), headerBackground = Color(0xFF21303d), borderColor = Color(0xFF989898), graphHeaderBackground = Color(0xFF303132), diff --git a/src/main/kotlin/app/theme/ColorsScheme.kt b/src/main/kotlin/app/theme/ColorsScheme.kt index a8a7cd1..32888a1 100644 --- a/src/main/kotlin/app/theme/ColorsScheme.kt +++ b/src/main/kotlin/app/theme/ColorsScheme.kt @@ -15,6 +15,7 @@ data class ColorsScheme( val background: Color, val backgroundSelected: Color, val surface: Color, + val secondarySurface: Color, val headerBackground: Color, val onHeader: Color = primaryText, val borderColor: Color, diff --git a/src/main/kotlin/app/theme/Theme.kt b/src/main/kotlin/app/theme/Theme.kt index 885d9e4..a1be801 100644 --- a/src/main/kotlin/app/theme/Theme.kt +++ b/src/main/kotlin/app/theme/Theme.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import app.DropDownOption -private var appTheme: ColorsScheme = darkGrayTheme +private var appTheme: ColorsScheme = darkBlueTheme @Composable fun AppTheme(selectedTheme: Themes = Themes.DARK, content: @Composable() () -> Unit) { @@ -86,6 +86,9 @@ val Colors.scrollbarNormal: Color val Colors.scrollbarHover: Color get() = appTheme.hoverScrollbar +val Colors.secondarySurface: Color + get() = appTheme.secondarySurface + val Colors.dialogOverlay: Color get() = appTheme.dialogOverlay diff --git a/src/main/kotlin/app/ui/Blame.kt b/src/main/kotlin/app/ui/Blame.kt index 78c80b6..47bc44f 100644 --- a/src/main/kotlin/app/ui/Blame.kt +++ b/src/main/kotlin/app/ui/Blame.kt @@ -34,6 +34,7 @@ import app.extensions.lineAt import app.extensions.toStringWithSpaces import app.theme.headerBackground import app.theme.primaryTextColor +import app.theme.secondarySurface import app.ui.components.PrimaryButton import app.ui.components.ScrollableLazyColumn import org.eclipse.jgit.blame.BlameResult @@ -96,7 +97,7 @@ fun Blame( modifier = Modifier .width(200.dp) .fillMaxHeight() - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.secondarySurface) .handMouseClickable { if (commit != null) onSelectCommit(commit) }, verticalArrangement = Arrangement.Center, ) { @@ -136,7 +137,7 @@ private fun LineNumber(line: Int, highestLineLength: Int) { Box( modifier = Modifier .fillMaxHeight() - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.secondarySurface) .padding(start = 4.dp, end = 4.dp), contentAlignment = Alignment.Center ) { diff --git a/src/main/kotlin/app/ui/Diff.kt b/src/main/kotlin/app/ui/Diff.kt index 32c802b..408471f 100644 --- a/src/main/kotlin/app/ui/Diff.kt +++ b/src/main/kotlin/app/ui/Diff.kt @@ -42,10 +42,7 @@ import app.git.diff.DiffResult import app.git.diff.Hunk import app.git.diff.Line import app.git.diff.LineType -import app.theme.headerBackground -import app.theme.primaryTextColor -import app.theme.stageButton -import app.theme.unstageButton +import app.theme.* import app.ui.components.ScrollableLazyColumn import app.ui.components.SecondaryButton import app.viewmodels.DiffViewModel @@ -267,7 +264,7 @@ fun HunkHeader( ) { Row( modifier = Modifier - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.secondarySurface) .padding(horizontal = 8.dp, vertical = 4.dp) .fillMaxWidth(), verticalAlignment = Alignment.CenterVertically @@ -398,7 +395,6 @@ fun DiffLine( } Row( modifier = Modifier - .padding(horizontal = 8.dp) .background(backgroundColor) .height(IntrinsicSize.Min) ) { @@ -445,7 +441,7 @@ fun LineNumber(text: String) { text = text, color = MaterialTheme.colors.primaryTextColor, modifier = Modifier - .background(MaterialTheme.colors.surface) + .background(MaterialTheme.colors.secondarySurface) .fillMaxHeight() .padding(horizontal = 4.dp), fontFamily = FontFamily.Monospace,