From 79c88074038fb2f0d84b1d356097c566a05402b8 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 20 May 2018 00:13:57 +0200
Subject: Fixed design and added pre result

---
 .../marvinborner/myapplication/MainActivity.java   |  96 ++++++-----
 app/src/main/res/layout/activity_main.xml          | 190 ++++++++++-----------
 2 files changed, 148 insertions(+), 138 deletions(-)

(limited to 'app')

diff --git a/app/src/main/java/me/marvinborner/myapplication/MainActivity.java b/app/src/main/java/me/marvinborner/myapplication/MainActivity.java
index 921f0f1..4147110 100644
--- a/app/src/main/java/me/marvinborner/myapplication/MainActivity.java
+++ b/app/src/main/java/me/marvinborner/myapplication/MainActivity.java
@@ -10,11 +10,11 @@ import android.widget.TextView;
 public class MainActivity extends AppCompatActivity {
 
     Button button0, button1, button2, button3, button4, button5, button6,
-            button7, button8, button9, buttonAdd, buttonSub, buttonDivision,
+            button7, button8, button9, buttonAdd, buttonSub, buttonDiv,
             buttonMul, button10, buttonC, buttonEqual;
-    TextView ResultTextView;
+    TextView PreResultTextView, ResultTextView;
 
-    float mValueOne, mValueTwo;
+    double mValueOne, mValueTwo;
 
     boolean Addition, Subtraction, Multiplication, Division;
 
@@ -37,14 +37,23 @@ public class MainActivity extends AppCompatActivity {
         buttonAdd = findViewById(R.id.buttonadd);
         buttonSub = findViewById(R.id.buttonsub);
         buttonMul = findViewById(R.id.buttonmul);
-        buttonDivision = findViewById(R.id.buttondiv);
+        buttonDiv = findViewById(R.id.buttondiv);
         buttonC = findViewById(R.id.buttonC);
         buttonEqual = findViewById(R.id.buttoneql);
-        ResultTextView = findViewById(R.id.edt1);
+        PreResultTextView = findViewById(R.id.preRes);
+        ResultTextView = findViewById(R.id.res);
 
         ResultTextView.setMovementMethod(new ScrollingMovementMethod());
 
 
+        // TYPE NUMBERS
+        button0.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ResultTextView.setText(ResultTextView.getText() + "0");
+            }
+        });
+
         button1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -52,6 +61,13 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+        button10.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ResultTextView.setText(ResultTextView.getText() + ".");
+            }
+        });
+
         button2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -108,22 +124,14 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        button0.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ResultTextView.setText(ResultTextView.getText() + "0");
-            }
-        });
-
+        // ACTUAL MATHS
         buttonAdd.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
-                if (ResultTextView == null) {
-                    ResultTextView.setText("");
-                } else {
-                    mValueOne = Float.parseFloat(ResultTextView.getText() + "");
+                if (ResultTextView != null) {
+                    mValueOne = Double.parseDouble(ResultTextView.getText() + "");
                     Addition = true;
+                    PreResultTextView.setText("+");
                     ResultTextView.setText(null);
                 }
             }
@@ -132,8 +140,9 @@ public class MainActivity extends AppCompatActivity {
         buttonSub.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mValueOne = Float.parseFloat(ResultTextView.getText() + "");
+                mValueOne = Double.parseDouble(ResultTextView.getText() + "");
                 Subtraction = true;
+                PreResultTextView.setText("-");
                 ResultTextView.setText(null);
             }
         });
@@ -141,17 +150,19 @@ public class MainActivity extends AppCompatActivity {
         buttonMul.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mValueOne = Float.parseFloat(ResultTextView.getText() + "");
+                mValueOne = Double.parseDouble(ResultTextView.getText() + "");
                 Multiplication = true;
+                PreResultTextView.setText("×");
                 ResultTextView.setText(null);
             }
         });
 
