Логика MainActivity

lr1ne · Feb 23, 2024 · 83d6838 · 83d6838
1 parent e3df8b1
commit 83d6838
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/app/src/main/java/com/lori/medcalc/MainActivity.java b/app/src/main/java/com/lori/medcalc/MainActivity.java
@@ -17,6 +17,7 @@ public class MainActivity extends AppCompatActivity {
     TextView operationField;
     Double operand = null;
     String lastOperation = "=";
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -27,6 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         findViewById(R.id.button_plus).setOnClickListener((view)->onOperationClick("+"));
         findViewById(R.id.button_enter).setOnClickListener((view)->onOperationClick("="));
+        findViewById(R.id.button_delete).setOnClickListener((view) -> onDeleteClick());
 
         findViewById(R.id.button0).setOnClickListener((view)->onNumberClick("0"));
         findViewById(R.id.button1).setOnClickListener((view)->onNumberClick("1"));
@@ -40,6 +42,15 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.button9).setOnClickListener((view)->onNumberClick("9"));
         findViewById(R.id.comma).setOnClickListener((view)->onNumberClick(","));
     }
+
+    public void onDeleteClick(){
+        String number = numberField.getText().toString();
+        if(number.length() > 0){
+            number = number.substring(0, number.length() - 1);
+            numberField.setText(number);
+        }
+    }
+
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         outState.putString("OPERATION", lastOperation);

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -160,6 +160,20 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.973" />
 
+    <Button
+        android:id="@+id/button_delete"
+        android:layout_width="69dp"
+        android:layout_height="68dp"
+
+        android:text="@string/delete"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.976"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.35" />
+
     <Button
         android:id="@+id/button_enter"
         android:layout_width="65dp"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="button8" translatable="false">8</string>
     <string name="button9" translatable="false">9</string>
     <string name="button0" translatable="false">0</string>
+    <string name="delete">Del</string>
     <string name="enter">=</string>
     <string name="plus">+</string>
     <string name="comma">,</string>