[iOS] - Cleanup UI and Strings (#27858)

* Cleanup VPN, AIChat, and RecentlyClosedTabs UI * Cleanup Wallet Strings from AIChat * Fix warnings in Package.swift
brave · Feb 28, 2025 · cd59f2e · cd59f2e
1 parent c3f6d66
commit cd59f2e
Show file tree

Hide file tree

Showing 37 changed files with 26 additions and 582 deletions.
diff --git a/ios/brave-ios/Plugins/LeoAssetsPlugin/LeoAssetsPlugin.swift b/ios/brave-ios/Plugins/LeoAssetsPlugin/LeoAssetsPlugin.swift
@@ -25,7 +25,7 @@ struct LeoAssetsPlugin: BuildToolPlugin {
     }
 
     // Check to make sure the plugin is being used correctly in SPM
-    guard let target = target as? SourceModuleTarget else {
+    guard target is SourceModuleTarget else {
       Diagnostics.error("Attempted to use `LeoAssetsPlugin` on an unsupported module target")
       return []
     }

diff --git a/ios/brave-ios/Sources/AIChat/Components/AIChatTermsAndConditionsView.swift b/ios/brave-ios/Sources/AIChat/Components/AIChatTermsAndConditionsView.swift
@@ -21,7 +21,7 @@ public struct AIChatTermsAndConditionsView: View {
             .multilineTextAlignment(.leading)
             .frame(maxWidth: .infinity, alignment: .leading)
             .fixedSize(horizontal: false, vertical: true)
-            .font(.body.weight(.semibold))
+            .font(.headline)
             .foregroundStyle(Color(braveSystemName: .textPrimary))
 
           Text(
@@ -53,10 +53,7 @@ public struct AIChatTermsAndConditionsView: View {
             .padding([.leading, .trailing], 16)
             .frame(maxWidth: .infinity)
             .foregroundStyle(Color(braveSystemName: .schemesOnPrimary))
-            .background(
-              Color(braveSystemName: .buttonBackground),
-              in: Capsule()
-            )
+            .background(Color(braveSystemName: .buttonBackground), in: .capsule)
         }
       )
       .buttonStyle(.plain)

diff --git a/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatBusyErrorView.swift b/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatBusyErrorView.swift
@@ -27,13 +27,10 @@ struct AIChatBusyErrorView: View {
           },
           label: {
             Text(Strings.AIChat.retryActionTitle)
-              .font(.body.weight(.semibold))
+              .font(.headline)
               .padding()
               .foregroundStyle(Color(braveSystemName: .schemesOnPrimary))
-              .background(
-                Color(braveSystemName: .buttonBackground),
-                in: Capsule()
-              )
+              .background(Color(braveSystemName: .buttonBackground), in: .capsule)
           }
         )
         .buttonStyle(.plain)

diff --git a/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatContextLimitErrorView.swift b/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatContextLimitErrorView.swift
@@ -27,13 +27,10 @@ struct AIChatContextLimitErrorView: View {
           },
           label: {
             Text(Strings.AIChat.newChatActionTitle)
-              .font(.body.weight(.semibold))
+              .font(.headline)
               .padding()
               .foregroundStyle(Color(braveSystemName: .schemesOnPrimary))
-              .background(
-                Color(braveSystemName: .buttonBackground),
-                in: Capsule()
-              )
+              .background(Color(braveSystemName: .buttonBackground), in: .capsule)
           }
         )
         .buttonStyle(.plain)

diff --git a/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatNetworkErrorView.swift b/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatNetworkErrorView.swift
@@ -27,14 +27,11 @@ struct AIChatNetworkErrorView: View {
           },
           label: {
             Text(Strings.AIChat.retryActionTitle)
-              .font(.body.weight(.semibold))
+              .font(.headline)
               .foregroundColor(Color(braveSystemName: .schemesOnPrimary))
               .padding()
               .foregroundStyle(.white)
-              .background(
-                Color(braveSystemName: .buttonBackground),
-                in: Capsule()
-              )
+              .background(Color(braveSystemName: .buttonBackground), in: .capsule)
           }
         )
         .buttonStyle(.plain)

