From 77b261700263e10d896a44a9f1263e5cee28973c Mon Sep 17 00:00:00 2001
From: Uday Srinath <usrinath@cisco.com>
Date: Wed, 5 Sep 2018 14:11:15 -0700
Subject: [PATCH 1/3] Added attribute to distinguish text color for dayOfWeek
 from dayOfMonth on calendarView

---
 README.md                                        |  3 ++-
 app/src/main/res/layout/activity_main.xml        |  3 ++-
 .../materialcalendarview/view/CalendarView.java  | 16 ++++++++++++----
 .../src/main/res/values/attrs.xml                |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6c5f3c1..efd5b05 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,8 @@ This example shows all the possible customization around Material Calendar View:
 	app:calendarBackgroundColor="@color/colorPrimary"
 	app:calendarTitleTextColor="@color/colorAccent"
 	app:calendarCurrentDayTextColor="@color/white"
-	app:calendarDayOfWeekTextColor="@android:color/white"
+	app:calendarDayOfWeekTextColor="@color/grey"
+	app:calendarDayOfMonthTextColor="@android:color/white"
 	app:calendarDisabledDayBackgroundColor="@color/colorPrimary"
 	app:calendarDisabledDayTextColor="@android:color/darker_gray"
 	app:calendarSelectedDayBackgroundColor="@color/colorAccent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bba02dc..7f38dd7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -49,7 +49,8 @@
                         app:calendarBackgroundColor="@color/colorPrimary"
                         app:calendarTitleTextColor="@color/colorAccent"
                         app:calendarCurrentDayTextColor="@color/white"
-                        app:calendarDayOfWeekTextColor="@android:color/white"
+                        app:calendarDayOfWeekTextColor="@color/grey"
+                        app:calendarDayOfMonthTextColor="@android:color/white"
                         app:calendarDisabledDayBackgroundColor="@color/colorPrimary"
                         app:calendarDisabledDayTextColor="@android:color/darker_gray"
                         app:calendarSelectedDayBackgroundColor="@color/colorAccent"
