From ea31dc60552da55b44479c67e98bf2c60603fd58 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 27 Feb 2022 20:35:30 +0100
Subject: [PATCH] use rounded corneres at the current day too

---
 .../pro/helpers/MyWidgetMonthlyProvider.kt    |  4 +-
 .../res/layout/day_monthly_number_view.xml    | 41 +++++++++++++------
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
index 8f1e3d646..4fdb69192 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetMonthlyProvider.kt
@@ -170,10 +170,12 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
             setTextSize(R.id.day_monthly_number_id, context.getWidgetFontSize() - 3f)
 
             if (day.isToday) {
-                setBackgroundColor(R.id.day_monthly_number_id, textColor)
                 setTextColor(R.id.day_monthly_number_id, textColor.getContrastColor())
+                setViewVisibility(R.id.day_monthly_number_background, View.VISIBLE)
+                setInt(R.id.day_monthly_number_background, "setColorFilter", textColor)
             } else {
                 setTextColor(R.id.day_monthly_number_id, textColor)
+                setViewVisibility(R.id.day_monthly_number_background, View.GONE)
             }
         }
         views.addView(id, newRemoteView)
diff --git a/app/src/main/res/layout/day_monthly_number_view.xml b/app/src/main/res/layout/day_monthly_number_view.xml
index f3c1e51b2..79ee7c89d 100644
--- a/app/src/main/res/layout/day_monthly_number_view.xml
+++ b/app/src/main/res/layout/day_monthly_number_view.xml
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/day_monthly_number_id"
+    android:id="@+id/day_monthly_number_holder"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="@dimen/tiny_margin"
-    android:layout_marginEnd="@dimen/tiny_margin"
-    android:ellipsize="none"
-    android:gravity="center_horizontal"
-    android:maxLines="1"
-    android:paddingStart="@dimen/tiny_margin"
-    android:paddingEnd="@dimen/tiny_margin"
-    android:textSize="@dimen/normal_text_size"
-    tools:text="1" />
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/day_monthly_number_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@+id/day_monthly_number_id"
+        android:layout_margin="@dimen/one_dp"
+        android:contentDescription="@null"
+        android:src="@drawable/day_monthly_event_background_widget"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/day_monthly_number_id"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/tiny_margin"
+        android:layout_marginEnd="@dimen/tiny_margin"
+        android:ellipsize="none"
+        android:gravity="center_horizontal"
+        android:maxLines="1"
+        android:paddingStart="@dimen/tiny_margin"
+        android:paddingEnd="@dimen/tiny_margin"
+        android:textSize="@dimen/normal_text_size"
+        tools:text="1" />
+
+</RelativeLayout>