diff --git a/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatSessionExpiredErrorView.swift b/ios/brave-ios/Sources/AIChat/Components/Errors/AIChatSessionExpiredErrorView.swift
@@ -27,13 +27,10 @@ struct AIChatSessionExpiredErrorView: View {
           },
           label: {
             Text(Strings.AIChat.refreshCredentialsActionTitle)
-              .font(.body.weight(.semibold))
+              .font(.headline)
               .padding()
               .foregroundStyle(Color(braveSystemName: .schemesOnPrimary))
-              .background(
-                Color(braveSystemName: .buttonBackground),
-                in: Capsule()
-              )
+              .background(Color(braveSystemName: .buttonBackground), in: .capsule)
           }
         )
         .buttonStyle(.plain)

diff --git a/ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackToastView.swift b/ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackToastView.swift
@@ -128,7 +128,6 @@ struct AIChatFeedbackToastView: View {
         } label: {
           Label {
             Text(Strings.close)
-
           } icon: {
             Image(systemName: "xmark")
               .foregroundStyle(Color(braveSystemName: .primary30))

diff --git a/ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackView.swift b/ios/brave-ios/Sources/AIChat/Components/Feedback/AIChatFeedbackView.swift
@@ -365,7 +365,7 @@ struct AIChatFeedbackView: View {
   var body: some View {
     VStack {
       Text(Strings.AIChat.feedbackViewMainTitle)
-        .font(.body.weight(.semibold))
+        .font(.headline)
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding()
 

diff --git a/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatMessageHeaderView.swift b/ios/brave-ios/Sources/AIChat/Components/Messages/AIChatMessageHeaderView.swift
@@ -21,14 +21,14 @@ struct AIChatMessageHeaderView: View {
           .background(Color(braveSystemName: .containerHighlight), in: Circle())
 
         Text(Strings.AIChat.youMessageTitle)
-          .font(.body.weight(.semibold))
+          .font(.headline)
           .foregroundStyle(Color(braveSystemName: .textTertiary))
       } else {
         AIChatProductIcon(containerShape: Circle(), padding: 6.0)
           .font(.callout)
 
         Text(Strings.AIChat.leoAssistantNameTitle)
-          .font(.body.weight(.semibold))
+          .font(.headline)
           .foregroundStyle(Color(braveSystemName: .textTertiary))
       }
 

diff --git a/ios/brave-ios/Sources/AIChat/Components/Paywall/AIChatPaywallView.swift b/ios/brave-ios/Sources/AIChat/Components/Paywall/AIChatPaywallView.swift
@@ -128,7 +128,7 @@ struct AIChatPaywallView: View {
       }
       .background(
         Color(braveSystemName: .primitivePrimary10)
-          .edgesIgnoringSafeArea(.all)
+          .ignoresSafeArea()
           .overlay(
             Image("leo-product", bundle: .module),
             alignment: .topTrailing
@@ -221,7 +221,7 @@ struct AIChatPaywallView: View {
                   ? Strings.AIChat.paywallPurchaseActionIntroOfferTitle
                   : Strings.AIChat.paywallPurchaseActionTitle
               )
-              .font(.body.weight(.semibold))
+              .font(.headline)
               .foregroundColor(Color(.white))
               .padding()
             }

diff --git a/ios/brave-ios/Sources/AIChat/Components/Paywall/AIChatPremiumUpsellView.swift b/ios/brave-ios/Sources/AIChat/Components/Paywall/AIChatPremiumUpsellView.swift
@@ -133,7 +133,7 @@ struct PremiumUpsellTitleView: View {
         .font(.body.weight(.medium))
         .lineLimit(2)
         .truncationMode(.tail)
-        .frame(maxWidth: .infinity, alignment: .center)
+        .frame(maxWidth: .infinity)
         .fixedSize(horizontal: false, vertical: true)
         .foregroundStyle(foregroundTextColor)
     case .rateLimit:

diff --git a/ios/brave-ios/Sources/AIChat/Resources/ca.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/ca.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/de.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/de.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/en.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/en.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/es.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/es.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/fr.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/fr.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/id-ID.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/id-ID.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/it.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/it.lproj/BraveWallet.strings
diff --git a/ios/brave-ios/Sources/AIChat/Resources/ja.lproj/BraveWallet.strings b/ios/brave-ios/Sources/AIChat/Resources/ja.lproj/BraveWallet.strings