From 2efdf2d659124c94c836f0f74d9f03f9be2f6b17 Mon Sep 17 00:00:00 2001
From: Fahim <fahim.cse11@gmail.com>
Date: Tue, 31 Aug 2021 17:18:47 +0600
Subject: [PATCH] 3720-Q-Equal_button_visibility_issue

issue: https://gitlab.e.foundation/e/backlog/-/issues/3720
---
 res/drawable/eq_button_backgroud.xml          | 11 -------
 .../pad_button_inverse_background.xml         |  2 +-
 res/layout/pad_numeric.xml                    | 32 +++++++++++++++----
 res/layout/pad_operator_two_col.xml           | 32 +++++++++++++++----
 res/values/color.xml                          |  4 +++
 res/values/themes.xml                         |  1 +
 6 files changed, 56 insertions(+), 26 deletions(-)
 delete mode 100644 res/drawable/eq_button_backgroud.xml

diff --git a/res/drawable/eq_button_backgroud.xml b/res/drawable/eq_button_backgroud.xml
deleted file mode 100644
index e0d42ee8..00000000
--- a/res/drawable/eq_button_backgroud.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@color/calculator_accent_color"/>
-            <stroke android:color="@color/calculator_accent_color" android:width="5dp"/>
-            <!-- Set the same value for both width and height to get a circular shape -->
-            <size android:width="40dp" android:height="40dp"/>
-        </shape>
-    </item>
-</selector>
diff --git a/res/drawable/pad_button_inverse_background.xml b/res/drawable/pad_button_inverse_background.xml
index ff0b2ae5..15f98506 100644
--- a/res/drawable/pad_button_inverse_background.xml
+++ b/res/drawable/pad_button_inverse_background.xml
@@ -20,7 +20,7 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <corners android:radius="4dip" />
-            <solid android:color="@android:color/white" />
+            <solid android:color="@color/color_default_view_on_accent" />
         </shape>
     </item>
     <item>
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 074dd80d..c8ee7451 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -101,13 +101,31 @@
         app:layout_row="3"
         app:layout_column="1" />
 
-    <com.android.calculator2.HapticButton
-        android:id="@+id/eq"
-        android:textColor="@android:color/white"
-        style="@style/PadButtonStyle.Numeric.Equals"
-        android:contentDescription="@string/desc_eq"
-        android:text="@string/eq"
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_rowWeight="1"
+        app:layout_columnWeight="1"
         app:layout_row="3"
-        app:layout_column="2" />
+        style="@style/PadButtonStyle.Numeric.Equals"
+        app:layout_column="2"
+        app:layout_gravity="fill">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/circle_bg"
+            android:layout_centerInParent="true"/>
+
+        <com.android.calculator2.HapticButton
+            android:id="@+id/eq"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:textColor="@color/color_default_view_on_accent"
+            style="@style/PadButtonStyle.Numeric"
+            android:contentDescription="@string/desc_eq"
+            android:text="@string/eq" />
+    </RelativeLayout>
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index 657358f1..11fd2634 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -73,13 +73,31 @@
         app:layout_row="3"
         app:layout_column="0" />
 
-    <com.android.calculator2.HapticButton
-        android:id="@+id/eq"
-        android:textColor="@android:color/white"
-        style="@style/PadButtonStyle.Operator"
-        android:contentDescription="@string/desc_eq"
-        android:text="@string/eq"
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_rowWeight="1"
+        app:layout_columnWeight="1"
         app:layout_row="3"
-        app:layout_column="1" />
+        app:layout_column="1"
+        app:layout_gravity="fill">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/circle_bg"
+            android:layout_centerInParent="true"/>
+
+        <com.android.calculator2.HapticButton
+            android:id="@+id/eq"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:textColor="@color/color_default_view_on_accent"
+            style="@style/PadButtonStyle.Operator"
+            android:contentDescription="@string/desc_eq"
+            android:text="@string/eq" />
+    </RelativeLayout>
+
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/values/color.xml b/res/values/color.xml
index d2ef7782..70ebf524 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -30,6 +30,8 @@
     <!-- Color to indicate an error has occured. -->
     <color name="calculator_error_color">@lineageos.platform:color/color_default_red1</color>
 
+    <color name="color_default_view_on_accent">@lineageos.platform:color/color_default_view_on_accent</color>
+
     <!-- Background color of the calculator display. -->
     <color name="display_background_color">@lineageos.platform:color/color_default_background</color>
 
@@ -54,6 +56,8 @@
     <!-- Text color for a button in a pad. -->
     <color name="pad_button_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
+    <color name="color_default_gray1">@lineageos.platform:color/color_default_gray1</color>
+
     <!-- Text color for a button in the advanced pad. -->
     <color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_primary_text</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 04ee246a..97354a10 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -62,5 +62,6 @@
     <style name="actionOverflowButtonStyle">
         <item name="android:src">@drawable/ic_more</item>
         <item name="android:tint">@color/calculator_accent_color</item>
+        <item name="android:paddingRight">10dp</item>
     </style>
 </resources>
-- 
GitLab