From 9850fa83c4ab666ba6622de87ce7da7a55324c25 Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Fri, 4 Dec 2020 18:19:42 +0530
Subject: [PATCH 1/2] Add blue in Q

---
 res/drawable/circle_bg.xml              | 13 +++++++++++++
 res/drawable/eq_button_backgroud.xml    | 11 +++++++++++
 res/drawable/ic_del.xml                 |  4 +++-
 res/layout/activity_calculator_land.xml |  5 +++++
 res/layout/activity_calculator_port.xml |  4 ++++
 res/layout/pad_numeric.xml              |  5 +++++
 res/layout/pad_operator_two_col.xml     |  5 +++++
 res/values/color.xml                    |  8 ++++++--
 8 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 res/drawable/circle_bg.xml
 create mode 100644 res/drawable/eq_button_backgroud.xml

diff --git a/res/drawable/circle_bg.xml b/res/drawable/circle_bg.xml
new file mode 100644
index 00000000..1be93328
--- /dev/null
+++ b/res/drawable/circle_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportHeight="64"
+    android:viewportWidth="64">
+
+    <path
+        android:fillColor="@color/color_default_blue1"
+        android:pathData="M22,32
+        A10,10 0 1,1 42,32
+        A10,10 0 1,1 22,32 Z" />
+</vector>
diff --git a/res/drawable/eq_button_backgroud.xml b/res/drawable/eq_button_backgroud.xml
new file mode 100644
index 00000000..6ef3a32f
--- /dev/null
+++ b/res/drawable/eq_button_backgroud.xml
@@ -0,0 +1,11 @@
+<?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/color_default_blue1"/>
+            <stroke android:color="@color/color_default_blue1" 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/ic_del.xml b/res/drawable/ic_del.xml
index f26eac24..f36ae61b 100644
--- a/res/drawable/ic_del.xml
+++ b/res/drawable/ic_del.xml
@@ -19,7 +19,9 @@
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24"
-    android:viewportWidth="24">
+    android:viewportWidth="24"
+    android:tint="@color/color_default_blue1"
+    >
     <path
         android:fillColor="@color/pad_button_text_color"
         android:pathData="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41
diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml
index a19cd861..2c6752a7 100644
--- a/res/layout/activity_calculator_land.xml
+++ b/res/layout/activity_calculator_land.xml
@@ -25,6 +25,11 @@
         layout="@layout/display"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
+    <View
+        android:background="@color/color_default_blue1"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
+
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml
index 30aaf005..46918910 100644
--- a/res/layout/activity_calculator_port.xml
+++ b/res/layout/activity_calculator_port.xml
@@ -22,6 +22,10 @@
     android:orientation="vertical">
 
     <include layout="@layout/display" />
+    <View
+        android:background="@color/color_default_blue1"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"/>
 
     <com.android.calculator2.CalculatorPadViewPager
         android:id="@+id/pad_pager"
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 5810984e..56260050 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -102,6 +102,11 @@
         app:layout_column="1" />
 
     <Button
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:textColor="@color/color_default_foreground"
+        android:background="@drawable/circle_bg"
+
         android:id="@+id/eq"
         style="@style/PadButtonStyle.Numeric.Equals"
         android:contentDescription="@string/desc_eq"
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index 23eb857c..3c8d992b 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -74,6 +74,11 @@
         app:layout_column="0" />
 
     <Button
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:textColor="@color/color_default_foreground"
+        android:background="@drawable/circle_bg"
+
         android:id="@+id/eq"
         style="@style/PadButtonStyle.Operator"
         android:contentDescription="@string/desc_eq"
diff --git a/res/values/color.xml b/res/values/color.xml
index 9b70d22a..f4b19e61 100644
--- a/res/values/color.xml
+++ b/res/values/color.xml
@@ -48,13 +48,15 @@
     <color name="pad_operator_background_color">@color/calculator_statusbar_color</color>
 
     <!-- Background color for the advanced pad. -->
