Merge pull request #130 from what3words/staging

Staging to main

Author: khaidow3w

Sources/W3WSwiftComponentsOcr/Presenters/Ocr/Views/Modifiers/BorderSwitchToggleStyle.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import W3WSwiftThemes
 import W3WSwiftDesignSwiftUI
+import W3WSwiftAppTypes
 
 
 /// styling the SwiftUI toggle
@@ -51,14 +52,14 @@ struct BorderedSwitchToggleStyle: ToggleStyle {
         .padding(4)
         .frame(maxWidth: .infinity, alignment: configuration.isOn ? .trailing : .leading)
 
-      if isLocked {
+      if isLocked, !W3WAppConstants.padlockConfig.isHidden {
         W3WIconImage(
           iconImage: .w3wLock,
           iconSize: 12,
-          color: W3WCoreColor.white.suColor
+          color: W3WAppConstants.padlockConfig.foregroundColor.suColor
         )
         .frame(width: 14, height: 14)
-        .background(W3WTheme.what3words.brandBase?.suColor)
+        .background(W3WAppConstants.padlockConfig.backgroundColor.suColor)
         .clipShape(.circle)
         .offset(x: 23.0, y: -13.0)
       }

Sources/W3WSwiftComponentsOcr/Presenters/Ocr/Views/Modifiers/View+Lock.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 import W3WSwiftThemes
 import W3WSwiftDesignSwiftUI
+import W3WSwiftAppTypes
 
 
 // hack to copy lock funtionality, the original is in
@@ -21,23 +22,22 @@ public extension View {
     _ value: Bool,
     alignment: Alignment = .topTrailing,
     offsetX: CGFloat = 0,
-    offsetY: CGFloat = 0,
-    lockColor: Color = .white
+    offsetY: CGFloat = 0
   ) -> some View {
-    self.cornerOverlay(
-      isVisible: value,
+    let isLockVisible = value && !W3WAppConstants.padlockConfig.isHidden
+    return self.cornerOverlay(
+      isVisible: isLockVisible,
       alignment: alignment,
       offsetX: offsetX,
       offsetY: offsetY,
       overlayView: {
-        // TODO: Add lock images when ready
         W3WIconImage(
           iconImage: .w3wLock,
           iconSize: 12,
-          color: lockColor
+          color: W3WAppConstants.padlockConfig.foregroundColor.suColor
         )
         .frame(width: 14, height: 14)
-        .background(W3WTheme.what3words.brandBase?.suColor)
+        .background(W3WAppConstants.padlockConfig.backgroundColor.suColor)
         .clipShape(.circle)
       })
   }