Merge branch 'main' of https://github.com/Darkempire78/OpenCalc

Darkempire78 · Feb 11, 2023 · 089cf10 · 089cf10
2 parents ecddbde + b6a2b65
commit 089cf10
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt b/app/src/main/java/com/darkempire78/opencalculator/MainActivity.kt
@@ -355,7 +355,7 @@ class MainActivity : AppCompatActivity() {
         updateDisplay(view, decimalSeparator)
     }
 
-    fun devideButton(view: View) {
+    fun divideButton(view: View) {
         updateDisplay(view, "÷")
     }
 
@@ -427,7 +427,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    fun devideBy100(view: View) {
+    fun divideBy100(view: View) {
         updateDisplay(view, "%")
     }
 

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -49,13 +49,13 @@
                         android:text="@string/square" />
 
                     <Button
-                        android:id="@+id/devideBy100Button"
+                        android:id="@+id/divideBy100Button"
                         style="@style/CalculatorButton.Function"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:onClick="devideBy100"
-                        android:text="@string/devideBy100" />
+                        android:onClick="divideBy100"
+                        android:text="@string/divideBy100" />
 
                     <Button
                         android:id="@+id/factorialButton"
@@ -94,13 +94,13 @@
                         android:text="@string/nine" />
 
                     <ImageButton
-                        android:id="@+id/devideButton"
+                        android:id="@+id/divideButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
-                        android:onClick="devideButton"
+                        android:onClick="divideButton"
                         app:srcCompat="@drawable/divide" />
 
                     <Button

diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -117,14 +117,14 @@
                         android:text="@string/pi" />
 
                     <Button
-                        android:id="@+id/devideBy100Button"
+                        android:id="@+id/divideBy100Button"
                         style="@style/CalculatorButton.Function"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_margin="0dp"
                         android:layout_weight="1"
-                        android:onClick="devideBy100"
-                        android:text="@string/devideBy100" />
+                        android:onClick="divideBy100"
+                        android:text="@string/divideBy100" />
 
                     <Button
                         android:id="@+id/factorialButton"
@@ -308,13 +308,13 @@
                         app:srcCompat="@drawable/exponent" />
 
                     <ImageButton
-                        android:id="@+id/devideButton"
+                        android:id="@+id/divideButton"
                         style="@style/CalculatorButton.Small"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
-                        android:onClick="devideButton"
+                        android:onClick="divideButton"
                         app:srcCompat="@drawable/divide" />
                 </TableRow>
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -118,14 +118,14 @@
                         android:textSize="26sp" />
 
                     <Button
-                        android:id="@+id/devideBy100Button"
+                        android:id="@+id/divideBy100Button"
                         style="@style/CalculatorButton.Function"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_margin="0dp"
                         android:layout_weight="1"
-                        android:onClick="devideBy100"
-                        android:text="@string/devideBy100"
+                        android:onClick="divideBy100"
+                        android:text="@string/divideBy100"
                         android:textSize="26sp" />
 
                     <Button
@@ -309,13 +309,13 @@
                         app:srcCompat="@drawable/exponent" />
 
                     <ImageButton
-                        android:id="@+id/devideButton"
+                        android:id="@+id/divideButton"
                         style="@style/CalculatorButton"
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:backgroundTint="?attr/button_symbol_color"
-                        android:onClick="devideButton"
+                        android:onClick="divideButton"
                         app:srcCompat="@drawable/divide" />
                 </TableRow>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -21,12 +21,12 @@
     <string name="substract" translatable="false">−</string>
     <string name="point" translatable="false">.</string>
     <string name="equals" translatable="false">=</string>
-    <string name="devide" translatable="false">÷</string>
+    <string name="divide" translatable="false">÷</string>
     <string name="multiply" translatable="false">×</string>
     <string name="exponent" translatable="false">^</string>
     <string name="backspace" translatable="false"> </string>
 
-    <string name="devideBy100" translatable="false">%</string>
+    <string name="divideBy100" translatable="false">%</string>
     <string name="degree" translatable="false">DEG</string>
     <string name="sinus" translatable="false">sin</string>
     <string name="sinusInv" translatable="false">sin⁻¹</string>