-        buttonDivision.setOnClickListener(new View.OnClickListener() {
+        buttonDiv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mValueOne = Float.parseFloat(ResultTextView.getText() + "");
+                mValueOne = Double.parseDouble(ResultTextView.getText() + "");
                 Division = true;
+                PreResultTextView.setText("÷");
                 ResultTextView.setText(null);
             }
         });
@@ -159,20 +170,22 @@ public class MainActivity extends AppCompatActivity {
         buttonEqual.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mValueTwo = Float.parseFloat(ResultTextView.getText() + "");
-
-                if (Addition){
-                    ResultTextView.setText(mValueOne + mValueTwo + "");
-                    Addition = false;
-                } else if (Subtraction) {
-                    ResultTextView.setText(mValueOne - mValueTwo + "");
-                    Subtraction = false;
-                } else if (Multiplication) {
-                    ResultTextView.setText(mValueOne * mValueTwo + "");
-                    Multiplication = false;
-                } else if (Division) {
-                    ResultTextView.setText(mValueOne / mValueTwo + "");
-                    Division = false;
+                if (mValueOne != 0) {
+                    mValueTwo = Double.parseDouble(ResultTextView.getText() + "");
+                    PreResultTextView.setText("");
+                    if (Addition) {
+                        ResultTextView.setText(mValueOne + mValueTwo + "");
+                        Addition = false;
+                    } else if (Subtraction) {
+                        ResultTextView.setText(mValueOne - mValueTwo + "");
+                        Subtraction = false;
+                    } else if (Multiplication) {
+                        ResultTextView.setText(mValueOne * mValueTwo + "");
+                        Multiplication = false;
+                    } else if (Division) {
+                        ResultTextView.setText(mValueOne / mValueTwo + "");
+                        Division = false;
+                    }
                 }
             }
         });
@@ -181,14 +194,15 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 ResultTextView.setText("");
+                PreResultTextView.setText("");
             }
         });
+    }
 
