refactor: 💡 [HCPSDKFIORIUIKIT-2892]SwitchPickerItem Refactor (#953)

Co-authored-by: dyongxu <[email protected]>
SAP · Jan 13, 2025 · 0802d8a · 0802d8a
1 parent 1f6bcad
commit 0802d8a
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 24 deletions.
diff --git a/Apps/Examples/Examples/FioriSwiftUICore/FormCells/SwitchExample.swift b/Apps/Examples/Examples/FioriSwiftUICore/FormCells/SwitchExample.swift
@@ -6,7 +6,8 @@ struct SwitchExample: View {
     @State var v1: Bool = false
     @State var v2: Bool = true
     @State var v3: Bool = true
-
+    @State var v4: Bool = true
+
     struct CustomTitleStyle: TitleStyle {
         @Environment(\.isEnabled) var isEnabled
         func makeBody(_ configuration: TitleConfiguration) -> some View {
@@ -30,6 +31,7 @@ struct SwitchExample: View {
             SwitchView(title: "Custom Style", isOn: self.$v3)
                 .titleStyle(CustomTitleStyle())
                 .switchStyle(CustomSwitchStyle())
+            SwitchView(title: "Very long title, layout depend on title width. long long long long long long long long long long long long long long long long long long long long long long long", isOn: self.$v4)
         }
     }
 }

diff --git a/Sources/FioriSwiftUICore/Models/ModelDefinitions.swift b/Sources/FioriSwiftUICore/Models/ModelDefinitions.swift
@@ -592,7 +592,10 @@ public protocol SearchListPickerItemModel: OptionListPickerComponent {
 // sourcery: add_env_props = "filterFeedbackBarStyle"
 // sourcery: generated_component_not_configurable
 // sourcery: add_env_props = "fioriToggleStyle"
-public protocol SwitchPickerItemModel: SwitchPickerComponent {}
+public protocol _SwitchPickerItemModel: SwitchPickerComponent {}
+
+@available(*, unavailable, renamed: "_SwitchPickerItemModel", message: "Will be removed in the future release. Please create SwitchView with other initializers instead.")
+public protocol SwitchPickerItemModel {}
 
 // sourcery: add_env_props = "filterFeedbackBarStyle"
 // sourcery: generated_component_not_configurable

diff --git a/Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift b/Sources/FioriSwiftUICore/Views/SortFilter/_SortFilterCFGItemContainer.swift
@@ -286,7 +286,7 @@ extension _SortFilterCFGItemContainer: View {
 
     func switcher(row r: Int, column c: Int) -> some View {
         VStack {
-            SwitchPickerItem(value: Binding<Bool?>(get: { self._items[r][c].switch.workingValue }, set: { self._items[r][c].switch.workingValue = $0 }), name: self._items[r][c].switch.name, hint: nil)
+            SwitchView(title: AttributedString(self._items[r][c].switch.name), isOn: Binding<Bool>(get: { self._items[r][c].switch.workingValue ?? false }, set: { self._items[r][c].switch.workingValue = $0 }))
         }
     }
 

diff --git a/...tUICore/Views/SwitchPickerItem+View.swift → ...UICore/Views/_SwitchPickerItem+View.swift b/...tUICore/Views/SwitchPickerItem+View.swift → ...UICore/Views/_SwitchPickerItem+View.swift
@@ -1,7 +1,7 @@
 import FioriThemeManager
 import SwiftUI
 
-extension SwitchPickerItem: View {
+extension _SwitchPickerItem: View {
     public var body: some View {
         AnyView(
             Toggle(_name ?? "", isOn: .convert(from: _value, ifNilUse: false))
@@ -122,9 +122,9 @@ private struct TestSwitchPicker: View {
 
     var body: some View {
         VStack {
-            SwitchPickerItem(value: self.$v1, hint: nil)
-            SwitchPickerItem(value: self.$v2, hint: nil)
-            SwitchPickerItem(value: self.$v3, hint: nil)
+            _SwitchPickerItem(value: self.$v1, hint: nil)
+            _SwitchPickerItem(value: self.$v2, hint: nil)
+            _SwitchPickerItem(value: self.$v3, hint: nil)
         }
     }
 }

diff --git a/Sources/FioriSwiftUICore/_FioriStyles/SwitchViewStyle.fiori.swift b/Sources/FioriSwiftUICore/_FioriStyles/SwitchViewStyle.fiori.swift
@@ -7,10 +7,19 @@ import SwiftUI
 // Base Layout style
 public struct SwitchViewBaseStyle: SwitchViewStyle {
     public func makeBody(_ configuration: SwitchViewConfiguration) -> some View {
-        HStack {
-            configuration.title
-            Spacer()
-            configuration._switch
+        ViewThatFits {
+            HStack {
+                configuration.title
+                Spacer()
+                configuration._switch
+            }
+            VStack(alignment: .leading, spacing: 0) {
+                configuration.title
+                HStack {
+                    Spacer()
+                    configuration._switch
+                }
+            }
         }
     }
 }

diff --git a/.../API/SwitchPickerItem+API.generated.swift → ...API/_SwitchPickerItem+API.generated.swift b/.../API/SwitchPickerItem+API.generated.swift → ...API/_SwitchPickerItem+API.generated.swift
@@ -2,15 +2,15 @@
 // DO NOT EDIT
 import SwiftUI
 
-public struct SwitchPickerItem {
+public struct _SwitchPickerItem {
     @Environment(\.fioriToggleStyle) var fioriToggleStyle
 	@Environment(\.filterFeedbackBarStyle) var filterFeedbackBarStyle
 
     var _value: Binding<Bool?>
 	var _name: String? = nil
 	var _hint: String? = nil
 
-    public init(model: SwitchPickerItemModel) {
+    public init(model: _SwitchPickerItemModel) {
         self.init(value: Binding<Bool?>(get: { model.value }, set: { model.value = $0 }), name: model.name, hint: model.hint)
     }
 

diff --git a/...ate/SwitchPickerItem+View.generated.swift → ...te/_SwitchPickerItem+View.generated.swift b/...ate/SwitchPickerItem+View.generated.swift → ...te/_SwitchPickerItem+View.generated.swift
@@ -1,7 +1,7 @@
 // Generated using Sourcery 2.1.7 — https://github.com/krzysztofzablocki/Sourcery
 // DO NOT EDIT
-//TODO: Copy commented code to new file: `FioriSwiftUICore/Views/SwitchPickerItem+View.swift`
-//TODO: Implement SwitchPickerItem `View` body
+//TODO: Copy commented code to new file: `FioriSwiftUICore/Views/_SwitchPickerItem+View.swift`
+//TODO: Implement _SwitchPickerItem `View` body
 
 /// - Important: to make `@Environment` properties (e.g. `horizontalSizeClass`), internally accessible
 /// to extensions, add as sourcery annotation in `FioriSwiftUICore/Models/ModelDefinitions.swift`
@@ -13,21 +13,21 @@ import SwiftUI
 
 // FIXME: - Implement Fiori style definitions
 
-// FIXME: - Implement SwitchPickerItem View body
+// FIXME: - Implement _SwitchPickerItem View body
 
-extension SwitchPickerItem: View {
+extension _SwitchPickerItem: View {
     public var body: some View {
         <# View body #>
     }
 }
 
-// FIXME: - Implement SwitchPickerItem specific LibraryContentProvider
+// FIXME: - Implement _SwitchPickerItem specific LibraryContentProvider
 
 @available(iOS 14.0, macOS 11.0, *)
-struct SwitchPickerItemLibraryContent: LibraryContentProvider {
+struct _SwitchPickerItemLibraryContent: LibraryContentProvider {
     @LibraryContentBuilder
     var views: [LibraryItem] {
-        LibraryItem(SwitchPickerItem(model: LibraryPreviewData.Person.laurelosborn),
+        LibraryItem(_SwitchPickerItem(model: LibraryPreviewData.Person.laurelosborn),
                     category: .control)
     }
 }

diff --git a/...riSwiftUICore/_generated/ViewModels/Init+Extensions/SwitchPickerItem+Init.generated.swift b/...riSwiftUICore/_generated/ViewModels/Init+Extensions/SwitchPickerItem+Init.generated.swift
diff --git a/sourcery/.lib/Sources/utils/Type+Extensions.swift b/sourcery/.lib/Sources/utils/Type+Extensions.swift
@@ -81,7 +81,8 @@ public extension Type {
                                     "_SingleStepModel",
                                     "_StepProgressIndicatorModel",
                                     "_ObjectHeaderModel",
-                                    "_HeaderChartModel"]
+                                    "_HeaderChartModel",
+                                    "_SwitchPickerItemModel"]
 
         if deprecatedComponents.contains(name) {
             return name.replacingOccurrences(of: "Model", with: "")