From 6d175c4595f9e8e9f8e209dcd5112f0785f16201 Mon Sep 17 00:00:00 2001
From: "LAPTOP-PMQPEEI6\\ezeelinkindonesia" <teddy@ezeelink.co.id>
Date: Tue, 8 Oct 2019 23:16:43 +0700
Subject: [PATCH 1/2] Add All Country translations and FIxed Function
 Calculator

---
 .idea/.name                                   |  1 +
 .idea/misc.xml                                |  2 +-
 .../com/exuberant/calci/HomeActivity.java     | 44 +++++++++++++++----
 .../main/res/layout/content_answer_view.xml   |  4 +-
 .../main/res/layout/content_number_board.xml  | 38 ++++++++--------
 app/src/main/res/values-cs/strings.xml        | 24 ++++++++++
 app/src/main/res/values-de/strings.xml        | 24 ++++++++++
 app/src/main/res/values-es/strings.xml        | 24 ++++++++++
 app/src/main/res/values-fr/strings.xml        | 24 ++++++++++
 app/src/main/res/values-id/strings.xml        | 24 ++++++++++
 app/src/main/res/values-it/strings.xml        | 24 ++++++++++
 app/src/main/res/values-ja/strings.xml        | 24 ++++++++++
 app/src/main/res/values-nl/strings.xml        | 24 ++++++++++
 app/src/main/res/values-pl/strings.xml        | 24 ++++++++++
 app/src/main/res/values-pt-rBR/strings.xml    | 24 ++++++++++
 app/src/main/res/values-ru/strings.xml        | 24 ++++++++++
 app/src/main/res/values-sk/strings.xml        | 24 ++++++++++
 app/src/main/res/values-sv/strings.xml        | 24 ++++++++++
 app/src/main/res/values-zh-rCN/strings.xml    | 24 ++++++++++
 app/src/main/res/values/strings.xml           | 21 +++++++++
 20 files changed, 415 insertions(+), 31 deletions(-)
 create mode 100644 .idea/.name
 create mode 100644 app/src/main/res/values-cs/strings.xml
 create mode 100644 app/src/main/res/values-de/strings.xml
 create mode 100644 app/src/main/res/values-es/strings.xml
 create mode 100644 app/src/main/res/values-fr/strings.xml
 create mode 100644 app/src/main/res/values-id/strings.xml
 create mode 100644 app/src/main/res/values-it/strings.xml
 create mode 100644 app/src/main/res/values-ja/strings.xml
 create mode 100644 app/src/main/res/values-nl/strings.xml
 create mode 100644 app/src/main/res/values-pl/strings.xml
 create mode 100644 app/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 app/src/main/res/values-ru/strings.xml
 create mode 100644 app/src/main/res/values-sk/strings.xml
 create mode 100644 app/src/main/res/values-sv/strings.xml
 create mode 100644 app/src/main/res/values-zh-rCN/strings.xml

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..1e2600a
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+Calci
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37a7509..dfd2c79 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/exuberant/calci/HomeActivity.java b/app/src/main/java/com/exuberant/calci/HomeActivity.java
index c0f9ac0..014910c 100644
--- a/app/src/main/java/com/exuberant/calci/HomeActivity.java
+++ b/app/src/main/java/com/exuberant/calci/HomeActivity.java
@@ -1,23 +1,29 @@
 package com.exuberant.calci;
 
 import androidx.appcompat.app.AppCompatActivity;