-        button10.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ResultTextView.setText(ResultTextView.getText() + ".");
-            }
-        });
+    public void UpdatePreResult(View v) {
+        Button NumberButton = (Button) v;
+        if (mValueOne != 0) {
+            PreResultTextView.setText(NumberButton.getText().toString() + Double.parseDouble(ResultTextView.getText() + ""));
+        }
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d39b400..bf79a10 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,128 +7,56 @@
     tools:context=".MainActivity">
 
     <TableLayout
-        android:id="@+id/tableLayout2"
+        android:id="@+id/tableLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
         android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/tableLayout"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.648">
+        app:layout_constraintVertical_bias="0.675">
 
         <TableRow
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <Button
-                android:id="@+id/buttondiv"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:fontFamily="monospace"
-                android:text="÷"
-                android:textAppearance="@style/TextAppearance.AppCompat"
-                android:textSize="30sp"
-                android:typeface="monospace" />
-
-            <Button
-                android:id="@+id/buttonC"
+                android:id="@+id/button1"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
-                android:text="C"
+                android:onClick="UpdatePreResult"
+                android:text="1"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
                 android:typeface="monospace"
                 tools:layout_editor_absoluteX="16dp"
                 tools:layout_editor_absoluteY="16dp" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <Button
-                android:id="@+id/buttonmul"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:fontFamily="monospace"
-                android:text="×"
-                android:textAppearance="@style/TextAppearance.AppCompat"
-                android:textSize="30sp"
-                android:typeface="monospace" />
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
 
             <Button
-                android:id="@+id/buttonadd"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:fontFamily="monospace"
-                android:text="+"
-                android:textAppearance="@style/TextAppearance.AppCompat"
-                android:textSize="30sp"
-                android:typeface="monospace" />
-
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="92dp">
-
-            <Button
-                android:id="@+id/buttonsub"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:fontFamily="monospace"
-                android:text="-"
-                android:textAppearance="@style/TextAppearance.AppCompat"
-                android:textSize="30sp"
-                android:typeface="monospace" />
-
-            <Button
-                android:id="@+id/buttoneql"
+                android:id="@+id/button2"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
-                android:text="="
+                android:onClick="UpdatePreResult"
+                android:text="2"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
-                android:typeface="monospace" />
-
-        </TableRow>
-
-    </TableLayout>
-
-    <TableLayout
-        android:id="@+id/tableLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tableLayout2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.649">
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+                android:typeface="monospace"
+                tools:layout_editor_absoluteX="16dp"
+                tools:layout_editor_absoluteY="16dp" />
 
             <Button
-                android:id="@+id/button1"
+                android:id="@+id/button3"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
-                android:text="1"
+                android:onClick="UpdatePreResult"
+                android:text="3"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
                 android:typeface="monospace"
@@ -136,23 +64,21 @@
                 tools:layout_editor_absoluteY="16dp" />
 
             <Button
-                android:id="@+id/button2"
+                android:id="@+id/buttondiv"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
-                android:text="2"
+                android:text="÷"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
-                android:typeface="monospace"
-                tools:layout_editor_absoluteX="16dp"
-                tools:layout_editor_absoluteY="16dp" />
+                android:typeface="monospace" />
 
             <Button
-                android:id="@+id/button3"
+                android:id="@+id/buttonC"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
-                android:text="3"
+                android:text="C"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
                 android:typeface="monospace"
@@ -170,6 +96,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="4"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -182,6 +109,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="5"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -194,6 +122,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="6"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -201,6 +130,16 @@
                 tools:layout_editor_absoluteX="16dp"
                 tools:layout_editor_absoluteY="16dp" />
 
+            <Button
+                android:id="@+id/buttonmul"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:fontFamily="monospace"
+                android:text="×"
+                android:textAppearance="@style/TextAppearance.AppCompat"
+                android:textSize="30sp"
+                android:typeface="monospace" />
+
         </TableRow>
 
         <TableRow
@@ -212,6 +151,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="7"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -224,6 +164,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="8"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -236,6 +177,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="9"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -243,6 +185,16 @@
                 tools:layout_editor_absoluteX="16dp"
                 tools:layout_editor_absoluteY="16dp" />
 
+            <Button
+                android:id="@+id/buttonadd"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:fontFamily="monospace"
+                android:text="+"
+                android:textAppearance="@style/TextAppearance.AppCompat"
+                android:textSize="30sp"
+                android:typeface="monospace" />
+
         </TableRow>
 
         <TableRow
@@ -266,6 +218,7 @@
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:fontFamily="monospace"
+                android:onClick="UpdatePreResult"
                 android:text="0"
                 android:textAppearance="@style/TextAppearance.AppCompat"
                 android:textSize="30sp"
@@ -273,24 +226,67 @@
                 tools:layout_editor_absoluteX="16dp"
                 tools:layout_editor_absoluteY="16dp" />
 
+            <Space
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent" />
+
+            <Button
+                android:id="@+id/buttonsub"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:fontFamily="monospace"
+                android:text="-"
+                android:textAppearance="@style/TextAppearance.AppCompat"
+                android:textSize="30sp"
+                android:typeface="monospace" />
+
+            <Button
+                android:id="@+id/buttoneql"
+                android:layout_width="80dp"
+                android:layout_height="80dp"
+                android:fontFamily="monospace"
+                android:text="="
+                android:textAppearance="@style/TextAppearance.AppCompat"
+                android:textSize="30sp"
+                android:typeface="monospace" />
+
         </TableRow>
 
     </TableLayout>
 
     <TextView
-        android:id="@+id/edt1"
+        android:id="@+id/res"
         android:layout_width="334dp"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="52dp"
+        android:layout_marginBottom="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
+        android:layout_marginTop="56dp"
         android:fontFamily="monospace"
         android:maxLines="1"
         android:scrollbars="horizontal"
         android:textSize="50sp"
         android:typeface="monospace"
+        app:layout_constraintBottom_toTopOf="@+id/preRes"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.488"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/preRes"
+        android:layout_width="334dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:fontFamily="monospace"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="30sp"
+        android:typeface="monospace"
         app:layout_constraintBottom_toTopOf="@+id/tableLayout"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.488"
         app:layout_constraintStart_toStartOf="parent" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
-- 
cgit v1.2.3