diff --git a/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java b/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
index 2e85433..9a2c2c8 100644
--- a/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
+++ b/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
@@ -189,6 +189,7 @@ public final class CalendarView extends LinearLayout {
     private int selectedDayTextColor;
     private int titleTextColor;
     private int dayOfWeekTextColor;
+    private int dayOfMonthTextColor;
     private int currentDayTextColor;
     private int weekendTextColor;
     private int weekendDays;
@@ -320,7 +321,8 @@ private void takeStyles(AttributeSet attrs) {
             titleBackgroundColor = a.getColor(R.styleable.MaterialCalendarView_calendarTitleBackgroundColor, white);
             titleTextColor = a.getColor(R.styleable.MaterialCalendarView_calendarTitleTextColor, white);
             weekBackgroundColor = a.getColor(R.styleable.MaterialCalendarView_calendarWeekBackgroundColor, white);
-            dayOfWeekTextColor = a.getColor(R.styleable.MaterialCalendarView_calendarDayOfWeekTextColor, black);
+            dayOfWeekTextColor = a.getColor(R.styleable.MaterialCalendarView_calendarDayOfWeekTextColor, dayDisableTextColor);
+            dayOfMonthTextColor = a.getColor(R.styleable.MaterialCalendarView_calendarDayOfMonthTextColor, black);
             disabledDayBackgroundColor = a.getColor(R.styleable.MaterialCalendarView_calendarDisabledDayBackgroundColor, dayDisableBackground);
             disabledDayTextColor = a.getColor(R.styleable.MaterialCalendarView_calendarDisabledDayTextColor, dayDisableTextColor);
             selectedDayBackgroundColor = a.getColor(R.styleable.MaterialCalendarView_calendarSelectedDayBackgroundColor, daySelectedBackground);
@@ -423,7 +425,7 @@ private void drawWeekView() {
             if (totalDayOfWeekend.length != 0) {
                 for (int weekend : totalDayOfWeekend) {
                     if (i == weekend) {
-                        textView.setTextColor(weekendTextColor);
+                        textView.setTextColor(dayOfWeekTextColor);
                         isCommonDay = false;
                     }
                 }
@@ -578,7 +580,7 @@ private void drawAdapterView() {
                 }
 
                 if (isCommonDay) {
-                    textView.setTextColor(dayOfWeekTextColor);
+                    textView.setTextColor(dayOfMonthTextColor);
                 }
 
                 if (day.isCurrentDay()) {
@@ -626,7 +628,7 @@ private void clearDayViewSelection(Date currentDate) {
             }
 
             if (isCommonDay) {
-                dayView.setTextColor(dayOfWeekTextColor);
+                dayView.setTextColor(dayOfMonthTextColor);
             }
         }
     }
@@ -1290,6 +1292,12 @@ public CalendarView setTitleTextColor(int titleTextColor) {
         return this;
     }
 
+    public CalendarView setDayOfMonthTextColor(int dayOfMonthTextColor) {
+        this.dayOfMonthTextColor = dayOfMonthTextColor;
+        invalidate();
+        return this;
+    }
+
     public CalendarView setDayOfWeekTextColor(int dayOfWeekTextColor) {
         this.dayOfWeekTextColor = dayOfWeekTextColor;
         invalidate();
diff --git a/materialcalendarview/src/main/res/values/attrs.xml b/materialcalendarview/src/main/res/values/attrs.xml
index f634e26..ca74a6e 100644
--- a/materialcalendarview/src/main/res/values/attrs.xml
+++ b/materialcalendarview/src/main/res/values/attrs.xml
@@ -13,6 +13,7 @@
         <attr name="calendarTitleBackgroundColor" format="color" />
         <attr name="calendarTitleTextColor" format="color" />
         <attr name="calendarDayOfWeekTextColor" format="color" />
+        <attr name="calendarDayOfMonthTextColor" format="color" />
         <attr name="calendarDisabledDayTextColor" format="color" />
         <attr name="calendarSelectedDayTextColor" format="color" />
         <attr name="calendarWeekendTextColor" format="color"/>

From 49c27c2082ef7cfc80bb40a80001baffa92cc7c9 Mon Sep 17 00:00:00 2001
From: Uday Srinath <usrinath@cisco.com>
Date: Wed, 5 Sep 2018 17:24:32 -0700
Subject: [PATCH 2/3] Fixed alignment for dayOfWeek and dayOfMonth, cleanup
 layouts, moved to styles

---
 .../src/main/res/layout/week_view1.xml        | 21 -------------------
 .../src/main/res/layout/week_view2.xml        | 21 -------------------
 .../src/main/res/layout/week_view3.xml        | 21 -------------------
 .../src/main/res/layout/week_view4.xml        | 21 -------------------
 .../src/main/res/layout/week_view5.xml        | 21 -------------------
 .../src/main/res/layout/week_view6.xml        | 21 -------------------
 .../src/main/res/values/styles.xml            |  7 +++++--
 7 files changed, 5 insertions(+), 128 deletions(-)

diff --git a/materialcalendarview/src/main/res/layout/week_view1.xml b/materialcalendarview/src/main/res/layout/week_view1.xml
index 43788d7..5473fe3 100644
--- a/materialcalendarview/src/main/res/layout/week_view1.xml
+++ b/materialcalendarview/src/main/res/layout/week_view1.xml
@@ -18,9 +18,6 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
             android:tag="dayOfMonthText1"
             tools:text="1"
             android:layout_centerInParent="true"/>
@@ -36,9 +33,6 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
             android:tag="dayOfMonthText2"
             tools:text="2"
             android:layout_centerInParent="true"/>
@@ -54,9 +48,6 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:gravity="center"
             android:tag="dayOfMonthText3"
             tools:text="3"
             android:layout_centerVertical="true"
@@ -73,10 +64,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText4"
             tools:text="4"/>
 
@@ -91,10 +79,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText5"
             tools:text="5" />
 
@@ -109,10 +94,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText6"
             tools:text="6"/>
 
@@ -127,10 +109,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText7"
             tools:text="7"/>
 
diff --git a/materialcalendarview/src/main/res/layout/week_view2.xml b/materialcalendarview/src/main/res/layout/week_view2.xml
index 7e77bfe..8812d58 100644
--- a/materialcalendarview/src/main/res/layout/week_view2.xml
+++ b/materialcalendarview/src/main/res/layout/week_view2.xml
@@ -18,10 +18,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText8"
             tools:text="8" />
 
@@ -36,10 +33,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText9"
             tools:text="9" />
 
@@ -54,10 +48,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText10"
             tools:text="10" />
 
@@ -72,10 +63,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText11"
             tools:text="11" />
 
@@ -90,10 +78,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText12"
             tools:text="12" />
 
@@ -108,10 +93,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText13"
             tools:text="13" />
 
@@ -126,10 +108,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText14"
             tools:text="14" />
 
diff --git a/materialcalendarview/src/main/res/layout/week_view3.xml b/materialcalendarview/src/main/res/layout/week_view3.xml
index 9d04a9c..5418739 100644
--- a/materialcalendarview/src/main/res/layout/week_view3.xml
+++ b/materialcalendarview/src/main/res/layout/week_view3.xml
@@ -18,10 +18,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText15"
             tools:text="15" />
 
@@ -36,10 +33,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText16"
             tools:text="16" />
 
@@ -54,10 +48,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText17"
             tools:text="17" />
 
@@ -72,10 +63,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText18"
             tools:text="18" />
 
@@ -90,10 +78,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText19"
             tools:text="19" />
 
@@ -108,10 +93,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText20"
             tools:text="20" />
 
@@ -126,10 +108,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText21"
             tools:text="21" />
 
diff --git a/materialcalendarview/src/main/res/layout/week_view4.xml b/materialcalendarview/src/main/res/layout/week_view4.xml
index 6c2968c..cf3406c 100644
--- a/materialcalendarview/src/main/res/layout/week_view4.xml
+++ b/materialcalendarview/src/main/res/layout/week_view4.xml
@@ -18,10 +18,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText22"
             tools:text="22"/>
 
@@ -36,10 +33,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText23"
             tools:text="23" />
 
@@ -54,10 +48,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText24"
             tools:text="24"/>
 
@@ -72,10 +63,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText25"
             tools:text="25"/>
 
@@ -90,10 +78,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText26"
             tools:text="26"/>
 
@@ -108,10 +93,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText27"
             tools:text="27"/>
 
@@ -126,10 +108,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText28"
             tools:text="28" />
 
diff --git a/materialcalendarview/src/main/res/layout/week_view5.xml b/materialcalendarview/src/main/res/layout/week_view5.xml
index fad4efc..ebf6da5 100644
--- a/materialcalendarview/src/main/res/layout/week_view5.xml
+++ b/materialcalendarview/src/main/res/layout/week_view5.xml
@@ -18,10 +18,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText29"
             tools:text="29" />
 
@@ -36,10 +33,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText30"
             tools:text="30" />
 
@@ -54,10 +48,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText31"
             tools:text="31" />
 
@@ -72,10 +63,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText32"
             tools:text="32" />
 
@@ -90,10 +78,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText33"
             tools:text="33" />
 
@@ -108,10 +93,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText34"
             tools:text="34" />
 
@@ -126,10 +108,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText35"
             tools:text="35" />
 
diff --git a/materialcalendarview/src/main/res/layout/week_view6.xml b/materialcalendarview/src/main/res/layout/week_view6.xml
index 41d80de..1778501 100644
--- a/materialcalendarview/src/main/res/layout/week_view6.xml
+++ b/materialcalendarview/src/main/res/layout/week_view6.xml
@@ -18,10 +18,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText36"
             tools:text="36" />
 
@@ -36,10 +33,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText37"
             tools:text="37" />
 
@@ -54,10 +48,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText38"
             tools:text="38" />
 
@@ -72,10 +63,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText39"
             tools:text="39" />
 
@@ -90,10 +78,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText40"
             tools:text="40" />
 
@@ -108,10 +93,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText41"
             tools:text="41" />
 
@@ -126,10 +108,7 @@
 
         <io.blackbox_vision.materialcalendarview.view.DayView
             style="@style/CalendarView.DayOfTheMonth"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
             android:layout_centerInParent="true"
-            android:gravity="center"
             android:tag="dayOfMonthText42"
             tools:text="42" />
 
diff --git a/materialcalendarview/src/main/res/values/styles.xml b/materialcalendarview/src/main/res/values/styles.xml
index 552a9e2..8eecb78 100644
--- a/materialcalendarview/src/main/res/values/styles.xml
+++ b/materialcalendarview/src/main/res/values/styles.xml
@@ -17,7 +17,7 @@
 
     <style name="CalendarView.DayOfTheWeek">
         <item name="android:textSize">14sp</item>
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">40dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
     </style>
@@ -25,6 +25,9 @@
     <style name="CalendarView.DayOfTheMonth">
         <item name="android:textSize">14sp</item>
         <item name="android:minHeight">@dimen/minDayCellHeight</item>
+        <item name="android:layout_width">40dp</item>
+        <item name="android:layout_height">40dp</item>
+        <item name="android:gravity">center</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>

From 93d1a2eabcf8252aa79ee9f826d75eb1ad7079a9 Mon Sep 17 00:00:00 2001
From: Uday Srinath <usrinath@cisco.com>
Date: Thu, 13 Sep 2018 16:07:06 -0700
Subject: [PATCH 3/3] Differentiate currentDayTextColor uniquely from
 selectedDayTextColor, enabling current day to have a different text color
 even when it is not the selected date

---
 app/src/main/res/layout/activity_main.xml                   | 5 +++--
 .../materialcalendarview/view/CalendarView.java             | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7f38dd7..1d5f64a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,7 +48,8 @@
                         app:calendarIsOverflowDatesVisible="true"
                         app:calendarBackgroundColor="@color/colorPrimary"
                         app:calendarTitleTextColor="@color/colorAccent"
-                        app:calendarCurrentDayTextColor="@color/white"
+                        app:calendarCurrentDayTextColor="@color/colorAccent"
+                        app:calendarSelectedDayTextColor="@color/white"
                         app:calendarDayOfWeekTextColor="@color/grey"
                         app:calendarDayOfMonthTextColor="@android:color/white"
                         app:calendarDisabledDayBackgroundColor="@color/colorPrimary"
@@ -57,7 +58,7 @@
                         app:calendarTitleBackgroundColor="@color/colorPrimary"
                         app:calendarWeekBackgroundColor="@color/colorPrimary"
                         app:calendarCurrentDayBackgroundColor="@color/teal500"
-                        app:calendarWeekendTextColor="@color/colorAccent"
+                        app:calendarWeekendTextColor="@color/red"
                         app:calendarButtonBackgroundColor="@color/colorAccent"
                         app:calendarWeekendDays="saturday|sunday">
                     </io.blackbox_vision.materialcalendarview.view.CalendarView>
diff --git a/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java b/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
index 9a2c2c8..c1b81bc 100644
--- a/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
+++ b/materialcalendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java
@@ -616,7 +616,7 @@ private void clearDayViewSelection(Date currentDate) {
 
             DayView dayView = findViewByCalendar(calendar);
             dayView.setBackgroundColor(calendarBackgroundColor);
-            isCommonDay = true;
+            isCommonDay = !CalendarUtils.isToday(calendar);
 
             if (totalDayOfWeekend.length != 0) {
                 for (int weekend : totalDayOfWeekend) {
@@ -629,6 +629,8 @@ private void clearDayViewSelection(Date currentDate) {
 
             if (isCommonDay) {
                 dayView.setTextColor(dayOfMonthTextColor);
+            } else {
+                dayView.setTextColor(currentDayTextColor);
             }
         }
     }
@@ -692,7 +694,7 @@ private void drawCurrentDay(@NonNull Date date) {
         if (CalendarUtils.isToday(calendar)) {
             final DayView dayOfMonth = findViewByCalendar(calendar);
 
-            dayOfMonth.setTextColor(currentDayTextColor);
+            dayOfMonth.setTextColor(dayOfMonthTextColor);
 
             Drawable d = ContextCompat.getDrawable(getContext(), R.drawable.circular_background);
             d.setColorFilter(currentDayBackgroundColor, PorterDuff.Mode.SRC_ATOP);