-
 import android.os.Bundle;
 import android.view.View;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.google.android.material.button.MaterialButton;
 
 public class HomeActivity extends AppCompatActivity implements View.OnClickListener {
 
     private String currentNumber = "", totalCalculation = "";
+    private char operator ;
+    private double firstOperand;
+    private double secondOperand;
     private TextView totalCalculationTextView, currentAnswerTextView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
+
+        initializeViews();
+
+    }
+
+    private void initializeViews() {
         findViewById(R.id.btn_zero).setOnClickListener(this);
         findViewById(R.id.btn_one).setOnClickListener(this);
         findViewById(R.id.btn_two).setOnClickListener(this);
@@ -62,8 +68,11 @@ public void onClick(View view) {
 
             //Handle calculation
             case R.id.btn_equals:
+                firstOperand = Double.valueOf(totalCalculation.substring(0,totalCalculation.length()-1));
+                secondOperand = Double.valueOf(currentNumber);
+                operator = totalCalculation.charAt(totalCalculation.length()-1);
                 totalCalculation += currentNumber;
-                calculateAnswer();
+                calculateAnswer(firstOperand, secondOperand, operator);
                 break;
 
             //Handle other numerical button clicks
@@ -93,20 +102,37 @@ private double add(double a, double b){
     }
 
     private double sub(double a, double b){
-        return  a + b;
+        return  a - b;
     }
 
     private double mul(double a, double b){
-        return  a + b;
+        return  a * b;
     }
 
     private double div(double a, double b){
-        return a + b;
+        return a / b;
     }
 
-    private void calculateAnswer(){
+    private void calculateAnswer(Double firstOperand, Double secondOperand, char operator){
         //Use totalCalculation string to get final answer and display it
         double answer = 0.0;
+        if(operator == '+')
+        {
+            answer = add(firstOperand, secondOperand);
+        }
+        else if(operator == '-')
+        {
+            answer = sub(firstOperand, secondOperand);
+        }
+        else if (operator == '/')
+        {
+            answer = div(firstOperand, secondOperand);
+        }
+        else
+        {
+            answer = mul(firstOperand, secondOperand);
+        }
+        currentNumber = String.valueOf(answer);
         updateDisplay();
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_answer_view.xml b/app/src/main/res/layout/content_answer_view.xml
index 970907e..cfeceec 100644
--- a/app/src/main/res/layout/content_answer_view.xml
+++ b/app/src/main/res/layout/content_answer_view.xml
@@ -11,7 +11,7 @@
         android:layout_marginTop="16dp"
         android:gravity="end"
         android:textSize="24sp"
-        android:text="Total Calculation"
+        android:text="@string/total_calculation"
         android:textColor="#757575"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
@@ -24,7 +24,7 @@
         android:layout_marginEnd="16dp"
         android:gravity="end"
         android:textSize="32sp"
-        android:text="Current Calculation"
+        android:text="@string/current_calculation"
         android:textColor="#757575"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/content_number_board.xml b/app/src/main/res/layout/content_number_board.xml
index d98056e..e6a81d6 100644
--- a/app/src/main/res/layout/content_number_board.xml
+++ b/app/src/main/res/layout/content_number_board.xml
@@ -8,7 +8,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_clear"
-        android:text="C"
+        android:text="@string/clear"
         android:backgroundTint="@color/colorClearKey"
         style="@style/CalculatorKeys"
         android:layout_marginTop="16dp"
@@ -24,7 +24,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_opening_brace"
         style="@style/CalculatorKeys"
-        android:text="("
+        android:text="@string/left_parenthese"
         app:layout_constraintBottom_toBottomOf="@+id/btn_clear"
         app:layout_constraintEnd_toStartOf="@+id/btn_closing_brace"
         app:layout_constraintHorizontal_bias="0.5"
@@ -33,7 +33,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_closing_brace"
-        android:text=")"
+        android:text="@string/right_parenthese"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_opening_brace"
         app:layout_constraintEnd_toStartOf="@+id/btn_division"
@@ -43,7 +43,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_division"
-        android:text="/"
+        android:text="@string/divided"
         android:textColor="@android:color/white"
         android:backgroundTint="@color/colorOperatorKey"
         style="@style/CalculatorKeys"
@@ -56,7 +56,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_seven"
-        android:text="7"
+        android:text="@string/seven"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toTopOf="@+id/btn_four"
         app:layout_constraintEnd_toStartOf="@+id/btn_eight"
@@ -66,7 +66,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_eight"
-        android:text="8"
+        android:text="@string/eight"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_seven"
         app:layout_constraintEnd_toStartOf="@+id/btn_nine"
@@ -75,7 +75,7 @@
         app:layout_constraintTop_toTopOf="@+id/btn_seven" />
 
     <com.google.android.material.button.MaterialButton
-        android:text="9"
+        android:text="@string/nine"
         android:id="@+id/btn_nine"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_eight"
@@ -85,7 +85,7 @@
         app:layout_constraintTop_toTopOf="@+id/btn_eight" />
 
     <com.google.android.material.button.MaterialButton
-        android:text="X"
+        android:text="@string/multiplied"
         android:textColor="@android:color/white"
         android:backgroundTint="@color/colorOperatorKey"
         android:id="@+id/btn_multiplication"
@@ -98,7 +98,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_four"
-        android:text="4"
+        android:text="@string/four"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toTopOf="@+id/btn_one"
         app:layout_constraintEnd_toStartOf="@+id/btn_five"
@@ -108,7 +108,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_five"
-        android:text="5"
+        android:text="@string/five"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_four"
         app:layout_constraintEnd_toStartOf="@+id/btn_six"
@@ -118,7 +118,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_six"
-        android:text="6"
+        android:text="@string/six"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_five"
         app:layout_constraintEnd_toStartOf="@+id/btn_subtraction"
@@ -129,7 +129,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_subtraction"
         style="@style/CalculatorKeys"
-        android:text="-"
+        android:text="@string/minus"
         android:textColor="@android:color/white"
         android:backgroundTint="@color/colorOperatorKey"
         app:layout_constraintBottom_toBottomOf="@+id/btn_six"
@@ -140,7 +140,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_one"
-        android:text="1"
+        android:text="@string/one"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toTopOf="@+id/btn_zero"
         app:layout_constraintEnd_toStartOf="@+id/btn_two"
@@ -150,7 +150,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_two"
-        android:text="2"
+        android:text="@string/two"
         style="@style/CalculatorKeys"
         app:layout_constraintBottom_toBottomOf="@+id/btn_one"
         app:layout_constraintEnd_toStartOf="@+id/btn_three"
@@ -161,7 +161,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_three"
         style="@style/CalculatorKeys"
-        android:text="3"
+        android:text="@string/three"
         app:layout_constraintBottom_toBottomOf="@+id/btn_two"
         app:layout_constraintEnd_toStartOf="@+id/btn_addition"
         app:layout_constraintHorizontal_bias="0.5"
@@ -171,7 +171,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_addition"
         style="@style/CalculatorKeys"
-        android:text="+"
+        android:text="@string/plus"
         android:textColor="@android:color/white"
         android:backgroundTint="@color/colorOperatorKey"
         app:layout_constraintBottom_toBottomOf="@+id/btn_three"
@@ -185,7 +185,7 @@
         style="@style/CalculatorKeys"
         android:layout_width="0dp"
         android:width="0dp"
-        android:text="0"
+        android:text="@string/zero"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/btn_two"
         app:layout_constraintHorizontal_bias="0.5"
@@ -195,7 +195,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_point"
         style="@style/CalculatorKeys"
-        android:text="."
+        android:text="@string/dot"
         app:layout_constraintBottom_toBottomOf="@+id/btn_zero"
         app:layout_constraintEnd_toStartOf="@+id/btn_equals"
         app:layout_constraintHorizontal_bias="0.5"
@@ -205,7 +205,7 @@
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_equals"
         style="@style/CalculatorKeys"
-        android:text="="
+        android:text="@string/equal_to"
         android:textColor="@android:color/white"
         android:backgroundTint="@color/colorEqualKey"
         app:layout_constraintBottom_toBottomOf="@+id/btn_point"
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 0000000..614c83a
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Celkový výpočet</string>
+    <string name="current_calculation">Aktuální výpočet</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..062ae54
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Gesamtberechnung</string>
+    <string name="current_calculation">Aktuelle Berechnung</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..0cfdcc8
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Cálculo total</string>
+    <string name="current_calculation">Cálculo actual</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..e9bd5aa
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Calcul total</string>
+    <string name="current_calculation">Calcul du courant</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
new file mode 100644
index 0000000..8342c86
--- /dev/null
+++ b/app/src/main/res/values-id/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Total Hitung</string>
+    <string name="current_calculation">Hitungan Saat Ini</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 0000000..a76a7dc
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Calcolo totale</string>
+    <string name="current_calculation">Calcolo corrente</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
new file mode 100644
index 0000000..0edc421
--- /dev/null
+++ b/app/src/main/res/values-ja/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">合計計算</string>
+    <string name="current_calculation">現在の計算</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..22eab14
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Totale berekening</string>
+    <string name="current_calculation">Huidige berekening</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 0000000..dce1940
--- /dev/null
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Łączna kalkulacja</string>
+    <string name="current_calculation">Obecne obliczenia</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..4fcddfb
--- /dev/null
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Calcular Total</string>
+    <string name="current_calculation">Cálculo atual</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 0000000..f8b70e8
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Общий расчет</string>
+    <string name="current_calculation">Текущий расчет</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
new file mode 100644
index 0000000..1808af5
--- /dev/null
+++ b/app/src/main/res/values-sk/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Celkový výpočet</string>
+    <string name="current_calculation">Aktuálny výpočet</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
new file mode 100644
index 0000000..2337065
--- /dev/null
+++ b/app/src/main/res/values-sv/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">Total beräkning</string>
+    <string name="current_calculation">Aktuell beräkning</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..7855608
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,24 @@
+<resources>
+    <string name="app_name">Calci</string>
+    <string name="total_calculation">总计计算</string>
+    <string name="current_calculation">当前计算</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3c3a285..a77dcef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,24 @@
 <resources>
     <string name="app_name">Calci</string>
+    <string name="total_calculation">Total calculation </string>
+    <string name="current_calculation">Current calculation</string>
+    <string name="clear">C</string>
+    <string name="left_parenthese">(</string>
+    <string name="right_parenthese">)</string>
+    <string name="divided">/</string>
+    <string name="seven">7</string>
+    <string name="eight">8</string>
+    <string name="nine">9</string>
+    <string name="multiplied">X</string>
+    <string name="four">4</string>
+    <string name="five">5</string>
+    <string name="six">6</string>
+    <string name="minus">-</string>
+    <string name="one">1</string>
+    <string name="two">2</string>
+    <string name="three">3</string>
+    <string name="plus">+</string>
+    <string name="zero">0</string>
+    <string name="dot">.</string>
+    <string name="equal_to">=</string>
 </resources>

From a767b8b73266616b70674dabf26a07e92a3ebc43 Mon Sep 17 00:00:00 2001
From: "LAPTOP-PMQPEEI6\\ezeelinkindonesia" <teddy@ezeelink.co.id>
Date: Tue, 8 Oct 2019 23:20:48 +0700
Subject: [PATCH 2/2] no message

---
 .idea/.name                            |   1 -
 .idea/codeStyles/Project.xml           | 116 -------------------------
 .idea/misc.xml                         |   9 --
 .idea/runConfigurations.xml            |  12 ---
 .idea/vcs.xml                          |   6 --
 app/src/main/res/values-it/strings.xml |  24 +----
 6 files changed, 3 insertions(+), 165 deletions(-)
 delete mode 100644 .idea/.name
 delete mode 100644 .idea/codeStyles/Project.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/runConfigurations.xml
 delete mode 100644 .idea/vcs.xml

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 1e2600a..0000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Calci
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 681f41a..0000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index dfd2c79..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a76a7dc..b682571 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,24 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Calci</string>
-    <string name="total_calculation">Calcolo totale</string>
     <string name="current_calculation">Calcolo corrente</string>
-    <string name="clear">C</string>
-    <string name="left_parenthese">(</string>
-    <string name="right_parenthese">)</string>
-    <string name="divided">/</string>
-    <string name="seven">7</string>
-    <string name="eight">8</string>
-    <string name="nine">9</string>
-    <string name="multiplied">X</string>
-    <string name="four">4</string>
-    <string name="five">5</string>
-    <string name="six">6</string>
-    <string name="minus">-</string>
-    <string name="one">1</string>
-    <string name="two">2</string>
-    <string name="three">3</string>
-    <string name="plus">+</string>
-    <string name="zero">0</string>
-    <string name="dot">.</string>
-    <string name="equal_to">=</string>
-</resources>
+    <string name="total_calculation">Risultato</string>
+</resources>
\ No newline at end of file