-    <color name="pad_advanced_background_color">@lineageos.platform:color/color_default_gray2</color>
+    <color name="pad_advanced_background_color">#ececec</color>
 
     <!-- Text color for a button in a pad. -->
     <color name="pad_button_text_color">#333</color>
 
     <!-- Text color for a button in the advanced pad. -->
-    <color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_foreground</color>
+    <color name="pad_button_advanced_text_color">@lineageos.platform:color/color_default_primary_text</color>
+
+    <color name="color_default_blue1">@lineageos.platform:color/color_default_blue1</color>
 
     <!-- Ripple color when a button is pressed in a pad. -->
     <color name="pad_button_ripple_color">#33000000</color>
@@ -65,4 +67,6 @@
     <!-- Background color for empty history view. -->
     <color name="empty_history_color">@color/calculator_primary_color</color>
 
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+
 </resources>
-- 
GitLab


From 91902c21b06648d3c205304884f41a87a6fb475f Mon Sep 17 00:00:00 2001
From: Narinder Rana <narinder.rana.e@gmail.com>
Date: Wed, 16 Dec 2020 12:52:16 +0530
Subject: [PATCH 2/2] eq button

---
 res/drawable/circle_bg.xml               | 17 +++------
 res/layout/pad_numeric.xml               | 44 ++++++++++++++++++------
 res/layout/pad_operator_two_col.xml      | 43 +++++++++++++++++------
 res/values-w230dp-h475dp-port/styles.xml |  4 +--
 res/values-w375dp-h500dp-port/styles.xml |  4 +--
 res/values-w520dp-h768dp-land/styles.xml |  4 +--
 6 files changed, 77 insertions(+), 39 deletions(-)

diff --git a/res/drawable/circle_bg.xml b/res/drawable/circle_bg.xml
index 1be93328..099b6c3a 100644
--- a/res/drawable/circle_bg.xml
+++ b/res/drawable/circle_bg.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="200dp"
-    android:viewportHeight="64"
-    android:viewportWidth="64">
-
-    <path
-        android:fillColor="@color/color_default_blue1"
-        android:pathData="M22,32
-        A10,10 0 1,1 42,32
-        A10,10 0 1,1 22,32 Z" />
-</vector>
+<shape android:shape="oval"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/color_default_blue1"/>
+    <size android:width="8dp" android:height="8dp"/>
+</shape>
diff --git a/res/layout/pad_numeric.xml b/res/layout/pad_numeric.xml
index 56260050..6a781cf3 100644
--- a/res/layout/pad_numeric.xml
+++ b/res/layout/pad_numeric.xml
@@ -101,17 +101,39 @@
         app:layout_row="3"
         app:layout_column="1" />
 
-    <Button
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:textColor="@color/color_default_foreground"
-        android:background="@drawable/circle_bg"
-
-        android:id="@+id/eq"
-        style="@style/PadButtonStyle.Numeric.Equals"
-        android:contentDescription="@string/desc_eq"
-        android:text="@string/eq"
+<!--    <Button-->
+<!--        android:layout_width="30dp"-->
+<!--        android:layout_height="30dp"-->
+<!--        android:textColor="@color/color_default_foreground"-->
+<!--        android:background="@drawable/circle_bg"-->
+
+<!--        android:id="@+id/eq"-->
+<!--        style="@style/PadButtonStyle.Numeric.Equals"-->
+<!--        android:contentDescription="@string/desc_eq"-->
+<!--        android:text="@string/eq"-->
+<!--        app:layout_row="3"-->
+<!--        app:layout_column="2" />-->
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dip"
+        app:layout_column="2"
+        app:layout_columnWeight="1"
+        app:layout_gravity="fill"
         app:layout_row="3"
