Handling enum case and icons

brave · Sep 8, 2023 · 1736474 · 1736474
1 parent f8de54e
commit 1736474
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Callout.swift
@@ -260,7 +260,7 @@ extension BrowserViewController {
         return
       }
 
-      if receiptStatus != .retryPeriod {
+      if receiptStatus != BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue {
         return
       }
     }

diff --git a/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift b/Sources/Brave/Frontend/Browser/BrowserViewController/BrowserViewController+Menu.swift
@@ -18,7 +18,7 @@ extension BrowserViewController {
   func featuresMenuSection(_ menuController: MenuViewController) -> some View {
     VStack(alignment: .leading, spacing: 5) {
       VPNMenuButton(
-        retryStateActive: Preferences.VPN.vpnReceiptStatus.value == .retryPeriod,
+        retryStateActive: Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue,
         vpnProductInfo: self.vpnProductInfo,
         displayVPNDestination: { [unowned self] vc in
           (self.presentedViewController as? MenuViewController)?
@@ -55,7 +55,7 @@ extension BrowserViewController {
         .padding(.bottom, 5)
 
       VPNMenuButton(
-        retryStateActive: Preferences.VPN.vpnReceiptStatus.value == .retryPeriod,
+        retryStateActive: Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue,
         vpnProductInfo: self.vpnProductInfo,
         description: Strings.OptionsMenu.braveVPNItemDescription,
         displayVPNDestination: { [unowned self] vc in

diff --git a/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/VPNMenuButton.swift b/Sources/Brave/Frontend/Browser/Toolbars/BottomToolbar/Menu/VPNMenuButton.swift
@@ -124,7 +124,7 @@ struct VPNMenuButton: View {
 
   private var headerView: some View {
     HStack(spacing: 14) {
-      Image(braveSystemName: retryStateActive ? "leo.vpn.error" : "leo.product.vpn")
+      Image(braveSystemName: retryStateActive ? "leo.warning.triangle-filled" : "leo.product.vpn")
         .font(.body)
         .frame(width: 32, height: 32)
         .foregroundColor(retryStateActive ? Color(.braveErrorLabel) : Color(.braveLabel))

diff --git a/Sources/Brave/Frontend/Settings/SettingsViewController.swift b/Sources/Brave/Frontend/Settings/SettingsViewController.swift
@@ -557,7 +557,7 @@ class SettingsViewController: TableViewController {
   private func vpnSettingsRow() -> Row {
 
     let (text, color) = { () -> (String, UIColor) in
-      if Preferences.VPN.vpnReceiptStatus.value == .retryPeriod {
+      if Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue {
         return (Strings.VPN.updateActionCellTitle, .braveErrorLabel)
       }
 
@@ -597,11 +597,11 @@ class SettingsViewController: TableViewController {
         guard let vcToShow = vc else { return }
         self.navigationController?.pushViewController(vcToShow, animated: true)
       },
-      image: Preferences.VPN.vpnReceiptStatus.value == .retryPeriod
-        ? UIImage(braveSystemNamed: "leo.product.vpn")
-        : UIImage(braveSystemNamed: "leo.vpn.error")?
-          .withRenderingMode(.alwaysOriginal)
-          .withTintColor(.braveErrorLabel),
+      image: Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue
+        ? UIImage(braveSystemNamed: "leo.warning.triangle-filled")?
+            .withRenderingMode(.alwaysOriginal)
+            .withTintColor(.braveErrorLabel)
+        : UIImage(braveSystemNamed: "leo.product.vpn"),
       accessory: .disclosureIndicator,
       cellClass: ColoredDetailCell.self, context: [ColoredDetailCell.colorKey: color], uuid: "vpnrow")
   }

diff --git a/Sources/BraveVPN/BraveVPN.swift b/Sources/BraveVPN/BraveVPN.swift
@@ -166,7 +166,7 @@ public class BraveVPN {
         GRDSubscriptionManager.setIsPayingUser(true)
       }
 
-      Preferences.VPN.vpnReceiptStatus.value = processedReceiptDetail.status
+      Preferences.VPN.vpnReceiptStatus.value = processedReceiptDetail.status.rawValue
 
       receiptResponse?(processedReceiptDetail)
     }
@@ -283,7 +283,7 @@ public class BraveVPN {
   // MARK: - ReceiptResponse
 
   public struct ReceiptResponse {
-    public enum Status: UserDefaultsEncodable {
+    public enum Status: Int {
       case active, expired, retryPeriod
     }
 

diff --git a/Sources/BraveVPN/BraveVPNPreferences.swift b/Sources/BraveVPN/BraveVPNPreferences.swift
@@ -16,7 +16,7 @@ extension Preferences {
       /// to make sure vpn expiration logic will be called.
       public static let expirationDate = Option<Date?>(key: "vpn.expiration-date", default: nil)
       /// The status of vpn receipt status, used to determine retry period
-      public static let vpnReceiptStatus = Option<BraveVPN.ReceiptResponse.Status?>(key: "vpn.expiration-date", default: nil)
+      public static let vpnReceiptStatus = Option<Int?>(key: "vpn.expiration-date", default: nil)
       /// Whether free trial for the vpn expired for the user.
       public static let freeTrialUsed = Option<Bool>(key: "vpn.free-trial-used", default: false)
       /// First time after user background the app after after installing vpn, we show a notification to say that the vpn

diff --git a/Sources/BraveVPN/BraveVPNSettingsViewController.swift b/Sources/BraveVPN/BraveVPNSettingsViewController.swift
@@ -108,8 +108,8 @@ public class BraveVPNSettingsViewController: TableViewController {
       }
     })
 
-    if Preferences.VPN.vpnReceiptStatus.value == .retryPeriod {
-      switchView.tintColor = .braveErrorLabel
+    if Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue {
+      switchView.onTintColor = .braveErrorLabel
     }
 
     self.vpnConnectionStatusSwitch = switchView
@@ -120,7 +120,7 @@ public class BraveVPNSettingsViewController: TableViewController {
     ], uuid: vpnStatusSectionCellId)
 
     let (subscriptionStatus, statusDetailColor) = { () -> (String, UIColor) in
-      if Preferences.VPN.vpnReceiptStatus.value == .retryPeriod {
+      if Preferences.VPN.vpnReceiptStatus.value == BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue {
         return (Strings.VPN.vpnActionUpdatePaymentMethodSettingsText, .braveErrorLabel)
       }
 

diff --git a/...ets/leo.vpn.error.symbolset/Contents.json → ...g.triangle-filled.symbolset/Contents.json b/...ets/leo.vpn.error.symbolset/Contents.json → ...g.triangle-filled.symbolset/Contents.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -260,7 +260,7 @@ extension BrowserViewController { @@
             return
           }
-          if receiptStatus != .retryPeriod {
+          if receiptStatus != BraveVPN.ReceiptResponse.Status.retryPeriod.rawValue {
             return
           }
         }
@@ Expand Down @@