From 47d1e89af2e64e67a05e5b648302d2403389aefb Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Sat, 22 Oct 2022 22:19:37 +0200 Subject: [PATCH] Renamed colors properties --- .../kotlin/com/jetpackduba/gitnuro/App.kt | 20 ++++++++++++-- .../com/jetpackduba/gitnuro/git/TabState.kt | 4 +++ .../com/jetpackduba/gitnuro/theme/Color.kt | 21 +++++++-------- .../jetpackduba/gitnuro/theme/ColorsScheme.kt | 12 ++++----- .../gitnuro/theme/ComponentsColors.kt | 2 +- .../com/jetpackduba/gitnuro/theme/Theme.kt | 27 +++++-------------- .../com/jetpackduba/gitnuro/ui/Blame.kt | 4 +-- .../com/jetpackduba/gitnuro/ui/Branches.kt | 4 +-- .../jetpackduba/gitnuro/ui/CommitChanges.kt | 12 ++++----- .../com/jetpackduba/gitnuro/ui/FileHistory.kt | 10 +++---- .../com/jetpackduba/gitnuro/ui/Submodules.kt | 4 +-- .../gitnuro/ui/UncommitedChanges.kt | 6 ++--- .../com/jetpackduba/gitnuro/ui/WelcomePage.kt | 6 ++--- .../gitnuro/ui/components/SideMenuEntry.kt | 4 +-- .../gitnuro/ui/context_menu/ContextMenu.kt | 4 +-- .../gitnuro/ui/dialogs/EditRemotesDialog.kt | 6 ++--- .../gitnuro/ui/dialogs/NewBranchDialog.kt | 4 +-- .../gitnuro/ui/dialogs/NewTagDialog.kt | 4 +-- .../gitnuro/ui/dialogs/PasswordDialog.kt | 4 +-- .../gitnuro/ui/dialogs/ResetDialog.kt | 6 ++--- .../ui/dialogs/StashWithMessageDialog.kt | 4 +-- .../ui/dialogs/settings/SettingsDialog.kt | 2 +- .../com/jetpackduba/gitnuro/ui/diff/Diff.kt | 4 +-- .../com/jetpackduba/gitnuro/ui/log/Log.kt | 12 ++++----- 24 files changed, 94 insertions(+), 92 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/App.kt b/src/main/kotlin/com/jetpackduba/gitnuro/App.kt index 30d5818..188436d 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/App.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/App.kt @@ -10,6 +10,12 @@ import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.input.key.Key +import androidx.compose.ui.input.key.KeyShortcut import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.Density @@ -26,15 +32,17 @@ import com.jetpackduba.gitnuro.logging.printLog import com.jetpackduba.gitnuro.preferences.AppSettings import com.jetpackduba.gitnuro.theme.AppTheme import com.jetpackduba.gitnuro.theme.Theme -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.AppTab import com.jetpackduba.gitnuro.ui.components.RepositoriesTabPanel import com.jetpackduba.gitnuro.ui.components.TabInformation import com.jetpackduba.gitnuro.ui.components.emptyTabInformation +import com.jetpackduba.gitnuro.ui.context_menu.Separator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import javax.inject.Inject +import androidx.compose.ui.window.MenuBar private const val TAG = "App" @@ -255,7 +263,15 @@ fun LoadingRepository(repoPath: String) { ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text("Opening repository", fontSize = 36.sp, color = MaterialTheme.colors.onBackground) - Text(repoPath, fontSize = 24.sp, color = MaterialTheme.colors.secondaryTextColor) + Text(repoPath, fontSize = 24.sp, color = MaterialTheme.colors.onBackgroundSecondary) } } } + +object AboutIcon : Painter() { + override val intrinsicSize = Size(256f, 256f) + + override fun DrawScope.onDraw() { + drawOval(Color(0xFFFFA500)) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt b/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt index 21cc008..d5c91e0 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt @@ -198,4 +198,8 @@ enum class RefreshType { UNCOMMITED_CHANGES, UNCOMMITED_CHANGES_AND_LOG, REMOTES, +} + +enum class Processing { + } \ No newline at end of file diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt index 6038ef8..4b5332f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Color.kt @@ -7,16 +7,15 @@ val lightTheme = ColorsScheme( primaryVariant = Color(0xFF0070D8), onPrimary = Color(0xFFFFFFFFF), secondary = Color(0xFF9c27b0), - primaryText = Color(0xFF212934), - secondaryText = Color(0xFF595858), + onBackground = Color(0xFF212934), + onBackgroundSecondary = Color(0xFF595858), error = Color(0xFFc93838), onError = Color(0xFFFFFFFF), background = Color(0xFFFFFFFF), backgroundSelected = Color(0xC0cee1f2), surface = Color(0xFFf3f5f7), secondarySurface = Color(0xFFE9ECEF), - headerBackground = Color(0xFFE9ECEF), - borderColor = Color(0xFF989898), + tertiarySurface = Color(0xFFE9ECEF), addFile = Color(0xFF32A852), deletedFile = Color(0xFFc93838), modifiedFile = Color(0xFF0070D8), @@ -35,16 +34,15 @@ val darkBlueTheme = ColorsScheme( primaryVariant = Color(0xFF9FD1FF), onPrimary = Color(0xFFFFFFFFF), secondary = Color(0xFFe9c754), - primaryText = Color(0xFFFFFFFF), - secondaryText = Color(0xFFCCCBCB), + onBackground = Color(0xFFFFFFFF), + onBackgroundSecondary = Color(0xFFCCCBCB), error = Color(0xFFc93838), onError = Color(0xFFFFFFFF), background = Color(0xFF0E1621), backgroundSelected = Color(0xFF2f3640), surface = Color(0xFF182533), secondarySurface = Color(0xFF122C46), - headerBackground = Color(0xFF0a335c), - borderColor = Color(0xFF989898), + tertiarySurface = Color(0xFF0a335c), addFile = Color(0xFF32A852), deletedFile = Color(0xFFc93838), modifiedFile = Color(0xFF0070D8), @@ -62,16 +60,15 @@ val darkGrayTheme = ColorsScheme( primaryVariant = Color(0xFFCDEAFF), onPrimary = Color(0xFFFFFFFFF), secondary = Color(0xFFe9c754), - primaryText = Color(0xFFFFFFFF), - secondaryText = Color(0xFFCCCBCB), + onBackground = Color(0xFFFFFFFF), + onBackgroundSecondary = Color(0xFFCCCBCB), error = Color(0xFFc93838), onError = Color(0xFFFFFFFF), background = Color(0xFF16181F), backgroundSelected = Color(0xFF32373e), surface = Color(0xFF212731), secondarySurface = Color(0xFF282d36), - headerBackground = Color(0xFF21303d), - borderColor = Color(0xFF989898), + tertiarySurface = Color(0xFF21303d), addFile = Color(0xFF32A852), deletedFile = Color(0xFFc93838), modifiedFile = Color(0xFF0070D8), diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt index 4503ba8..8241925 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ColorsScheme.kt @@ -20,17 +20,15 @@ data class ColorsScheme( val primaryVariant: Color, val onPrimary: Color, val secondary: Color, - val primaryText: Color, - val secondaryText: Color, + val onBackground: Color, + val onBackgroundSecondary: Color, val error: Color, val onError: Color, val background: Color, val backgroundSelected: Color, val surface: Color, val secondarySurface: Color, - val headerBackground: Color, - val onHeader: Color = primaryText, - val borderColor: Color, + val tertiarySurface: Color, val addFile: Color, val deletedFile: Color, val modifiedFile: Color, @@ -53,8 +51,8 @@ data class ColorsScheme( error = this.error, onPrimary = this.onPrimary, onSecondary = this.onPrimary, - onBackground = this.primaryText, - onSurface = this.primaryText, + onBackground = this.onBackground, + onSurface = this.onBackground, onError = this.onError, isLight = isLight, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt index 13bd93b..2eaddf4 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/ComponentsColors.kt @@ -13,7 +13,7 @@ fun textFieldColors( focusedLabelColor: Color = MaterialTheme.colors.primaryVariant, backgroundColor: Color = MaterialTheme.colors.background, textColor: Color = MaterialTheme.colors.onBackground, - disabledTextColor: Color = MaterialTheme.colors.secondaryTextColor, + disabledTextColor: Color = MaterialTheme.colors.onBackgroundSecondary, ) = TextFieldDefaults.textFieldColors( cursorColor = cursorColor, focusedIndicatorColor = focusedIndicatorColor, diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt index be4da0e..6d22556 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/theme/Theme.kt @@ -37,38 +37,28 @@ fun AppTheme( val Colors.backgroundSelected: Color get() = appTheme.backgroundSelected -@get:Composable -val Colors.secondaryTextColor: Color - get() = appTheme.secondaryText +val Colors.onBackgroundSecondary: Color + get() = appTheme.onBackgroundSecondary -@get:Composable -val Colors.borderColor: Color - get() = appTheme.borderColor +val Colors.secondarySurface: Color + get() = appTheme.secondarySurface + +val Colors.tertiarySurface: Color + get() = appTheme.tertiarySurface -@get:Composable -val Colors.headerBackground: Color - get() = appTheme.headerBackground -@get:Composable val Colors.addFile: Color get() = appTheme.addFile -@get:Composable val Colors.deleteFile: Color get() = appTheme.deletedFile -@get:Composable val Colors.modifyFile: Color get() = appTheme.modifiedFile -@get:Composable val Colors.conflictFile: Color get() = appTheme.conflictingFile -@get:Composable -val Colors.headerText: Color - get() = appTheme.onHeader - val Colors.abortButton: Color get() = appTheme.error @@ -78,9 +68,6 @@ 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/com/jetpackduba/gitnuro/ui/Blame.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt index 40156d8..3ae48eb 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Blame.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.extensions.* import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.headerBackground +import com.jetpackduba.gitnuro.theme.tertiarySurface import com.jetpackduba.gitnuro.theme.secondarySurface import com.jetpackduba.gitnuro.ui.components.PrimaryButton import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn @@ -202,7 +202,7 @@ private fun Header( modifier = Modifier .fillMaxWidth() .height(40.dp) - .background(MaterialTheme.colors.headerBackground) + .background(MaterialTheme.colors.tertiarySurface) .padding(start = 8.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt index 0d8ae3e..c49b9a2 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Branches.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.extensions.isLocal import com.jetpackduba.gitnuro.extensions.simpleName -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.SideMenuPanel import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry import com.jetpackduba.gitnuro.ui.components.gitnuroViewModel @@ -94,7 +94,7 @@ private fun BranchLineEntry( if (isCurrentBranch) { Text( text = "HEAD", - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.caption, modifier = Modifier.padding(horizontal = 16.dp), ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt index 928b57d..e8ea491 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/CommitChanges.kt @@ -96,7 +96,7 @@ fun CommitChangesView( modifier = Modifier .fillMaxWidth() .height(34.dp) - .background(MaterialTheme.colors.headerBackground), + .background(MaterialTheme.colors.tertiarySurface), contentAlignment = Alignment.CenterStart, ) { Text( @@ -105,7 +105,7 @@ fun CommitChangesView( text = "Files changed", fontWeight = FontWeight.Normal, textAlign = TextAlign.Left, - color = MaterialTheme.colors.headerText, + color = MaterialTheme.colors.onBackground, maxLines = 1, style = MaterialTheme.typography.body2, ) @@ -158,7 +158,7 @@ fun Author( modifier = Modifier .fillMaxWidth() .height(72.dp) - .background(MaterialTheme.colors.headerBackground), + .background(MaterialTheme.colors.tertiarySurface), verticalAlignment = Alignment.CenterVertically ) { AvatarImage( @@ -183,7 +183,7 @@ fun Author( Row(verticalAlignment = Alignment.CenterVertically) { Text( text = id.abbreviate(7).name(), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, maxLines = 1, style = MaterialTheme.typography.body2, modifier = Modifier.handMouseClickable { @@ -219,7 +219,7 @@ fun Author( TooltipText( text = smartDate, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, maxLines = 1, modifier = Modifier.padding(horizontal = 16.dp), style = MaterialTheme.typography.body2, @@ -286,7 +286,7 @@ fun CommitLogChanges( softWrap = false, overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.body2, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, ) } Text( diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt index fc03aaf..1701ab9 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/FileHistory.kt @@ -27,8 +27,8 @@ import com.jetpackduba.gitnuro.extensions.toSmartSystemString import com.jetpackduba.gitnuro.git.diff.DiffResult import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.headerBackground -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.tertiarySurface +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.AvatarImage import com.jetpackduba.gitnuro.ui.components.ScrollableLazyColumn import com.jetpackduba.gitnuro.ui.components.TooltipText @@ -85,7 +85,7 @@ private fun Header( modifier = Modifier .fillMaxWidth() .height(40.dp) - .background(MaterialTheme.colors.headerBackground) + .background(MaterialTheme.colors.tertiarySurface) .padding(start = 8.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -235,7 +235,7 @@ fun HistoryCommit(commit: RevCommit, onCommitSelected: () -> Unit) { text = commit.name.take(7), maxLines = 1, style = MaterialTheme.typography.body2, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, ) Spacer(modifier = Modifier.weight(1f)) @@ -245,7 +245,7 @@ fun HistoryCommit(commit: RevCommit, onCommitSelected: () -> Unit) { TooltipText( text = date, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, maxLines = 1, modifier = Modifier.padding(horizontal = 16.dp), style = MaterialTheme.typography.body2, diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt index e04f147..39cafbc 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/Submodules.kt @@ -9,7 +9,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.SideMenuPanel import com.jetpackduba.gitnuro.ui.components.SideMenuSubentry import com.jetpackduba.gitnuro.ui.components.Tooltip @@ -62,7 +62,7 @@ private fun SubmoduleLineEntry( Tooltip(stateName) { Text( text = stateName.first().toString(), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, modifier = Modifier.padding(horizontal = 16.dp), ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt index e3cbd5c..e5ba647 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/UncommitedChanges.kt @@ -511,7 +511,7 @@ private fun EntriesList( modifier = Modifier .height(34.dp) .fillMaxWidth() - .background(color = MaterialTheme.colors.headerBackground) + .background(color = MaterialTheme.colors.tertiarySurface) ) { Text( modifier = Modifier @@ -520,7 +520,7 @@ private fun EntriesList( text = title, fontWeight = FontWeight.Normal, textAlign = TextAlign.Left, - color = MaterialTheme.colors.headerText, + color = MaterialTheme.colors.onBackground, style = MaterialTheme.typography.body2, maxLines = 1, ) @@ -611,7 +611,7 @@ private fun FileEntry( softWrap = false, style = MaterialTheme.typography.body2, overflow = TextOverflow.Ellipsis, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, ) } Text( diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt index 6911e8a..e1f4f33 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/WelcomePage.kt @@ -23,7 +23,7 @@ import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.AppConstants import com.jetpackduba.gitnuro.AppStateManager import com.jetpackduba.gitnuro.extensions.* -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.theme.textButtonColors import com.jetpackduba.gitnuro.ui.dialogs.AppInfoDialog import com.jetpackduba.gitnuro.ui.dialogs.CloneDialog @@ -202,7 +202,7 @@ fun RecentRepositories(appStateManager: AppStateManager, tabViewModel: TabViewMo if (latestOpenedRepositoriesPaths.isEmpty()) { Text( "Nothing to see here, open a repository first!", - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body1, modifier = Modifier.padding(top = 16.dp) ) @@ -237,7 +237,7 @@ fun RecentRepositories(appStateManager: AppStateManager, tabViewModel: TabViewMo style = MaterialTheme.typography.body1, modifier = Modifier.padding(start = 4.dp), maxLines = 1, - color = MaterialTheme.colors.secondaryTextColor + color = MaterialTheme.colors.onBackgroundSecondary ) } } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt index a141b05..14531db 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/components/SideMenuEntry.kt @@ -18,7 +18,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary @Composable fun SideMenuEntry( @@ -76,7 +76,7 @@ fun SideMenuEntry( text = itemsCount.toString(), style = MaterialTheme.typography.body2, fontWeight = FontWeight.Medium, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, modifier = Modifier.padding(end = 16.dp), ) } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/ContextMenu.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/ContextMenu.kt index bbc45a6..4513b73 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/ContextMenu.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/context_menu/ContextMenu.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.window.PopupPositionProvider import com.jetpackduba.gitnuro.extensions.awaitFirstDownEvent import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import java.awt.event.MouseEvent import kotlin.math.abs @@ -186,7 +186,7 @@ fun TextEntry(contextTextEntry: ContextMenuElement.ContextTextEntry, onDismissRe painter = icon(), contentDescription = null, modifier = Modifier.fillMaxSize(), - tint = (MaterialTheme.colors.secondaryTextColor.copy(alpha = 0.8f)) + tint = (MaterialTheme.colors.onBackgroundSecondary.copy(alpha = 0.8f)) ) } } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt index ff18c00..9dd8b67 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/EditRemotesDialog.kt @@ -16,7 +16,7 @@ import com.jetpackduba.gitnuro.extensions.handMouseClickable import com.jetpackduba.gitnuro.extensions.handOnHover import com.jetpackduba.gitnuro.theme.backgroundSelected import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.theme.textButtonColors import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -142,7 +142,7 @@ fun EditRemotesDialog( ) { Text( text = "No available remotes", - style = MaterialTheme.typography.body2.copy(color = MaterialTheme.colors.secondaryTextColor) + style = MaterialTheme.typography.body2.copy(color = MaterialTheme.colors.onBackgroundSecondary) ) } } @@ -196,7 +196,7 @@ fun EditRemotesDialog( tint = if (selectedRemote != null) MaterialTheme.colors.onBackground else - MaterialTheme.colors.secondaryTextColor, + MaterialTheme.colors.onBackgroundSecondary, ) } } diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt index 8d07c5f..c24264a 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewBranchDialog.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -56,7 +56,7 @@ fun NewBranchDialog( text = "Create a new branch and check it out", modifier = Modifier .padding(bottom = 16.dp), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, textAlign = TextAlign.Center, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt index 06137ea..c48c47f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/NewTagDialog.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -56,7 +56,7 @@ fun NewTagDialog( text = "Create a new tag on the specified commit", modifier = Modifier .padding(bottom = 16.dp), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, textAlign = TextAlign.Center, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt index fe28795..e46365e 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/PasswordDialog.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding import com.jetpackduba.gitnuro.theme.outlinedTextFieldColors -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -59,7 +59,7 @@ fun PasswordDialog( text = "Your SSH key is protected with a password", modifier = Modifier .padding(bottom = 16.dp), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, textAlign = TextAlign.Center, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt index b2e82b6..e379bb1 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/ResetDialog.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.git.log.ResetType -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.PrimaryButton @Composable @@ -52,7 +52,7 @@ fun ResetBranchDialog( text = "Reset the changes of your current branch to a \nprevious or different commit", modifier = Modifier .padding(bottom = 16.dp), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, textAlign = TextAlign.Center, ) @@ -155,7 +155,7 @@ fun RadioButtonText( Text( text = subtitle, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt index 02f4ab9..f8a8b1e 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/StashWithMessageDialog.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.keybindings.KeybindingOption import com.jetpackduba.gitnuro.keybindings.matchesBinding -import com.jetpackduba.gitnuro.theme.secondaryTextColor +import com.jetpackduba.gitnuro.theme.onBackgroundSecondary import com.jetpackduba.gitnuro.ui.components.AdjustableOutlinedTextField import com.jetpackduba.gitnuro.ui.components.PrimaryButton @@ -56,7 +56,7 @@ fun StashWithMessageDialog( text = "Create a new stash with a custom message", modifier = Modifier .padding(bottom = 16.dp), - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, style = MaterialTheme.typography.body2, textAlign = TextAlign.Center, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt index f7e2135..493d6c1 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/settings/SettingsDialog.kt @@ -464,7 +464,7 @@ private fun FieldTitles( Text( text = subtitle, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, modifier = Modifier.padding(top = 4.dp), style = MaterialTheme.typography.body2, ) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt index b135bb2..876fd5d 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/diff/Diff.kt @@ -621,7 +621,7 @@ private fun DiffHeader( modifier = Modifier .fillMaxWidth() .height(40.dp) - .background(MaterialTheme.colors.headerBackground) + .background(MaterialTheme.colors.tertiarySurface) .padding(start = 8.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -759,7 +759,7 @@ private fun PathOnlyDiffHeader( modifier = Modifier .fillMaxWidth() .height(40.dp) - .background(MaterialTheme.colors.headerBackground) + .background(MaterialTheme.colors.tertiarySurface) .padding(start = 8.dp, end = 8.dp), verticalAlignment = Alignment.CenterVertically, ) { diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt index db1a8cb..a01104f 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/log/Log.kt @@ -304,7 +304,7 @@ fun SearchFilter( if (searchFilterText.isNotEmpty()) { Text( "${searchFilterResults.index}/${searchFilterResults.totalCount}", - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, ) } @@ -557,7 +557,7 @@ fun GraphHeader( modifier = Modifier .fillMaxWidth() .height(34.dp) - .background(MaterialTheme.colors.headerBackground), + .background(MaterialTheme.colors.tertiarySurface), verticalAlignment = Alignment.CenterVertically, ) { Text( @@ -565,7 +565,7 @@ fun GraphHeader( .width(graphWidth) .padding(start = 16.dp), text = "Graph", - color = MaterialTheme.colors.headerText, + color = MaterialTheme.colors.onBackground, style = MaterialTheme.typography.body2, maxLines = 1, ) @@ -585,7 +585,7 @@ fun GraphHeader( .padding(start = 16.dp) .weight(1f), text = "Message", - color = MaterialTheme.colors.headerText, + color = MaterialTheme.colors.onBackground, style = MaterialTheme.typography.body2, maxLines = 1, ) @@ -845,7 +845,7 @@ fun CommitMessage( .padding(start = 8.dp) .weight(1f), style = MaterialTheme.typography.body2, - color = if (matchesSearchFilter == false) MaterialTheme.colors.secondaryTextColor else MaterialTheme.colors.onBackground, + color = if (matchesSearchFilter == false) MaterialTheme.colors.onBackgroundSecondary else MaterialTheme.colors.onBackground, maxLines = 1, overflow = TextOverflow.Ellipsis, ) @@ -854,7 +854,7 @@ fun CommitMessage( text = commit.authorIdent.`when`.toSmartSystemString(), modifier = Modifier.padding(horizontal = 16.dp), style = MaterialTheme.typography.caption, - color = MaterialTheme.colors.secondaryTextColor, + color = MaterialTheme.colors.onBackgroundSecondary, maxLines = 1, overflow = TextOverflow.Ellipsis, )