Refactoring

RomanPodymov · Jun 27, 2024 · b3c4b33 · b3c4b33
1 parent 1405a5b
commit b3c4b33
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/Calcium/MainReducer.swift b/Calcium/MainReducer.swift
@@ -28,6 +28,7 @@ struct MainReducer {
         var enabledMinus = true
         var enabledMultiply = true
         var enabledDivide = true
+        var enabledFactorial = true
 
         var leftValue: BInt?
         var displayingText = ""
@@ -51,27 +52,32 @@ struct MainReducer {
             switch calculatorButton {
             case let .operation(operation):
                 if operation.isUnary {
-                    enabled0 = false
-                    enabled1 = false
-                    enabled2 = false
-                    enabled3 = false
-                    enabled4 = false
-                    enabled5 = false
-                    enabled6 = false
-                    enabled7 = false
-                    enabled8 = false
-                    enabled9 = false
-
-                    enabledPlus = false
-                    enabledMinus = false
-                    enabledMultiply = false
-                    enabledDivide = false
+                    set(enabled: false)
                 }
             default:
                 break
             }
         }
 
+        mutating func set(enabled: Bool) {
+            enabled0 = enabled
+            enabled1 = enabled
+            enabled2 = enabled
+            enabled3 = enabled
+            enabled4 = enabled
+            enabled5 = enabled
+            enabled6 = enabled
+            enabled7 = enabled
+            enabled8 = enabled
+            enabled9 = enabled
+
+            enabledPlus = enabled
+            enabledMinus = enabled
+            enabledMultiply = enabled
+            enabledDivide = enabled
+            enabledFactorial = enabled
+        }
+
         mutating func onButtonPressed(calculatorButton: CalculatorButton) -> Operation? {
             switch calculatorButton {
             case let .digit(value):
@@ -126,21 +132,7 @@ struct MainReducer {
                 state.displayingText = String(value)
                 state.latestOperationButton = .operation(.equals)
 
-                state.enabled0 = true
-                state.enabled1 = true
-                state.enabled2 = true
-                state.enabled3 = true
-                state.enabled4 = true
-                state.enabled5 = true
-                state.enabled6 = true
-                state.enabled7 = true
-                state.enabled8 = true
-                state.enabled9 = true
-
-                state.enabledPlus = true
-                state.enabledMinus = true
-                state.enabledMultiply = true
-                state.enabledDivide = true
+                state.set(enabled: true)
 
                 return .none
             }

diff --git a/Calcium/MainScreen.swift b/Calcium/MainScreen.swift
@@ -53,7 +53,7 @@ struct MainScreen: View {
 
             HStack {
                 view(for: .digit(.zero), enabled: store.state.enabled0)
-                view(for: .operation(.factorial))
+                view(for: .operation(.factorial), enabled: store.state.enabledFactorial)
                 view(for: .clear)
             }