moved Close button to the left

Added Delete buton to the right
FossifyOrg · Jan 5, 2025 · 2dc86ca · 2dc86ca
1 parent f49876e
commit 2dc86ca
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 6 deletions.
diff --git a/app/src/main/kotlin/org/fossify/phone/activities/CallActivity.kt b/app/src/main/kotlin/org/fossify/phone/activities/CallActivity.kt
@@ -13,6 +13,7 @@ import android.os.Looper
 import android.os.PowerManager
 import android.telecom.Call
 import android.telecom.CallAudioState
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.WindowManager
@@ -216,6 +217,8 @@ class CallActivity : SimpleActivity() {
             dialpad0Holder.setOnLongClickListener { dialpadPressed('+'); true }
             dialpadAsteriskHolder.setOnClickListener { dialpadPressed('*') }
             dialpadHashtagHolder.setOnClickListener { dialpadPressed('#') }
+            dialpadClearChar.setOnClickListener { clearChar(it) }
+            dialpadClearChar.setOnLongClickListener { clearInput() }
         }
 
         dialpadWrapper.setBackgroundColor(
@@ -226,7 +229,7 @@ class CallActivity : SimpleActivity() {
             }
         )
 
-        arrayOf(dialpadClose, callSimImage).forEach {
+        arrayOf(dialpadClose, callSimImage, dialpadClearChar).forEach {
             it.applyColorFilter(getProperTextColor())
         }
 
@@ -877,4 +880,13 @@ class CallActivity : SimpleActivity() {
             view.applyColorFilter(getProperBackgroundColor().getContrastColor())
         }
     }
+
+    private fun clearChar(view: View) {
+        binding.dialpadInput.dispatchKeyEvent(binding.dialpadInput.getKeyEvent(KeyEvent.KEYCODE_DEL))
+    }
+
+    private fun clearInput(): Boolean {
+        binding.dialpadInput.setText("");
+        return true;
+    }
 }
diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml
@@ -446,21 +446,37 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/dialpad_close"
+                android:layout_width="@dimen/normal_icon_size"
+                android:layout_height="@dimen/normal_icon_size"
+                android:layout_alignTop="@+id/dialpad_input"
+                android:layout_alignBottom="@+id/dialpad_input"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="@dimen/activity_margin"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@string/hide_dialpad"
+                android:elevation="@dimen/medium_margin"
+                android:padding="@dimen/medium_margin"
+                android:src="@drawable/ic_cross_vector" />
+
             <org.fossify.commons.views.MyEditText
                 android:id="@+id/dialpad_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dialpad_button_size"
+                android:layout_marginStart="@dimen/medium_margin"
                 android:layout_marginEnd="@dimen/medium_margin"
-                android:layout_toStartOf="@+id/dialpad_close"
+                android:layout_toEndOf="@id/dialpad_close"
+                android:layout_toStartOf="@+id/dialpad_clear_char"
                 android:gravity="center"
                 android:inputType="phone"
                 android:textCursorDrawable="@null"
                 android:textSize="@dimen/dialpad_text_size"
                 tools:ignore="SpUsage" />
 
             <ImageView
-                android:id="@+id/dialpad_close"
+                android:id="@+id/dialpad_clear_char"
                 android:layout_width="@dimen/normal_icon_size"
                 android:layout_height="@dimen/normal_icon_size"
                 android:layout_alignTop="@+id/dialpad_input"
@@ -469,10 +485,9 @@
                 android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/activity_margin"
                 android:background="?attr/selectableItemBackgroundBorderless"
-                android:contentDescription="@string/hide_dialpad"
                 android:elevation="@dimen/medium_margin"
                 android:padding="@dimen/medium_margin"
-                android:src="@drawable/ic_cross_vector" />
+                android:src="@drawable/ic_clear_vector" />
 
         </RelativeLayout>