diff --git a/MiniScanner/Core/Extensions/Style/Color+Colors.swift b/MiniScanner/Core/Extensions/Style/Color+Colors.swift
index c09261b18e894a6ec108817559ea47ba4d941253..169ec2cb58bb58c17de5bb3586367361e12f6c3d 100644
--- a/MiniScanner/Core/Extensions/Style/Color+Colors.swift
+++ b/MiniScanner/Core/Extensions/Style/Color+Colors.swift
@@ -27,6 +27,12 @@ extension Color {
extension Color {
static let primary = Color(.primary)
+ static let secondary = Color(.secondary)
+ static let tertiary = Color(.tertiary)
+
+ static let primaryText = Color(.primaryText)
+ static let secondaryText = Color(.secondaryText)
+ static let tertiaryText = Color(.tertiaryText)
static let statusTrue = Color(.statusTrue)
diff --git a/MiniScanner/Core/Extensions/Style/UIColors+Colors.swift b/MiniScanner/Core/Extensions/Style/UIColors+Colors.swift
index 196a57e82396e80b3489551481848bf39a5e4147..d87b26b0123ddafcb165f5780eff1ef6f285bca4 100644
--- a/MiniScanner/Core/Extensions/Style/UIColors+Colors.swift
+++ b/MiniScanner/Core/Extensions/Style/UIColors+Colors.swift
@@ -27,6 +27,12 @@ extension UIColor {
extension UIColor {
static let primary = UIColor(resource: .primary)
+ static let secondary = UIColor(resource: .secondary)
+ static let tertiary = UIColor(resource: .tertiary)
+
+ static let primaryText = UIColor(resource: .primaryText)
+ static let secondaryText = UIColor(resource: .secondaryText)
+ static let tertiaryText = UIColor(resource: .tertiaryText)
static let statusTrue = UIColor(resource: .statusTrue)
diff --git a/MiniScanner/Core/Presentation/Styles/ColorStyle.swift b/MiniScanner/Core/Presentation/Styles/ColorStyle.swift
index d5d4c65d7571153cbadf1e24273b8a8f5864c527..f1cf2f9d84d1342311c5ae324dcc5946099f1c4f 100644
--- a/MiniScanner/Core/Presentation/Styles/ColorStyle.swift
+++ b/MiniScanner/Core/Presentation/Styles/ColorStyle.swift
@@ -11,6 +11,13 @@ import SwiftUI
enum ColorStyle {
case primary
+ case secondary
+ case tertiary
+
+ case primaryText
+ case secondaryText
+ case tertiaryText
+
case statusTrue
case statusFalse
case statusAlert
@@ -40,6 +47,16 @@ extension ColorStyle {
switch self {
case .primary:
.primary
+ case .secondary:
+ .secondary
+ case .tertiary:
+ .tertiary
+ case .primaryText:
+ .primaryText
+ case .secondaryText:
+ .secondaryText
+ case .tertiaryText:
+ .tertiaryText
case .statusTrue:
.statusTrue
case .statusFalse:
@@ -88,6 +105,16 @@ extension ColorStyle {
switch self {
case .primary:
.primary
+ case .secondary:
+ .secondary
+ case .tertiary:
+ .tertiary
+ case .primaryText:
+ .primaryText
+ case .secondaryText:
+ .secondaryText
+ case .tertiaryText:
+ .tertiaryText
case .statusTrue:
.statusTrue
case .statusFalse:
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Base.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Base.colorset/Contents.json
index 13dc719ae903c42ba44e43c634b97fa7230c8791..d0fd283af921edef6a58652b10b41147be547552 100644
--- a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Base.colorset/Contents.json
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Base.colorset/Contents.json
@@ -7,7 +7,7 @@
"alpha" : "1.000",
"blue" : "0xFF",
"green" : "0xFF",
- "red" : "0xFE"
+ "red" : "0xFF"
}
},
"idiom" : "universal"
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..73c00596a7fca3f3d4bdd64053b69d86745f9e10
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Primary Color.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Primary Color.colorset/Contents.json
similarity index 100%
rename from MiniScanner/Core/Resources/Colors.xcassets/Colors/Primary Color.colorset/Contents.json
rename to MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Primary Color.colorset/Contents.json
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Primary Text.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Primary Text.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..a61d481a717255e47287c36920bd729987186b78
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Primary Text.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0xFF",
+ "green" : "0xFF",
+ "red" : "0xFE"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Color.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Color.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..2701a8251a555a63b91b33bebca7e4f611116b60
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Color.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0x2E",
+ "green" : "0x2C",
+ "red" : "0x2C"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0xF6",
+ "green" : "0xF1",
+ "red" : "0xF1"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Text.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Text.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..b84ce47dc32af2a3f8b94e40964f960aa493fc62
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Secondary Text.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0xFF",
+ "green" : "0xFF",
+ "red" : "0xFF"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0x2D",
+ "green" : "0x2B",
+ "red" : "0x2B"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Color.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Color.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..da359abc700b4f1626b1d189cd08578002c4d15e
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Color.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0xF7",
+ "green" : "0xF2",
+ "red" : "0xF2"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0x2D",
+ "green" : "0x2B",
+ "red" : "0x2B"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Text.colorset/Contents.json b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Text.colorset/Contents.json
new file mode 100644
index 0000000000000000000000000000000000000000..4b7872a0a52b2051e10431987a12802fbc9e7efc
--- /dev/null
+++ b/MiniScanner/Core/Resources/Colors.xcassets/Colors/Main/Tertiary Text.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0x2D",
+ "green" : "0x2B",
+ "red" : "0x2B"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0xFF",
+ "green" : "0xFF",
+ "red" : "0xFF"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}