Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Sliding course menu theme enhancement #431

Merged
merged 1 commit into from
May 9, 2024
Merged

chore: Sliding course menu theme enhancement #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Core/View/Base/ScrollSlidingTabBar/ScrollSlidingTabBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ extension ScrollSlidingTabBar {
}
.accentColor(
isSelected(index: obj.offset)
? Theme.Colors.white
? Theme.Colors.slidingSelectedTextColor
: Theme.Colors.slidingTextColor
)
}
Expand Down
38 changes: 38 additions & 0 deletions ...heme/Assets.xcassets/Colors/SlidingTabBar/slidingSelectedTextColor.colorset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "1.000",
"green" : "1.000",
"red" : "1.000"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
1 change: 1 addition & 0 deletions Theme/Theme/SwiftGen/ThemeAssets.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public enum ThemeAssets {
public static let secondaryButtonBorderColor = ColorAsset(name: "SecondaryButtonBorderColor")
public static let secondaryButtonTextColor = ColorAsset(name: "SecondaryButtonTextColor")
public static let shadowColor = ColorAsset(name: "ShadowColor")
public static let slidingSelectedTextColor = ColorAsset(name: "slidingSelectedTextColor")
public static let slidingStrokeColor = ColorAsset(name: "slidingStrokeColor")
public static let slidingTextColor = ColorAsset(name: "slidingTextColor")
public static let snackbarErrorColor = ColorAsset(name: "SnackbarErrorColor")
Expand Down
1 change: 1 addition & 0 deletions Theme/Theme/Theme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public struct Theme {
public private(set) static var infoColor = ThemeAssets.infoColor.swiftUIColor
public private(set) static var irreversibleAlert = ThemeAssets.irreversibleAlert.swiftUIColor
public private(set) static var slidingTextColor = ThemeAssets.slidingTextColor.swiftUIColor
public private(set) static var slidingSelectedTextColor = ThemeAssets.slidingSelectedTextColor.swiftUIColor
public private(set) static var slidingStrokeColor = ThemeAssets.slidingStrokeColor.swiftUIColor
public private(set) static var primaryHeaderColor = ThemeAssets.primaryHeaderColor.swiftUIColor
public private(set) static var secondaryHeaderColor = ThemeAssets.secondaryHeaderColor.swiftUIColor
Expand Down
Loading