Merge pull request #62 from udaysrinath/master

Calendar View enhancements
BlackBoxVision · Sep 25, 2018 · ea3f5cb · ea3f5cb
2 parents 32cd6cf + 93d1a2e
commit ea3f5cb
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 138 deletions.
diff --git 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
@@ -48,15 +48,17 @@
                         app:calendarIsOverflowDatesVisible="true"
                         app:calendarBackgroundColor="@color/colorPrimary"
                         app:calendarTitleTextColor="@color/colorAccent"
-                        app:calendarCurrentDayTextColor="@color/white"
-                        app:calendarDayOfWeekTextColor="@android:color/white"
+                        app:calendarCurrentDayTextColor="@color/colorAccent"
+                        app:calendarSelectedDayTextColor="@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"
                         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/...calendarview/src/main/java/io/blackbox_vision/materialcalendarview/view/CalendarView.java b/...calendarview/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()) {
@@ -614,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) {
@@ -626,7 +628,9 @@ private void clearDayViewSelection(Date currentDate) {
             }
 
             if (isCommonDay) {
-                dayView.setTextColor(dayOfWeekTextColor);
+                dayView.setTextColor(dayOfMonthTextColor);
+            } else {
+                dayView.setTextColor(currentDayTextColor);
             }
         }
     }
@@ -690,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);
@@ -1290,6 +1294,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/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
@@ -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
@@ -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" />