Third commit

Author: Deep201620

app/src/main/AndroidManifest.xml

@@ -4,12 +4,13 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:icon="@mipmap/calc"
+        android:label="Calculator"
+        android:roundIcon="@mipmap/calc"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/example/mycalculator/MainActivity.java

@@ -8,13 +8,15 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.util.Stack;
+
 public class MainActivity extends AppCompatActivity {
 
     Button button0,button1,button2,button3,button4,button5,button6,button7,button8,button9;
-    Button buttonAdd,buttonSubtract,buttonMul,buttonDiv,buttonClear,buttonEqual,buttonExit;
-    String result,posi;
+    Button buttonAdd,buttonSubtract,buttonMul,buttonDiv,buttonClear,buttonEqual,buttonExit,buttonraise,buttondel;
+    String result,result2;
     String tmp,operator;
-
+    boolean flag = false;
     TextView resultTextView,t1view;
 
     @Override
@@ -24,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
         initControl();
         initControlListener();
         t1view = findViewById(R.id.textview);
+        resultTextView.setTextSize(40);
     }
 
     private  void initControlListener(){
@@ -123,6 +126,18 @@ public void onClick(View v) {
                 onEqualButtonClicked();
             }
         });
+        buttonraise.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onOperatorButtonClicked("^");
+            }
+        });
+        buttondel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onDeleteButtonClicked();
+            }
+        });
         buttonExit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -138,10 +153,12 @@ private void onExitButtonClicked(){
     }
 
     private void onEqualButtonClicked(){
-        int res= 0;
+        long res= 0;
+        flag = true;
         try{
-            int number = Integer.valueOf(tmp);
-            int number2 = Integer.valueOf(resultTextView.getText().toString().substring(tmp.length()+operator.length(),resultTextView.length()));
+            long number = Long.valueOf(tmp);
+            long number2 = Long.valueOf(resultTextView.getText().toString().substring(tmp.length()+operator.length(),resultTextView.length()));
+
             switch (operator) {
                 case "+":
                     res = number + number2;
@@ -158,14 +175,19 @@ private void onEqualButtonClicked(){
                 case "*":
                     res = number * number2;
                     break;
+
+                case "^":
+                    res = (int)Math.pow(number,number2);
             }
             result = String.valueOf(res);
+
             resultTextView.setText(result);
         }catch (Exception e){
             e.printStackTrace();
         }
     }
 
+
     private void onOperatorButtonClicked(String operator){
         tmp = resultTextView.getText().toString();
         //onClearButtonClicked();
@@ -180,11 +202,18 @@ private void onClearButtonClicked() {
 
     private void onNumberButtonClicked(String pos){
         result = resultTextView.getText().toString();
-        this.posi=pos;
-        result = result+posi;
+        result = result+pos;
         resultTextView.setText(result);
     }
 
+    private void onDeleteButtonClicked(){
+        if(flag){
+           onClearButtonClicked();
+        }else {
+            resultTextView.setText(resultTextView.getText().toString().substring(0, resultTextView.getText().length() - 1));
+        }
+    }
+
     private void initControl() {
         button0 = findViewById(R.id.button0);
         button1 = findViewById(R.id.button1);
@@ -203,6 +232,8 @@ private void initControl() {
         buttonMul = findViewById(R.id.buttonMul);
         buttonDiv = findViewById(R.id.buttonDiv);
         buttonEqual = findViewById(R.id.buttonEqual);
+        buttonraise = findViewById(R.id.buttonraiseto);
+        buttondel = findViewById(R.id.buttondelete);
 
         resultTextView = findViewById(R.id.textview_result);
         buttonExit = findViewById(R.id.buttonexit);

app/src/main/res/layout/activity_main.xml

@@ -14,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/textview_result"
-        android:textSize="60sp"
         android:textAlignment="viewEnd"/>
     <TableRow
         android:layout_width="match_parent"
@@ -125,6 +124,24 @@
             android:textSize="20sp"/>
     </TableRow>
 
+    <TableRow
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/colorPrimary">
+
+    <Button
+        android:id="@+id/buttonraiseto"
+        android:text="power"
+        android:layout_weight="1"
+        android:textSize="20sp"/>
+    <Button
+        android:id="@+id/buttondelete"
+        android:text="DEL"
+        android:layout_weight="1"
+        android:textSize="20sp"/>
+
+    </TableRow>
+
     <TableRow
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -150,7 +167,8 @@
             android:id="@+id/textview"
             android:gravity="center"
             android:textStyle="bold"
-            android:text="Thankyou For Using"
+            android:text="Thanks For Using"
+            android:drawableRight="@mipmap/calc"
             android:textSize="30sp"
             android:textAlignment="center"/>