Merge pull request #41 from ricglz0201/landscape_btn_change

Change BASE button styling and position
ricglz · May 26, 2020 · 3cb123a · 3cb123a
2 parents b82b546 + b1f7651
commit 3cb123a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/BaseCalc/Views/Keypad.swift b/BaseCalc/Views/Keypad.swift
@@ -49,7 +49,7 @@ struct KeypadSection: View {
         GeometryReader { geometry in
             createKeypad(
                 buttons: self.buttons,
-                width: getDimension(dim: geometry.size.width, elem: self.buttons[0].count, pad: self.btnPadding),
+                width: getDimension(dim: geometry.size.width, elem: self.buttons[1].count, pad: self.btnPadding),
                 height: getDimension(dim: geometry.size.height, elem: self.buttons.count, pad: self.btnPadding),
                 pad: self.btnPadding
             )
@@ -76,12 +76,12 @@ struct LandscapeKeypad: View {
     var body: some View {
         KeypadSection(
             buttons: [
-                ["AND", "NOR", "D", "E", "F", "AC"],
-                ["OR", "XOR", "A", "B", "C", "±"],
-                [">>", "X>>Y", "7", "8", "9", "+"],
-                ["<<", "X<<Y", "4", "5", "6", "−"],
-                ["FP", "ß", "1", "2", "3", "×"],
-                ["BASE", "=", "0", ".", "÷"],
+                ["BASE", "D", "E", "F", "AC"],
+                ["AND", "NOR", "A", "B", "C", "±"],
+                ["OR", "XOR", "7", "8", "9", "+"],
+                [">>", "X>>Y", "4", "5", "6", "−"],
+                ["<<", "X<<Y", "1", "2", "3", "×"],
+                ["FP", "ß", "=", "0", ".", "÷"],
             ]
         )
     }

diff --git a/BaseCalc/Views/KeypadButton.swift b/BaseCalc/Views/KeypadButton.swift
@@ -76,7 +76,7 @@ struct KeypadButton: View {
                 )
             })) {
                 Text(label + " \(calculatorState.currentBase.rawValue)")
-                    .modifier(DarkGrayButton(width: width * 2 + 6, height: height, altCondition: false))
+                    .modifier(OrangeButton(width: width * 2 + 6, height: height, altCondition: false))
             })
         default:
             return makeDigitButton(label: label)