Updates CalculatorButtonsView to use new calculator button views

DeluxeAlonso · Jan 8, 2024 · d9f6016 · d9f6016
1 parent a83b9df
commit d9f6016
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CalculatorReplicaSwiftUI.xcodeproj/project.pbxproj b/CalculatorReplicaSwiftUI.xcodeproj/project.pbxproj
@@ -241,7 +241,6 @@
 				E2CBA5172442C3D3008A3097 /* CalculatorButtonProtocol.swift */,
 				E2CBA51B2442C660008A3097 /* CalculatorButton.swift */,
 				E201FACB24421E6200AE6F4C /* CalculatorButtonsView.swift */,
-				E256231024427A3E00AA7CD0 /* CalculatorButtonViewLegacy.swift */,
 			);
 			path = Buttons;
 			sourceTree = "<group>";
@@ -406,6 +405,7 @@
 		E2EF8BDB2B4B975800533B97 /* Legacy */ = {
 			isa = PBXGroup;
 			children = (
+				E256231024427A3E00AA7CD0 /* CalculatorButtonViewLegacy.swift */,
 				E2667764245D14E5006B2872 /* CalculatorTextButtonLegacy.swift */,
 				E2667766245D14F0006B2872 /* CalculatorImageButtonLegacy.swift */,
 			);

diff --git a/CalculatorReplicaSwiftUI/Scenes/Calculator/Buttons/CalculatorButtonsView.swift b/CalculatorReplicaSwiftUI/Scenes/Calculator/Buttons/CalculatorButtonsView.swift
@@ -14,10 +14,18 @@ struct CalculatorButtonsView: View {
     var body: some View {
         ForEach(0...env.calculatorButtons.count - 1, id: \.self) { index in
             HStack(spacing: 12) {
-                ForEach(self.env.calculatorButtons[index], id: \.title) { button in
-                    CalculatorButtonViewLegacy(button: button)
+                ForEach(env.calculatorButtons[index], id: \.title) { button in
+                    containedView(button)
                 }
             }
         }
     }
+
+    private func containedView(_ button: CalculatorButtonProtocol) -> AnyView {
+        if let calculatorImageButton = CalculatorImageButtonAdapter(button) {
+            return CalculatorImageButton(button: calculatorImageButton).erasedToAnyView()
+        }
+        let calculatorTextButton = CalculatorTextButtonAdapter(button)
+        return CalculatorTextButton(button: calculatorTextButton).erasedToAnyView()
+    }
 }
diff --git a/.../Buttons/CalculatorButtonViewLegacy.swift → ...s/Legacy/CalculatorButtonViewLegacy.swift b/.../Buttons/CalculatorButtonViewLegacy.swift → ...s/Legacy/CalculatorButtonViewLegacy.swift