Skip to content

Commit 6358567

Browse files
committed
updated colors usage pattern
1 parent 90ce5cf commit 6358567

File tree

9 files changed

+31
-10
lines changed

9 files changed

+31
-10
lines changed

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/Text field text 42526E.colorset/Contents.json renamed to GoInfoGame/GoInfoGame/Assets.xcassets/Colors/42526E Text field text.colorset/Contents.json

File renamed without changes.

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/Text filed title 83879B.colorset/Contents.json renamed to GoInfoGame/GoInfoGame/Assets.xcassets/Colors/83879B Text filed title.colorset/Contents.json

File renamed without changes.

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/Border Color gray D5DBE6.colorset/Contents.json renamed to GoInfoGame/GoInfoGame/Assets.xcassets/Colors/D5DBE6 Border Color gray.colorset/Contents.json

File renamed without changes.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"colors" : [
3+
{
4+
"color" : {
5+
"color-space" : "srgb",
6+
"components" : {
7+
"alpha" : "1.000",
8+
"blue" : "0xE5",
9+
"green" : "0xE5",
10+
"red" : "0xE5"
11+
}
12+
},
13+
"idiom" : "universal"
14+
}
15+
],
16+
"info" : {
17+
"author" : "xcode",
18+
"version" : 1
19+
}
20+
}

GoInfoGame/GoInfoGame/Assets.xcassets/Colors/Light Purpule bg E7E3EE.colorset/Contents.json renamed to GoInfoGame/GoInfoGame/Assets.xcassets/Colors/E7E3EE Light Purpule bg.colorset/Contents.json

File renamed without changes.

GoInfoGame/GoInfoGame/Helpers/Generated/XCAssets+Generated.swift

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,15 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image
2626
internal enum Asset {
2727
internal static let accentColor = ColorAsset(name: "AccentColor")
2828
internal enum Colors {
29+
internal static let _42526ETextFieldText = ColorAsset(name: "42526E Text field text")
30+
internal static let _83879BTextFiledTitle = ColorAsset(name: "83879B Text filed title")
2931
internal static let accentLavender = ColorAsset(name: "Accent Lavender")
3032
internal static let accentPink = ColorAsset(name: "Accent Pink")
31-
internal static let borderColorGrayD5DBE6 = ColorAsset(name: "Border Color gray D5DBE6")
33+
internal static let d5DBE6BorderColorGray = ColorAsset(name: "D5DBE6 Border Color gray")
34+
internal static let e5E5E5GrayBackgroudn = ColorAsset(name: "E5E5E5 Gray backgroudn")
35+
internal static let e7E3EELightPurpuleBg = ColorAsset(name: "E7E3EE Light Purpule bg")
3236
internal static let huskyGold = ColorAsset(name: "Husky Gold")
3337
internal static let huskyPurple = ColorAsset(name: "Husky Purple")
34-
internal static let lightPurpuleBgE7E3EE = ColorAsset(name: "Light Purpule bg E7E3EE")
35-
internal static let textFieldText42526E = ColorAsset(name: "Text field text 42526E")
36-
internal static let textFiledTitle83879B = ColorAsset(name: "Text filed title 83879B")
3738
internal static let theme = ColorAsset(name: "theme")
3839
}
3940
internal enum QuestIcons {

GoInfoGame/GoInfoGame/Login/View/FloatingLabelTextField.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ struct FloatingLabelTextField: View {
1616
ZStack(alignment: .leading) {
1717
// Border box
1818
RoundedRectangle(cornerRadius: 6)
19-
.stroke(Asset.Colors.borderColorGrayD5DBE6.swiftUIColor, lineWidth: 1)
19+
.stroke(Asset.Colors.d5DBE6BorderColorGray.swiftUIColor, lineWidth: 1)
2020
.frame(height: 50)
2121

2222
if !text.isEmpty {
2323
// Floating label
2424
Text(title)
25-
.foregroundColor(Asset.Colors.textFiledTitle83879B.swiftUIColor)
25+
.foregroundColor(Asset.Colors._83879BTextFiledTitle.swiftUIColor)
2626
.background(.white)
2727
.font(FontFamily.Lato.regular.swiftUIFont(fixedSize: 16))
2828
.padding(.horizontal, 4)
@@ -40,7 +40,7 @@ struct FloatingLabelTextField: View {
4040
.padding(.horizontal, 8)
4141
.frame(height: 50)
4242
.font(FontFamily.Lato.bold.swiftUIFont(fixedSize: 16))
43-
.foregroundStyle(Asset.Colors.textFieldText42526E.swiftUIColor)
43+
.foregroundStyle(Asset.Colors._42526ETextFieldText.swiftUIColor)
4444
}
4545
}
4646
}

GoInfoGame/GoInfoGame/Login/View/PosmLogin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct PosmLoginView: View {
2323
ZStack {
2424
VStack {
2525
ZStack {
26-
Asset.Colors.lightPurpuleBgE7E3EE.swiftUIColor
26+
Asset.Colors.e7E3EELightPurpuleBg.swiftUIColor
2727
.ignoresSafeArea(edges: .top)
2828

2929
HStack {
@@ -181,7 +181,7 @@ struct PosmLoginView: View {
181181
let build = Bundle.main.infoDictionary?["CFBundleVersion"] as? String ?? "N/A"
182182
return Text("Version \(version) (\(build))")
183183
.font(FontFamily.Lato.medium.swiftUIFont(size: 16))
184-
.foregroundColor(Asset.Colors.textFiledTitle83879B.swiftUIColor)
184+
.foregroundColor(Asset.Colors._83879BTextFiledTitle.swiftUIColor)
185185
}
186186
}
187187

GoInfoGame/GoInfoGame/Login/View/SecureInputView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ struct SecureInputView: View {
2727
}
2828
}.padding(.trailing, 32)
2929
.font(FontFamily.Lato.bold.swiftUIFont(size: 16))
30-
.foregroundStyle(Asset.Colors.textFieldText42526E.swiftUIColor)
30+
.foregroundStyle(Asset.Colors._42526ETextFieldText.swiftUIColor)
3131

3232
Button(action: {
3333
isSecured.toggle()

0 commit comments

Comments
 (0)