Refactoring

RomanPodymov · Jun 6, 2024 · bebf619 · bebf619
1 parent ed2feb4
commit bebf619
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/Calcium/Enums.swift b/Calcium/Enums.swift
@@ -35,6 +35,21 @@ enum Operation {
     case multiply
     case divide
     case equals
+
+    func calculateValue(lhs: Int, rhs: Int) -> Int {
+        switch self {
+        case .plus:
+            lhs + rhs
+        case .minus:
+            lhs - rhs
+        case .multiply:
+            lhs * rhs
+        case .divide:
+            lhs / rhs
+        case .equals:
+            0
+        }
+    }
 }
 
 extension Operation: CalculatorButtonRepresentable {

diff --git a/Calcium/MainScreen.swift b/Calcium/MainScreen.swift
@@ -37,14 +37,11 @@ struct MainScreen: View {
                     onOperationButtonPressed(calculatorButton: calculatorButton)
                 case .equals:
                     switch latestOperationButton {
-                    case let .operation(operation) where operation == .minus:
-                        displayingText = String(Int(leftValue)! - Int(displayingText)!)
-                    case let .operation(operation) where operation == .plus:
-                        displayingText = String(Int(leftValue)! + Int(displayingText)!)
-                    case let .operation(operation) where operation == .multiply:
-                        displayingText = String(Int(leftValue)! * Int(displayingText)!)
-                    case let .operation(operation) where operation == .divide:
-                        displayingText = String(Int(leftValue)! / Int(displayingText)!)
+                    case let .operation(operation):
+                        displayingText = String(operation.calculateValue(
+                            lhs: Int(leftValue)!,
+                            rhs: Int(displayingText)!)
+                        )
                     default:
                         break
                     }