Merge branch 'future-1.x' of https://github.com/prolificinteractive/m…

…aterial-calendarview into qc_naming_documentation

library/build.gradle

@@ -12,6 +12,10 @@ android {
         versionCode project.ext.versionCodeInt
         versionName version
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

library/src/main/java/com/prolificinteractive/materialcalendarview/DayView.java

@@ -167,6 +167,7 @@ protected void setupSelection(@ShowOtherDates int showOtherDates, boolean inRang
     }
 
     private final Rect tempRect = new Rect();
+    private final Rect circleDrawableRect = new Rect();
 
     @Override
     protected void onDraw(@NonNull Canvas canvas) {
@@ -176,7 +177,7 @@ protected void onDraw(@NonNull Canvas canvas) {
             customBackground.draw(canvas);
         }
 
-        mCircleDrawable.setBounds(tempRect);
+        mCircleDrawable.setBounds(circleDrawableRect);
 
         super.onDraw(canvas);
     }
@@ -185,7 +186,7 @@ private void regenerateBackground() {
         if (selectionDrawable != null) {
             setBackgroundDrawable(selectionDrawable);
         } else {
-            mCircleDrawable = generateBackground(selectionColor, fadeTime, tempRect);
+            mCircleDrawable = generateBackground(selectionColor, fadeTime, circleDrawableRect);
             setBackgroundDrawable(mCircleDrawable);
         }
     }
@@ -265,14 +266,17 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
     private void calculateBounds(int width, int height) {
         final int radius = Math.min(height, width);
-        // Lollipop platform bug. Rect offset needs to be divided by 4 instead of 2
-        final int offsetDivisor = Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP ? 4 : 2;
-        final int offset = Math.abs(height - width) / offsetDivisor;
+        final int offset = Math.abs(height - width) / 2;
+
+        // Lollipop platform bug. Circle drawable offset needs to be half of normal offset
+        final int circleOffset = Build.VERSION.SDK_INT == Build.VERSION_CODES.LOLLIPOP ? offset / 2 : offset;
 
         if (width >= height) {
             tempRect.set(offset, 0, radius + offset, height);
+            circleDrawableRect.set(circleOffset, 0, radius + circleOffset, height);
         } else {
             tempRect.set(0, offset, width, radius + offset);
+            circleDrawableRect.set(0, circleOffset, width, radius + circleOffset);
         }
     }
 }

library/src/main/java/com/prolificinteractive/materialcalendarview/MaterialCalendarView.java

@@ -223,7 +223,6 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse
     private OnMonthChangedListener monthListener;
     private OnRangeSelectedListener rangeListener;
 
-
     CharSequence calendarContentDescription;
     private int accentColor = 0;
     private int arrowColor = Color.BLACK;
@@ -262,7 +261,6 @@ public MaterialCalendarView(Context context, AttributeSet attrs) {
         buttonFuture.setContentDescription(getContext().getString(R.string.next));
         pager = new CalendarPager(getContext());
 
-        title.setOnClickListener(onClickListener);
         buttonPast.setOnClickListener(onClickListener);
         buttonFuture.setOnClickListener(onClickListener);
 
@@ -1357,6 +1355,15 @@ public void setOnRangeSelectedListener(OnRangeSelectedListener listener) {
         this.rangeListener = listener;
     }
 
+    /**
+     * Add listener to the title or null to remove it.
+     *
+     * @param listener Listener to be notified.
+     */
+    public void setOnTitleClickListener(final OnClickListener listener) {
+        title.setOnClickListener(listener);
+    }
+
     /**
      * Dispatch date change events to a listener, if set
      *

sample/build.gradle

@@ -11,6 +11,10 @@ android {
         versionCode project.ext.versionCodeInt
         versionName version
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/CustomTileDimensions.java

@@ -1,13 +1,17 @@
 package com.prolificinteractive.materialcalendarview.sample;
 
 import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.LinearLayout;
 import android.widget.NumberPicker;
 
+import com.prolificinteractive.materialcalendarview.CalendarDay;
+import com.prolificinteractive.materialcalendarview.DayViewDecorator;
+import com.prolificinteractive.materialcalendarview.DayViewFacade;
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 
 import butterknife.Bind;
@@ -33,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     currentTileWidth = MaterialCalendarView.DEFAULT_TILE_SIZE_DP;
     currentTileHeight = MaterialCalendarView.DEFAULT_TILE_SIZE_DP;
+
+    widget.addDecorator(new TodayDecorator());
   }
 
   @OnClick(R.id.custom_tile_match_parent)
@@ -87,4 +93,25 @@ public void onClick(@NonNull DialogInterface dialog, int which) {
             })
             .show();
   }
+
+  private class TodayDecorator implements DayViewDecorator {
+
+    private final CalendarDay today;
+    private final Drawable backgroundDrawable;
+
+    public TodayDecorator() {
+      today = CalendarDay.today();
+      backgroundDrawable = getResources().getDrawable(R.drawable.today_circle_background);
+    }
+
+    @Override
+    public boolean shouldDecorate(CalendarDay day) {
+      return today.equals(day);
+    }
+
+    @Override
+    public void decorate(DayViewFacade view) {
+      view.setBackgroundDrawable(backgroundDrawable);
+    }
+  }
 }

sample/src/main/java/com/prolificinteractive/materialcalendarview/sample/DynamicSettersActivity.java

@@ -8,6 +8,7 @@
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
 import android.widget.DatePicker;
 import android.widget.LinearLayout;
 import android.widget.NumberPicker;
@@ -43,6 +44,14 @@ protected void onCreate(Bundle savedInstanceState) {
         currentTileSize = MaterialCalendarView.DEFAULT_TILE_SIZE_DP;
         currentTileWidth = MaterialCalendarView.DEFAULT_TILE_SIZE_DP;
         currentTileHeight = MaterialCalendarView.DEFAULT_TILE_SIZE_DP;
+
+        widget.setOnTitleClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                Toast.makeText(DynamicSettersActivity.this, R.string.today, Toast.LENGTH_SHORT)
+                        .show();
+            }
+        });
     }
 
     @OnClick(R.id.button_other_dates)

sample/src/main/res/drawable/today_circle_background.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="#44afcc" />
+
+</shape>

sample/src/main/res/values/strings.xml

@@ -48,4 +48,6 @@
     <string name="label_thin">Tile width and height specified (thin)</string>
     <string name="label_wide">Tile width and height specified (wide)</string>
 
+
+    <string name="today">Today is the day</string>
 </resources>