From c18f3556b76151a06cf2483ae1c4b64396406a05 Mon Sep 17 00:00:00 2001
From: Niyaz Validov <niyazvalidov@gmail.com>
Date: Mon, 7 Nov 2016 02:40:58 +0300
Subject: [PATCH 1/2] Update activity_calculator.xml

---
 .../main/res/layout/activity_calculator.xml   | 197 +++++++++++++++++-
 1 file changed, 193 insertions(+), 4 deletions(-)

diff --git a/Calc/app/src/main/res/layout/activity_calculator.xml b/Calc/app/src/main/res/layout/activity_calculator.xml
index c9edfbd..7c9cf05 100644
--- a/Calc/app/src/main/res/layout/activity_calculator.xml
+++ b/Calc/app/src/main/res/layout/activity_calculator.xml
@@ -1,7 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
+    android:orientation="vertical"
+    android:background="#f6eaf8ee">
 
-</LinearLayout>
\ No newline at end of file
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="#f6eaf8ee">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:id="@+id/textView"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@+id/clear" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="&lt;"
+            android:id="@+id/clear"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="7"
+                android:id="@+id/seven"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="8"
+                android:id="@+id/eight"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="9"
+                android:id="@+id/nine"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="+"
+                android:id="@+id/add"
+                android:background="#f9f8df" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="4"
+                android:id="@+id/four"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="5"
+                android:id="@+id/five"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="6"
+                android:id="@+id/six"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="−"
+                android:id="@+id/subtract"
+                android:background="#f9f8df" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="1"
+                android:id="@+id/one"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="2"
+                android:id="@+id/two"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="3"
+                android:id="@+id/three"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="×"
+                android:id="@+id/multiply"
+                android:background="#f9f8df" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="."
+                android:id="@+id/point"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="0"
+                android:id="@+id/zero"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="="
+                android:id="@+id/calc"
+                android:background="#ceccf8" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="÷"
+                android:id="@+id/divide"
+                android:background="#f9f8df" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

From 40b1087d702b2a0a2fdd963b4767d6d17f64b467 Mon Sep 17 00:00:00 2001
From: Niyaz Validov <niyazvalidov@gmail.com>
Date: Mon, 7 Nov 2016 02:42:04 +0300
Subject: [PATCH 2/2] Update CalculatorActivity.java

---
 .../android_2016/calc/CalculatorActivity.java | 145 +++++++++++++++++-
 1 file changed, 139 insertions(+), 6 deletions(-)

diff --git a/Calc/app/src/main/java/ru/ifmo/android_2016/calc/CalculatorActivity.java b/Calc/app/src/main/java/ru/ifmo/android_2016/calc/CalculatorActivity.java
index 7042692..c2cfca9 100644
--- a/Calc/app/src/main/java/ru/ifmo/android_2016/calc/CalculatorActivity.java
+++ b/Calc/app/src/main/java/ru/ifmo/android_2016/calc/CalculatorActivity.java
@@ -1,17 +1,150 @@
 package ru.ifmo.android_2016.calc;
 
-import android.app.Activity;
+import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import java.util.Arrays;
+
+public class MainActivity extends AppCompatActivity {
+
+    Button numbers[], operations[], lastButton;
+    String token = "", operation = "calc";
+    Double res = null;
+    TextView textView;
 
-/**
- * Created by alexey.nikitin on 13.09.16.
- */
 
-public final class CalculatorActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        textView = (TextView)findViewById(R.id.textView);
+
+        numbers = new Button[] {
+                (Button)findViewById(R.id.zero),
+                (Button)findViewById(R.id.one),
+                (Button)findViewById(R.id.two),
+                (Button)findViewById(R.id.three),
+                (Button)findViewById(R.id.four),
+                (Button)findViewById(R.id.five),
+                (Button)findViewById(R.id.six),
+                (Button)findViewById(R.id.seven),
+                (Button)findViewById(R.id.eight),
+                (Button)findViewById(R.id.nine),
+                (Button)findViewById(R.id.point)
+        };
+        operations = new Button[] {
+                (Button)findViewById(R.id.add),
+                (Button)findViewById(R.id.subtract),
+                (Button)findViewById(R.id.multiply),
+                (Button)findViewById(R.id.divide),
+                (Button)findViewById(R.id.calc)
+        };
+
+        for (final Button button : numbers) {
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (!Arrays.asList(numbers).contains(lastButton)) {
+                        if (!token.equals("")) {
+                            res = Double.valueOf(token);
+                        }
+                        token = "";
+                    }
+                    token = token + button.getText();
+                    textView.setText(token);
+                    lastButton = button;
+                }
+            });
+        }
 
-        setContentView(R.layout.activity_calculator);
+        for (final Button button : operations) {
+            button.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (Arrays.asList(numbers).contains(lastButton) && !token.equals("")) {
+                        Double result = null;
+                        switch (operation) {
+                            case "add":
+                                result = res + Double.valueOf(token);
+                                break;
+                            case "subtract":
+                                result = res - Double.valueOf(token);
+                                break;
+                            case "multiply":
+                                result  = res * Double.valueOf(token);
+                                break;
+                            case "divide":
+                                result = res / Double.valueOf(token);
+                                break;
+                        }
+                        if (result != null) {
+                            if (result.longValue() == result) {
+                                token = Long.toString(result.longValue());
+                            } else {
+                                token = Double.toString(result);
+                            }
+                            textView.setText(token);
+                        }
+                        operation = getResources().getResourceEntryName(button.getId());
+                        lastButton  = button;
+                    }
+                }
+            });
+        }
+
+        ((Button)findViewById(R.id.clear)).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (token.length() > 0) {
+                    token = token.substring(0, token.length() - 1);
+                    textView.setText(token);
+                }
+            }
+        });
+
+        final Button button = (Button)findViewById(R.id.point);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!Arrays.asList(numbers).contains(lastButton)) {
+                    if (!token.equals("")) {
+                        res = Double.valueOf(token);
+                    }
+                    token = "";
+                }
+                if (token.contains(button.getText())) return;
+                if (token.equals("")) token = "0";
+                token = token + button.getText();
+                textView.setText(token);
+                lastButton = button;
+            }
+        });
+
+        if (savedInstanceState != null) {
+            token = savedInstanceState.getString("token");
+            operation = savedInstanceState.getString("operation");
+            if (savedInstanceState.getInt("lastButton") != 0) {
+                lastButton = (Button)findViewById(savedInstanceState.getInt("lastButton"));
+            }
+            res = savedInstanceState.getDouble("res");
+            textView.setText(token);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString("token", token);
+        outState.putString("operation", operation);
+        if (lastButton != null) {
+            outState.putInt("lastButton", lastButton.getId());
+        }
+        if (res != null) {
+            outState.putDouble("res", res);
+        }
     }
 }