Added colors to icons in changed files
This commit is contained in:
parent
265d4647ab
commit
ce3677681e
@ -209,7 +209,7 @@ fun CommitLogChanges(diffEntries: List<DiffEntry>, onDiffSelected: (DiffEntry) -
|
||||
.size(16.dp),
|
||||
imageVector = diffEntry.icon,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colors.primary,
|
||||
tint = diffEntry.iconColor,
|
||||
)
|
||||
|
||||
Text(
|
||||
|
@ -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(
|
||||
|
@ -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() {
|
||||
@ -27,3 +32,16 @@ val DiffEntry.icon: ImageVector
|
||||
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")
|
||||
}
|
||||
}
|
@ -17,3 +17,7 @@ val accentGrayLight = Color(0xFFCCCCCC)
|
||||
val backgroundColorLight = Color(0xFFEBEFF7)
|
||||
val surfaceColorLight = Color(0xFFFFFFFF)
|
||||
val headerBackgroundLight = Color(0xFFF4F6FA)
|
||||
|
||||
val addFileLight = Color(0xFF32A852)
|
||||
val deleteFileLight = errorColor
|
||||
val modifyFileLight = primary
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user