Added secondary surface color
This commit is contained in:
parent
9b876f05f0
commit
bc56ad834a
@ -14,6 +14,7 @@ val lightTheme = ColorsScheme(
|
|||||||
background = Color(0xFFFFFFFF),
|
background = Color(0xFFFFFFFF),
|
||||||
backgroundSelected = Color(0xC0cee1f2),
|
backgroundSelected = Color(0xC0cee1f2),
|
||||||
surface = Color(0xFFe9ecf7),
|
surface = Color(0xFFe9ecf7),
|
||||||
|
secondarySurface = Color(0xFFedeef2),
|
||||||
headerBackground = Color(0xFFF4F6FA),
|
headerBackground = Color(0xFFF4F6FA),
|
||||||
borderColor = Color(0xFF989898),
|
borderColor = Color(0xFF989898),
|
||||||
graphHeaderBackground = Color(0xFFF4F6FA),
|
graphHeaderBackground = Color(0xFFF4F6FA),
|
||||||
@ -39,6 +40,7 @@ val darkBlueTheme = ColorsScheme(
|
|||||||
background = Color(0xFF0E1621),
|
background = Color(0xFF0E1621),
|
||||||
backgroundSelected = Color(0xFF2f3640),
|
backgroundSelected = Color(0xFF2f3640),
|
||||||
surface = Color(0xFF182533),
|
surface = Color(0xFF182533),
|
||||||
|
secondarySurface = Color(0xFF1a2c40),
|
||||||
headerBackground = Color(0xFF0a335c),
|
headerBackground = Color(0xFF0a335c),
|
||||||
borderColor = Color(0xFF989898),
|
borderColor = Color(0xFF989898),
|
||||||
graphHeaderBackground = Color(0xFF303132),
|
graphHeaderBackground = Color(0xFF303132),
|
||||||
@ -63,6 +65,7 @@ val darkGrayTheme = ColorsScheme(
|
|||||||
background = Color(0xFF16181F),
|
background = Color(0xFF16181F),
|
||||||
backgroundSelected = Color(0xFF32373e),
|
backgroundSelected = Color(0xFF32373e),
|
||||||
surface = Color(0xFF212731),
|
surface = Color(0xFF212731),
|
||||||
|
secondarySurface = Color(0xFF282d36),
|
||||||
headerBackground = Color(0xFF21303d),
|
headerBackground = Color(0xFF21303d),
|
||||||
borderColor = Color(0xFF989898),
|
borderColor = Color(0xFF989898),
|
||||||
graphHeaderBackground = Color(0xFF303132),
|
graphHeaderBackground = Color(0xFF303132),
|
||||||
|
@ -15,6 +15,7 @@ data class ColorsScheme(
|
|||||||
val background: Color,
|
val background: Color,
|
||||||
val backgroundSelected: Color,
|
val backgroundSelected: Color,
|
||||||
val surface: Color,
|
val surface: Color,
|
||||||
|
val secondarySurface: Color,
|
||||||
val headerBackground: Color,
|
val headerBackground: Color,
|
||||||
val onHeader: Color = primaryText,
|
val onHeader: Color = primaryText,
|
||||||
val borderColor: Color,
|
val borderColor: Color,
|
||||||
|
@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
import app.DropDownOption
|
import app.DropDownOption
|
||||||
|
|
||||||
private var appTheme: ColorsScheme = darkGrayTheme
|
private var appTheme: ColorsScheme = darkBlueTheme
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun AppTheme(selectedTheme: Themes = Themes.DARK, content: @Composable() () -> Unit) {
|
fun AppTheme(selectedTheme: Themes = Themes.DARK, content: @Composable() () -> Unit) {
|
||||||
@ -86,6 +86,9 @@ val Colors.scrollbarNormal: Color
|
|||||||
val Colors.scrollbarHover: Color
|
val Colors.scrollbarHover: Color
|
||||||
get() = appTheme.hoverScrollbar
|
get() = appTheme.hoverScrollbar
|
||||||
|
|
||||||
|
val Colors.secondarySurface: Color
|
||||||
|
get() = appTheme.secondarySurface
|
||||||
|
|
||||||
val Colors.dialogOverlay: Color
|
val Colors.dialogOverlay: Color
|
||||||
get() = appTheme.dialogOverlay
|
get() = appTheme.dialogOverlay
|
||||||
|
|
||||||
|
@ -34,6 +34,7 @@ import app.extensions.lineAt
|
|||||||
import app.extensions.toStringWithSpaces
|
import app.extensions.toStringWithSpaces
|
||||||
import app.theme.headerBackground
|
import app.theme.headerBackground
|
||||||
import app.theme.primaryTextColor
|
import app.theme.primaryTextColor
|
||||||
|
import app.theme.secondarySurface
|
||||||
import app.ui.components.PrimaryButton
|
import app.ui.components.PrimaryButton
|
||||||
import app.ui.components.ScrollableLazyColumn
|
import app.ui.components.ScrollableLazyColumn
|
||||||
import org.eclipse.jgit.blame.BlameResult
|
import org.eclipse.jgit.blame.BlameResult
|
||||||
@ -96,7 +97,7 @@ fun Blame(
|
|||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.width(200.dp)
|
.width(200.dp)
|
||||||
.fillMaxHeight()
|
.fillMaxHeight()
|
||||||
.background(MaterialTheme.colors.surface)
|
.background(MaterialTheme.colors.secondarySurface)
|
||||||
.handMouseClickable { if (commit != null) onSelectCommit(commit) },
|
.handMouseClickable { if (commit != null) onSelectCommit(commit) },
|
||||||
verticalArrangement = Arrangement.Center,
|
verticalArrangement = Arrangement.Center,
|
||||||
) {
|
) {
|
||||||
@ -136,7 +137,7 @@ private fun LineNumber(line: Int, highestLineLength: Int) {
|
|||||||
Box(
|
Box(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.fillMaxHeight()
|
.fillMaxHeight()
|
||||||
.background(MaterialTheme.colors.surface)
|
.background(MaterialTheme.colors.secondarySurface)
|
||||||
.padding(start = 4.dp, end = 4.dp),
|
.padding(start = 4.dp, end = 4.dp),
|
||||||
contentAlignment = Alignment.Center
|
contentAlignment = Alignment.Center
|
||||||
) {
|
) {
|
||||||
|
@ -42,10 +42,7 @@ import app.git.diff.DiffResult
|
|||||||
import app.git.diff.Hunk
|
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.headerBackground
|
import app.theme.*
|
||||||
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
|
||||||
@ -267,7 +264,7 @@ fun HunkHeader(
|
|||||||
) {
|
) {
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.background(MaterialTheme.colors.surface)
|
.background(MaterialTheme.colors.secondarySurface)
|
||||||
.padding(horizontal = 8.dp, vertical = 4.dp)
|
.padding(horizontal = 8.dp, vertical = 4.dp)
|
||||||
.fillMaxWidth(),
|
.fillMaxWidth(),
|
||||||
verticalAlignment = Alignment.CenterVertically
|
verticalAlignment = Alignment.CenterVertically
|
||||||
@ -398,7 +395,6 @@ fun DiffLine(
|
|||||||
}
|
}
|
||||||
Row(
|
Row(
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(horizontal = 8.dp)
|
|
||||||
.background(backgroundColor)
|
.background(backgroundColor)
|
||||||
.height(IntrinsicSize.Min)
|
.height(IntrinsicSize.Min)
|
||||||
) {
|
) {
|
||||||
@ -445,7 +441,7 @@ fun LineNumber(text: String) {
|
|||||||
text = text,
|
text = text,
|
||||||
color = MaterialTheme.colors.primaryTextColor,
|
color = MaterialTheme.colors.primaryTextColor,
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.background(MaterialTheme.colors.surface)
|
.background(MaterialTheme.colors.secondarySurface)
|
||||||
.fillMaxHeight()
|
.fillMaxHeight()
|
||||||
.padding(horizontal = 4.dp),
|
.padding(horizontal = 4.dp),
|
||||||
fontFamily = FontFamily.Monospace,
|
fontFamily = FontFamily.Monospace,
|
||||||
|
Loading…
Reference in New Issue
Block a user