From 57da7dc6b41fb3f46d5ea86bdd3b8428e16de8ba Mon Sep 17 00:00:00 2001
From: Fahim Masud Choudhury <fahim.choudhury@murena.io>
Date: Thu, 18 Jan 2024 11:57:23 +0600
Subject: [PATCH 1/2] fix: Improve Calendar's monthly view UI

Position day names in center of each day cell.

Center day numbers and today circle in month view. With "Show week numbers" setting turned on, the day numbers are shifted right in the cell.

Update text size and circle radius to match with UI.

Fix gradle build error caused by presence of package name in AndroidManifest.xml file.
---
 app/src/main/AndroidManifest.xml              |  1 -
 .../calendar/month/MonthWeekEventsView.java   | 46 ++++++++++-----
 .../res/layout-sw600dp/full_month_header.xml  | 50 +++++++++-------
 app/src/main/res/layout/full_month_header.xml | 58 +++++++++++--------
 app/src/main/res/layout/mini_month_header.xml |  8 +++
 .../main/res/values-w600dp-h879dp/dimens.xml  |  3 +-
 .../main/res/values-w960dp-h527dp/dimens.xml  |  3 +-
 app/src/main/res/values/dimens.xml            |  6 +-
 app/src/main/res/values/styles.xml            |  2 +-
 9 files changed, 111 insertions(+), 66 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cd29ea970..896618f92 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="foundation.e.calendar"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
diff --git a/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java b/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
index 42a9da93f..61b761a89 100644
--- a/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
+++ b/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
@@ -44,8 +44,6 @@ import android.view.MotionEvent;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
 
-import androidx.core.content.ContextCompat;
-
 import com.android.calendar.DynamicTheme;
 import com.android.calendar.Event;
 import com.android.calendar.LunarUtils;
@@ -626,12 +624,14 @@ public class MonthWeekEventsView extends SimpleWeekView {
         Time time = new Time(mTimeZone);
         time.setJulianDay(julianMonday);
 
-        int current_date_text_x=getResources().getDimensionPixelSize(R.dimen.current_date_text_x);
-        int current_date_text_y=getResources().getDimensionPixelSize(R.dimen.current_date_text_y);
-        int current_date_event_margin=getResources().getDimensionPixelSize(R.dimen.current_date_text_event_margin);
+        int todayTextY = getResources().getDimensionPixelSize(R.dimen.current_date_text_y);
+        int todayEventMargin = getResources().getDimensionPixelSize(R.dimen.current_date_text_event_margin);
 
         for (; i < numCount; i++) {
             x = computeDayLeftPosition(i - offset) - (mSidePaddingMonthNumber);
+
+            final float monthNumberTextX = getMonthNumberTextX(x);
+
             if (mHasToday && todayIndex == i) {
                 mMonthNumPaint.setFakeBoldText(isBold = false);
                 if (i + 1 < numCount) {
@@ -640,28 +640,30 @@ public class MonthWeekEventsView extends SimpleWeekView {
                     isFocusMonth = !mFocusDay[i + 1];
                 }
                 mMonthNumPaint.setColor(getContext().getResources().getColor(R.color.colorAccent));
-                int current_date_bg_size=getResources().getDimensionPixelSize(R.dimen.current_date_bg_size);
+                final int todayCircleRadius = getResources().getDimensionPixelSize(R.dimen.current_date_bg_size);
 
                 //check text width & height to calculate circle cx and cy values
                 Rect bounds = new Rect();
                 mMonthNumPaint.getTextBounds(mDayNumbers[i], 0, mDayNumbers[i].length(), bounds);
 
-                int text_height =  bounds.height();
-                int text_width =  bounds.width();
+                int textHeight = bounds.height();
+                final int todayCircleCenterY = y + todayTextY - (textHeight / 2) - todayEventMargin;
 
-                canvas.drawCircle(x - current_date_text_x - (text_width / 2),
-                        y + current_date_text_y - (text_height / 2) - current_date_event_margin,
-                        current_date_bg_size, mMonthNumPaint);
+                canvas.drawCircle(monthNumberTextX,
+                        todayCircleCenterY,
+                        todayCircleRadius, mMonthNumPaint);
                 mMonthNumPaint.setColor(mMonthNumTodayColor);
             } else if (mFocusDay[i] != isFocusMonth) {
                 isFocusMonth = mFocusDay[i];
                 mMonthNumPaint.setColor(isFocusMonth ? mMonthNumColor : mMonthNumOtherColor);
             }
-            double relation = Math.sqrt(canvas.getWidth() * canvas.getHeight());
-            mMonthNumPaint.setTextSize((int)relation / 12);
 
-            canvas.drawText(mDayNumbers[i], x-current_date_text_x,
-                    y+current_date_text_y - current_date_event_margin, mMonthNumPaint);
+            mMonthNumPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.day_number_text_size));
+
+            mMonthNumPaint.setTextAlign(Align.CENTER);
+
+            canvas.drawText(mDayNumbers[i], monthNumberTextX,
+                    y + todayTextY - todayEventMargin, mMonthNumPaint);
             if (isBold) {
                 mMonthNumPaint.setFakeBoldText(isBold = false);
             }
@@ -724,6 +726,20 @@ public class MonthWeekEventsView extends SimpleWeekView {
         }
     }
 
