Remove FXIOS-12223 [Toolbar] Remove baseline version (#29592)

* Remove baseline version

* Optimize code

Author: thatswinnie

firefox-ios/Client/Frontend/Browser/Toolbars/ToolbarLayoutStyle.swift

@@ -13,7 +13,7 @@ enum ToolbarLayoutStyle: String {
     static func style(from type: ToolbarLayoutType?) -> ToolbarLayoutStyle {
         guard let type else { return .version1 }
         switch type {
-        case .version1, .baseline: return .version1
+        case .version1: return .version1
         case .version2: return .version2
         }
     }

firefox-ios/Client/Frontend/Onboarding/Models/OnboardingKitCardInfoModel.swift

@@ -54,18 +54,7 @@ struct OnboardingKitCardInfoModel: OnboardingKit.OnboardingCardInfoModelProtocol
     var defaultSelectedButton: OnboardingKit.OnboardingMultipleChoiceButtonModel<OnboardingMultipleChoiceAction>? {
         guard !multipleChoiceButtons.isEmpty else { return nil }
 
-        let toolbarLayout = FxNimbus.shared.features
-            .toolbarRefactorFeature
-            .value()
-            .layout
-
-        let isVersionedLayout = [.version1, .version2, .baseline].contains(toolbarLayout)
-
-        if isVersionedLayout {
-            return findHighestPriorityButton() ?? multipleChoiceButtons.first
-        }
-
-        return multipleChoiceButtons.first
+        return findHighestPriorityButton() ?? multipleChoiceButtons.first
     }
 
     private func findHighestPriorityButton()

firefox-ios/Client/Frontend/Onboarding/Views/OnboardingMultipleChoiceCardViewController.swift

@@ -252,21 +252,12 @@ class OnboardingMultipleChoiceCardViewController: OnboardingCardViewController {
     private func isSelectedButton<T: OnboardingCardInfoModelProtocol>(
         buttonModel: OnboardingMultipleChoiceButtonModel,
         viewModel: T) -> Bool {
-        let toolbarLayout = FxNimbus.shared.features
-            .toolbarRefactorFeature
-            .value()
-            .layout
-
-        switch toolbarLayout {
-        case .version1, .version2, .baseline:
-            let isToolbarBottomAction = buttonModel.action == .toolbarBottom
-            let isToolbarTopAction = buttonModel.action == .toolbarTop
-            if isToolbarBottomAction {
-                return true
-            } else {
-                return !isToolbarTopAction && buttonModel == viewModel.multipleChoiceButtons.first
-            }
-        default: return buttonModel == viewModel.multipleChoiceButtons.first
+        let isToolbarBottomAction = buttonModel.action == .toolbarBottom
+        let isToolbarTopAction = buttonModel.action == .toolbarTop
+        if isToolbarBottomAction {
+            return true
+        } else {
+            return !isToolbarTopAction && buttonModel == viewModel.multipleChoiceButtons.first
         }
     }
 

firefox-ios/Client/TabManagement/TabWebViewPreviewAppearanceConfiguration.swift

@@ -7,7 +7,6 @@ import Common
 
 struct TabWebViewPreviewAppearanceConfiguration {
     private struct UX {
-        static let baselineAddressBarCornerRadius: CGFloat = 8
         static let versionAddressBarCornerRadius: CGFloat = 12
     }
     let containerStackViewBackgroundColor: UIColor

firefox-ios/nimbus-features/toolbarRefactorFeature.yaml

@@ -85,8 +85,6 @@ enums:
   ToolbarLayoutType:
     description: The type of toolbar layout.
     variants:
-      baseline:
-        description: The default layout of the toolbars.
       version1:
         description: Shows the add new tab, menu and tabs button in the navigation toolbar. The share button is displayed in the address toolbar.
       version2: