- Added using color style in custom colors modifiers and in SwiftUI views.

MiniScanner/Core/Extensions/View/View+CustomColor.swift

@@ -10,7 +10,7 @@ import SwiftUI
 
 struct CustomColorModifier: ViewModifier {
     
-    var color: Color
+    var color: ColorStyle
     var place: ColorPlace
     
     func body(content: Content) -> some View {
@@ -19,23 +19,23 @@ struct CustomColorModifier: ViewModifier {
         case .background:
             
             content
-                .background(color)
+                .background(color.color)
             
         case .foreground:
             
             content
-                .foregroundStyle(color)
+                .foregroundStyle(color.color)
         }
     }
 }
 
 extension View {
     
-    func customForeground(_ color: Color) -> some View {
+    func customForeground(_ color: ColorStyle) -> some View {
         ModifiedContent(content: self, modifier: CustomColorModifier(color: color, place: .foreground))
     }
     
-    func customBackground(_ color: Color) -> some View {
+    func customBackground(_ color: ColorStyle) -> some View {
         ModifiedContent(content: self, modifier: CustomColorModifier(color: color, place: .background))
     }
 }

MiniScanner/Core/Presentation/Controls/CustomMenuPicker.swift

@@ -22,6 +22,7 @@ struct CustomMenuPicker<Item: CustomMenuPickerItem, Label: View>: View {
                 ForEach(items) { item in
                     
                     Text(item.displayedName)
+                        .customForeground(.gray600)
                         .tag(item)
                 }
             }

MiniScanner/Core/Presentation/Controls/CustomPicker.swift

@@ -31,7 +31,7 @@ struct CustomPicker<Item: CustomMenuPickerItem>: View {
             HStack {
                 
                 Text(item.displayedName)
-                    .customForeground(.mainText)
+                    .customForeground(.gray600)
                 
                 Spacer()
                 
@@ -41,7 +41,7 @@ struct CustomPicker<Item: CustomMenuPickerItem>: View {
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(width: 12, height: 12)
-                        .customForeground(.mainBlue)
+                        .customForeground(.primary)
                 }
             }
             .frame(maxWidth: .infinity)

MiniScanner/Core/Presentation/Controls/PrimaryButton.swift

@@ -26,13 +26,13 @@ struct PrimaryButton: View {
             .frame(height: 54)
             .frame(maxWidth: .infinity)
         })
-        .customBackground(.buttonsBlue)
+        .customBackground(.primary)
         .customCornerRadius(12)
     }
     
     private var titleView: some View {
         Text(title)
-            .customForeground(.mainText)
+            .customForeground(.gray0)
     }
 }
 

MiniScanner/Features/Common/Presentation/MainView.swift

@@ -24,7 +24,7 @@ struct MainView<ViewModel: MainViewModel, Content: View>: View {
         
         content()
             .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .background(Color.mainBackground)
+            .customBackground(.base)
             .onAppear {
                 viewModel.onAppear()
             }

MiniScanner/Features/Settings/Presentation/SettingButton.swift

@@ -45,16 +45,17 @@ struct SettingButton: View {
             .resizable()
             .aspectRatio(contentMode: .fit)
             .frame(width: 20, height: 20)
+            .customForeground(.gray600)
     }
     
     private var titleView: some View {
         Text(title)
-            .customForeground(.mainText)
+            .customForeground(.gray600)
     }
     
     private var valueView: some View {
         Text(value)
-            .customForeground(.mainText)
+            .customForeground(.gray350)
     }
     
     private var changeButton: some View {
@@ -63,7 +64,7 @@ struct SettingButton: View {
         }, label: {
             
             Text(String.change.localized)
-                .customForeground(.mainText)
+                .customForeground(.gray600)
         })
     }
 }

MiniScanner/Features/Settings/Presentation/SettingSheetView.swift

@@ -39,7 +39,7 @@ extension SettingSheetView {
     
     private var titleView: some View {
         Text(title)
-            .customForeground(.mainText)
+            .customForeground(.gray600)
     }
     
     private var picker: some View {