diff --git a/src/main/kotlin/CommitChanges.kt b/src/main/kotlin/CommitChanges.kt index 9d00701..4b77bb2 100644 --- a/src/main/kotlin/CommitChanges.kt +++ b/src/main/kotlin/CommitChanges.kt @@ -209,7 +209,7 @@ fun CommitLogChanges(diffEntries: List, onDiffSelected: (DiffEntry) - .size(16.dp), imageVector = diffEntry.icon, contentDescription = null, - tint = MaterialTheme.colors.primary, + tint = diffEntry.iconColor, ) Text( diff --git a/src/main/kotlin/UncommitedChanges.kt b/src/main/kotlin/UncommitedChanges.kt index 50d326b..5feb8e7 100644 --- a/src/main/kotlin/UncommitedChanges.kt +++ b/src/main/kotlin/UncommitedChanges.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import extensions.filePath import extensions.icon +import extensions.iconColor import git.StageStatus import org.eclipse.jgit.diff.DiffEntry import theme.headerBackground @@ -247,7 +248,7 @@ private fun FileEntry( modifier = Modifier .padding(horizontal = 8.dp) .size(16.dp), - tint = MaterialTheme.colors.primary, + tint = diffEntry.iconColor, ) Text( diff --git a/src/main/kotlin/extensions/DiffEntryExtensions.kt b/src/main/kotlin/extensions/DiffEntryExtensions.kt index eb6b834..2d96389 100644 --- a/src/main/kotlin/extensions/DiffEntryExtensions.kt +++ b/src/main/kotlin/extensions/DiffEntryExtensions.kt @@ -1,12 +1,17 @@ package extensions +import androidx.compose.material.MaterialTheme import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Edit import androidx.compose.material.icons.filled.Refresh +import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import org.eclipse.jgit.diff.DiffEntry +import theme.addFile +import theme.modifyFile val DiffEntry.filePath: String get() { @@ -26,4 +31,17 @@ val DiffEntry.icon: ImageVector DiffEntry.ChangeType.RENAME -> Icons.Default.Refresh else -> throw NotImplementedError("Unexpected ChangeType") } + } + +val DiffEntry.iconColor: Color + @Composable + get() { + return when (this.changeType) { + DiffEntry.ChangeType.ADD -> MaterialTheme.colors.addFile + DiffEntry.ChangeType.MODIFY -> MaterialTheme.colors.modifyFile + DiffEntry.ChangeType.DELETE -> MaterialTheme.colors.error + DiffEntry.ChangeType.COPY -> MaterialTheme.colors.addFile + DiffEntry.ChangeType.RENAME -> MaterialTheme.colors.modifyFile + else -> throw NotImplementedError("Unexpected ChangeType") + } } \ No newline at end of file diff --git a/src/main/kotlin/theme/Color.kt b/src/main/kotlin/theme/Color.kt index 04eefdb..617b777 100644 --- a/src/main/kotlin/theme/Color.kt +++ b/src/main/kotlin/theme/Color.kt @@ -16,4 +16,8 @@ val accentGrayLight = Color(0xFFCCCCCC) val backgroundColorLight = Color(0xFFEBEFF7) val surfaceColorLight = Color(0xFFFFFFFF) -val headerBackgroundLight = Color(0xFFF4F6FA) \ No newline at end of file +val headerBackgroundLight = Color(0xFFF4F6FA) + +val addFileLight = Color(0xFF32A852) +val deleteFileLight = errorColor +val modifyFileLight = primary \ No newline at end of file diff --git a/src/main/kotlin/theme/Theme.kt b/src/main/kotlin/theme/Theme.kt index b59baf9..13811cd 100644 --- a/src/main/kotlin/theme/Theme.kt +++ b/src/main/kotlin/theme/Theme.kt @@ -59,3 +59,15 @@ val Colors.accentGray: Color @get:Composable val Colors.headerBackground: Color get() = headerBackgroundLight + +@get:Composable +val Colors.addFile: Color + get() = addFileLight + +@get:Composable +val Colors.deleteFile: Color + get() = deleteFileLight + +@get:Composable +val Colors.modifyFile: Color + get() = modifyFileLight