Fix toggle color resetting

brave · Apr 6, 2021 · e56a830 · e56a830
1 parent ba9635a
commit e56a830
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift b/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/MenuViewController.swift
@@ -41,6 +41,7 @@ private struct MenuView<Content: View>: View {
             content
                 .padding(.vertical, 8)
                 .frame(maxWidth: .infinity)
+                .accentColor(Color(BraveUX.braveOrange))
         }
     }
 }
@@ -60,7 +61,6 @@ struct MenuItemButton: View {
                 .frame(maxWidth: .infinity, minHeight: 48.0, alignment: .leading)
         }
         .buttonStyle(TableCellButtonStyle())
-        .accentColor(Color(Theme.of(nil).colors.tints.home))
     }
 }
 

diff --git a/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/VPNMenuButton.swift b/Client/Frontend/Browser/Toolbars/BottomToolbar/Menu/VPNMenuButton.swift
@@ -47,6 +47,18 @@ struct VPNMenuButton: View {
         }
     }
 
+    private var vpnToggle: some View {
+        Group {
+            let toggle = Toggle("Brave VPN", isOn: isVPNEnabledBinding)
+            if #available(iOS 14.0, *) {
+                toggle
+                    .toggleStyle(SwitchToggleStyle(tint: .accentColor))
+            } else {
+                toggle
+            }
+        }
+    }
+
     var body: some View {
         Button(action: { toggleVPN(!BraveVPN.isConnected) }) {
             HStack {
@@ -55,7 +67,7 @@ struct VPNMenuButton: View {
                 if isVPNStatusChanging {
                     ActivityIndicatorView(isAnimating: true)
                 }
-                Toggle("Brave VPN", isOn: isVPNEnabledBinding)
+                vpnToggle
                     .labelsHidden()
             }
             .padding(.horizontal, 14)