-        app:layout_column="2" />
+        app:layout_rowWeight="1"
+        android:onClick="onButtonClick">
+
+        <Button
+            android:id="@+id/eq"
+            style="@style/PadButtonStyle.Numeric.Equals"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/circle_bg"
+            android:contentDescription="@string/desc_eq"
+            android:text="@string/eq"
+            android:textColor="@color/color_default_foreground" />
+    </RelativeLayout>
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/pad_operator_two_col.xml b/res/layout/pad_operator_two_col.xml
index 3c8d992b..a3171363 100644
--- a/res/layout/pad_operator_two_col.xml
+++ b/res/layout/pad_operator_two_col.xml
@@ -73,17 +73,40 @@
         app:layout_row="3"
         app:layout_column="0" />
 
-    <Button
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:textColor="@color/color_default_foreground"
-        android:background="@drawable/circle_bg"
+<!--    <Button-->
+<!--        android:layout_width="30dp"-->
+<!--        android:layout_height="30dp"-->
+<!--        android:textColor="@color/color_default_foreground"-->
+<!--        android:background="@drawable/circle_bg"-->
 
-        android:id="@+id/eq"
-        style="@style/PadButtonStyle.Operator"
-        android:contentDescription="@string/desc_eq"
-        android:text="@string/eq"
+<!--        android:id="@+id/eq"-->
+<!--        style="@style/PadButtonStyle.Operator"-->
+<!--        android:contentDescription="@string/desc_eq"-->
+<!--        android:text="@string/eq"-->
+<!--        app:layout_row="3"-->
+<!--        app:layout_column="1" />-->
+
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="0dip"
+        app:layout_rowWeight="1"
+        app:layout_columnWeight="1"
         app:layout_row="3"
-        app:layout_column="1" />
+        app:layout_column="1"
+        android:onClick="onButtonClick"
+        app:layout_gravity="fill">
+        <Button
+            android:textColor="@color/color_default_foreground"
+            android:id="@+id/eq"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:background="@drawable/circle_bg"
+            android:contentDescription="@string/desc_eq"
+            android:text="@string/eq"
+            android:layout_centerInParent="true"
+            style="@style/PadButtonStyle.Operator"
+            />
+    </RelativeLayout>
 
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/values-w230dp-h475dp-port/styles.xml b/res/values-w230dp-h475dp-port/styles.xml
index 05987adc..8354844b 100644
--- a/res/values-w230dp-h475dp-port/styles.xml
+++ b/res/values-w230dp-h475dp-port/styles.xml
@@ -65,8 +65,8 @@
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
+        <item name="android:paddingTop">12dip</item>
+        <item name="android:paddingBottom">20dip</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:paddingEnd">28dip</item>
     </style>
diff --git a/res/values-w375dp-h500dp-port/styles.xml b/res/values-w375dp-h500dp-port/styles.xml
index 5f5057eb..d539d275 100644
--- a/res/values-w375dp-h500dp-port/styles.xml
+++ b/res/values-w375dp-h500dp-port/styles.xml
@@ -65,8 +65,8 @@
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
+        <item name="android:paddingTop">12dip</item>
+        <item name="android:paddingBottom">20dip</item>
         <item name="android:paddingStart">4dip</item>
         <item name="android:paddingEnd">28dip</item>
     </style>
diff --git a/res/values-w520dp-h768dp-land/styles.xml b/res/values-w520dp-h768dp-land/styles.xml
index 61acbd21..5cdebe0f 100644
--- a/res/values-w520dp-h768dp-land/styles.xml
+++ b/res/values-w520dp-h768dp-land/styles.xml
@@ -66,8 +66,8 @@
     <style name="PadLayoutStyle.Operator">
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">3</item>
-        <item name="android:paddingTop">8dip</item>
-        <item name="android:paddingBottom">24dip</item>
+        <item name="android:paddingTop">12dip</item>
+        <item name="android:paddingBottom">20dip</item>
         <item name="android:paddingStart">12dip</item>
         <item name="android:paddingEnd">12dip</item>
     </style>
-- 
GitLab