瀏覽代碼

change color

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 年之前
父節點
當前提交
dcb0361ca8
共有 2 個文件被更改,包括 10 次插入8 次删除
  1. 5 5
      iOSClient/Scan document/NCUploadScanDocument.swift
  2. 5 3
      iOSClient/Utility/HUDView.swift

+ 5 - 5
iOSClient/Scan document/NCUploadScanDocument.swift

@@ -428,7 +428,7 @@ struct UploadScanDocumentView: View {
                                 isSecuredPassword.toggle()
                             }) {
                                 Image(systemName: self.isSecuredPassword ? "eye.slash" : "eye")
-                                    .foregroundColor(Color(UIColor.opaqueSeparator))
+                                    .foregroundColor(Color(UIColor.placeholderText))
                             }
                             .buttonStyle(BorderlessButtonStyle())
                         }
@@ -520,8 +520,8 @@ struct TextFieldClearButton: ViewModifier {
                 Button(
                     action: { self.text = "" },
                     label: {
-                        Image(systemName: "delete.left")
-                            .foregroundColor(Color(UIColor.opaqueSeparator))
+                        Image(systemName: "xmark.circle.fill")
+                            .foregroundColor(Color(UIColor.placeholderText))
                     }
                 ).buttonStyle(BorderlessButtonStyle())
             }
@@ -535,8 +535,8 @@ struct ButtonUploadScanDocumenStyle: ButtonStyle {
         configuration.label
             .padding(.horizontal, 40)
             .padding(.vertical, 10)
-            .background(disabled ? Color(UIColor.opaqueSeparator) : Color(NCBrandColor.shared.brand))
-            .foregroundColor(.white)
+            .background(disabled ? Color(UIColor.placeholderText) : Color(NCBrandColor.shared.brand))
+            .foregroundColor(disabled ? Color(UIColor.placeholderText) : Color(NCBrandColor.shared.brandText))
             .clipShape(Capsule())
     }
 }

+ 5 - 3
iOSClient/Utility/HUDView.swift

@@ -36,11 +36,11 @@ struct HUDView: View {
             }
         }) {
             Label(textLabel, systemImage: image)
-                .foregroundColor(.gray)
+                .foregroundColor(Color(NCBrandColor.shared.brandText))
                 .padding(.horizontal, 10)
                 .padding(14)
                 .background(
-                    Blur(style: .systemMaterial)
+                    Blur(style: .regular)
                         .clipShape(Capsule())
                         .shadow(color: Color(.black).opacity(0.22), radius: 12, x: 0, y: 5)
                     )
@@ -53,7 +53,9 @@ struct Blur: UIViewRepresentable {
     var style: UIBlurEffect.Style
 
     func makeUIView(context: Context) -> UIVisualEffectView {
-        return UIVisualEffectView(effect: UIBlurEffect(style: style))
+        let effectView = UIVisualEffectView(effect: UIBlurEffect(style: style))
+        effectView.backgroundColor = NCBrandColor.shared.brand
+        return effectView
     }
 
     func updateUIView(_ uiView: UIVisualEffectView, context: Context) {