+    private float getMonthNumberTextX(int x) {
+        final float monthNumberMarginEnd;
+        if (mShowWeekNum) {
+            monthNumberMarginEnd = getMonthNumberMarginEnd();
+        } else {
+            monthNumberMarginEnd = 0;
+        }
+        return x - (((float) mWidth / mNumDays) / 2f) + mSidePaddingMonthNumber + monthNumberMarginEnd;
+    }
+
+    private float getMonthNumberMarginEnd() {
+        return getResources().getDimensionPixelSize(R.dimen.day_number_margin_end);
+    }
+
     protected void drawEvents(Canvas canvas) {
         if (mEvents == null || mEvents.isEmpty()) {
             return;
diff --git a/app/src/main/res/layout-sw600dp/full_month_header.xml b/app/src/main/res/layout-sw600dp/full_month_header.xml
index fb6cee51f..31985a34e 100644
--- a/app/src/main/res/layout-sw600dp/full_month_header.xml
+++ b/app/src/main/res/layout-sw600dp/full_month_header.xml
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -26,59 +27,66 @@
         android:gravity="left"
         android:visibility="gone" />
 
-    <TextView android:id="@+id/d0_label"
+    <TextView
+        android:id="@+id/d0_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d1_label"
+    <TextView
+        android:id="@+id/d1_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d2_label"
+    <TextView
+        android:id="@+id/d2_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d3_label"
+    <TextView
+        android:id="@+id/d3_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d4_label"
+    <TextView
+        android:id="@+id/d4_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d5_label"
+    <TextView
+        android:id="@+id/d5_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d6_label"
+    <TextView
+        android:id="@+id/d6_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/full_month_header.xml b/app/src/main/res/layout/full_month_header.xml
index 1c47db985..ceae21629 100644
--- a/app/src/main/res/layout/full_month_header.xml
+++ b/app/src/main/res/layout/full_month_header.xml
@@ -15,70 +15,80 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
-    android:layout_height="16dip"
+    android:layout_height="wrap_content"
+    android:paddingVertical="3dp"
     android:background="@color/date_strip_bg">
 
-    <TextView android:id="@+id/wk_label"
+    <TextView
+        android:id="@+id/wk_label"
         android:layout_width="24dip"
         android:layout_height="wrap_content"
-        android:gravity="right"
+        android:gravity="center_horizontal"
         android:visibility="gone" />
 
-    <TextView android:id="@+id/d0_label"
+    <TextView
+        android:id="@+id/d0_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d1_label"
+    <TextView
+        android:id="@+id/d1_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d2_label"
+    <TextView
+        android:id="@+id/d2_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d3_label"
+    <TextView
+        android:id="@+id/d3_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d4_label"
+    <TextView
+        android:id="@+id/d4_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d5_label"
+    <TextView
+        android:id="@+id/d5_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 
-    <TextView android:id="@+id/d6_label"
+    <TextView
+        android:id="@+id/d6_label"
         android:layout_width="0dip"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginRight="6dip"
-        android:gravity="right"
+        android:gravity="center_horizontal"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_DayLabel" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/mini_month_header.xml b/app/src/main/res/layout/mini_month_header.xml
index 9c3099550..2f9c74f9d 100644
--- a/app/src/main/res/layout/mini_month_header.xml
+++ b/app/src/main/res/layout/mini_month_header.xml
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -32,6 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d1_label"
@@ -39,6 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d2_label"
@@ -46,6 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d3_label"
@@ -53,6 +57,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d4_label"
@@ -60,6 +65,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d5_label"
@@ -67,6 +73,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 
     <TextView android:id="@+id/d6_label"
@@ -74,5 +81,6 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
+        tools:text="@tools:sample/date/day_of_week"
         style="@style/TextAppearance.MonthView_MiniDayLabel" />
 </LinearLayout>
diff --git a/app/src/main/res/values-w600dp-h879dp/dimens.xml b/app/src/main/res/values-w600dp-h879dp/dimens.xml
index d84c8075f..60d8985c8 100644
--- a/app/src/main/res/values-w600dp-h879dp/dimens.xml
+++ b/app/src/main/res/values-w600dp-h879dp/dimens.xml
@@ -15,7 +15,8 @@
 -->
 <resources>
 
-    <dimen name="day_label_text_size">14sp</dimen>
+    <dimen name="day_label_text_size">16sp</dimen>
+    <dimen name="day_number_text_size">16sp</dimen>
     <dimen name="all_day_bottom_margin">10dip</dimen>
     <dimen name="one_day_header_height">0dip</dimen>
     <dimen name="day_header_bottom_margin">6dip</dimen>
diff --git a/app/src/main/res/values-w960dp-h527dp/dimens.xml b/app/src/main/res/values-w960dp-h527dp/dimens.xml
index e2774773b..94f73f8d3 100644
--- a/app/src/main/res/values-w960dp-h527dp/dimens.xml
+++ b/app/src/main/res/values-w960dp-h527dp/dimens.xml
@@ -15,7 +15,8 @@
 -->
 <resources>
 
-    <dimen name="day_label_text_size">14sp</dimen>
+    <dimen name="day_label_text_size">16sp</dimen>
+    <dimen name="day_number_text_size">16sp</dimen>
     <dimen name="all_day_bottom_margin">10dip</dimen>
     <dimen name="one_day_header_height">0dip</dimen>
     <dimen name="day_header_bottom_margin">6dip</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 68e8f6195..7d8f93edb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,7 +14,9 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="day_label_text_size">11sp</dimen>
+    <dimen name="day_label_text_size">16sp</dimen>
+    <dimen name="day_number_text_size">16sp</dimen>
+    <dimen name="day_number_margin_end">8dp</dimen>
     <dimen name="all_day_bottom_margin">8dip</dimen>
     <dimen name="one_day_header_height">0dip</dimen>
     <dimen name="day_header_bottom_margin">4dip</dimen>
@@ -56,7 +58,7 @@
     <dimen name="recurrence_picker_width">300dp</dimen>
 
     <dimen name="fab_margin">16dp</dimen>
-    <dimen name="current_date_bg_size">14dp</dimen>
+    <dimen name="current_date_bg_size">15dp</dimen>
     <dimen name="current_date_circle_x">15dp</dimen>
     <dimen name="current_date_circle_single_x">12dp</dimen>
     <dimen name="current_date_circle_y">5dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0469620e..7ec02b0df 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,8 +78,8 @@
 
     <style name="TextAppearance.MonthView_DayLabel">
         <item name="android:textSize">@dimen/day_label_text_size</item>
-        <item name="android:paddingLeft">2dip</item>
         <item name="android:textColor">@color/month_day_names_color</item>
+        <item name="android:lineSpacingExtra">4sp</item>
     </style>
 
     <style name="TextAppearance.EditEvent_Label">
-- 
GitLab


From 40b819719c06fcf2fda035f93ab8a33a657ab55e Mon Sep 17 00:00:00 2001
From: Fahim Masud Choudhury <fahim.choudhury@murena.io>
Date: Thu, 1 Feb 2024 18:40:00 +0600
Subject: [PATCH 2/2] refactor: Resolve to MR feedback

A new line before return statement has been added to maintain convention used in Murena.

Package name in AndroidManifest.xml has been reverted to original state. As the Calendar app doesn't use Gradle build system, the error caused by Android Gradle Plugin will not be present when the project gets built with Soong build system.
---
 app/src/main/AndroidManifest.xml                                 | 1 +
 .../java/com/android/calendar/month/MonthWeekEventsView.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 896618f92..cd29ea970 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    package="foundation.e.calendar"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
diff --git a/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java b/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
index 61b761a89..e7345585c 100644
--- a/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
+++ b/app/src/main/java/com/android/calendar/month/MonthWeekEventsView.java
@@ -733,6 +733,7 @@ public class MonthWeekEventsView extends SimpleWeekView {
         } else {
             monthNumberMarginEnd = 0;
         }
+
         return x - (((float) mWidth / mNumDays) / 2f) + mSidePaddingMonthNumber + monthNumberMarginEnd;
     }
 
-- 
GitLab