Update week view loader

Author: alamkanak

README.md

@@ -132,7 +132,8 @@ Interfaces
 
 Use the following interfaces according to your need.
 
-- `mWeekView.setMonthChangeListener()` to provide events to the calendar
+- `mWeekView.setWeekViewLoader()` to provide events to the calendar
+- `mWeekView.setMonthChangeListener()` to provide events to the calendar by months
 - `mWeekView.setOnEventClickListener()` to get a callback when an event is clicked
 - `mWeekView.setEventLongPressListener()` to get a callback when an event is long pressed
 - `mWeekView.setEmptyViewClickListener()` to get a callback when any empty space is clicked

library/src/main/java/com/alamkanak/weekview/MonthLoader.java

@@ -5,27 +5,39 @@
 
 public class MonthLoader implements WeekViewLoader {
 
-    private WeekView.MonthChangeListener mOnMonthChangeListener;
-    public MonthLoader(WeekView.MonthChangeListener listener){
+    private MonthChangeListener mOnMonthChangeListener;
+
+    public MonthLoader(MonthChangeListener listener){
         this.mOnMonthChangeListener = listener;
     }
 
     @Override
     public double toWeekViewPeriodIndex(Calendar instance){
-        return instance.get(Calendar.YEAR)*12 + instance.get(Calendar.MONTH) + (instance.get(Calendar.DAY_OF_MONTH)-1)/30.0;
+        return instance.get(Calendar.YEAR) * 12 + instance.get(Calendar.MONTH) + (instance.get(Calendar.DAY_OF_MONTH) - 1) / 30.0;
     }
 
     @Override
     public List<WeekViewEvent> onLoad(int periodIndex){
-        return mOnMonthChangeListener.onMonthChange(periodIndex/12,periodIndex%12+1);
+        return mOnMonthChangeListener.onMonthChange(periodIndex / 12, periodIndex % 12 + 1);
     }
 
-
-    public WeekView.MonthChangeListener getOnMonthChangeListener() {
+    public MonthChangeListener getOnMonthChangeListener() {
         return mOnMonthChangeListener;
     }
 
-    public void setOnMonthChangeListener(WeekView.MonthChangeListener onMonthChangeListener) {
+    public void setOnMonthChangeListener(MonthChangeListener onMonthChangeListener) {
         this.mOnMonthChangeListener = onMonthChangeListener;
     }
+
+    public interface MonthChangeListener {
+        /**
+         * Very important interface, it's the base to load events in the calendar.
+         * This method is called three times: once to load the previous month, once to load the next month and once to load the current month.<br/>
+         * <strong>That's why you can have three times the same event at the same place if you mess up with the configuration</strong>
+         * @param newYear: year of the events required by the view.
+         * @param newMonth: month of the events required by the view <br/><strong>1 based (not like JAVA API) --> January = 1 and December = 12</strong>.
+         * @return a list of the events happening <strong>during the specified month</strong>.
+         */
+        List<WeekViewEvent> onMonthChange(int newYear, int newMonth);
+    }
 }

library/src/main/java/com/alamkanak/weekview/WeekView.java

@@ -9,6 +9,7 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
+import android.support.annotation.Nullable;
 import android.support.v4.view.GestureDetectorCompat;
 import android.support.v4.view.ViewCompat;
 import android.text.Layout;
@@ -1119,20 +1120,32 @@ public EventClickListener getEventClickListener() {
         return mEventClickListener;
     }
 
-    public MonthChangeListener getMonthChangeListener() {
+    public @Nullable MonthLoader.MonthChangeListener getMonthChangeListener() {
         if (mWeekViewLoader instanceof MonthLoader)
             return ((MonthLoader) mWeekViewLoader).getOnMonthChangeListener();
         return null;
     }
 
-    public void setMonthChangeListener(MonthChangeListener monthChangeListener) {
+    public void setMonthChangeListener(MonthLoader.MonthChangeListener monthChangeListener) {
         this.mWeekViewLoader = new MonthLoader(monthChangeListener);
     }
 
+    /**
+     * Get event loader in the week view. Event loaders define the  interval after which the events
+     * are loaded in week view. For a MonthLoader events are loaded for every month. You can define
+     * your custom event loader by extending WeekViewLoader.
+     * @return The event loader.
+     */
     public WeekViewLoader getWeekViewLoader(){
         return mWeekViewLoader;
     }
 
+    /**
+     * Set event loader in the week view. For example, a MonthLoader. Event loaders define the
+     * interval after which the events are loaded in week view. For a MonthLoader events are loaded
+     * for every month. You can define your custom event loader by extending WeekViewLoader.
+     * @param loader The event loader.
+     */
     public void setWeekViewLoader(WeekViewLoader loader){
         this.mWeekViewLoader = loader;
     }
@@ -1772,18 +1785,6 @@ public interface EventClickListener {
         void onEventClick(WeekViewEvent event, RectF eventRect);
     }
 
-    public interface MonthChangeListener {
-        /**
-         * Very important interface, it's the base to load events in the calendar.
-         * This method is called three times: once to load the previous month, once to load the next month and once to load the current month.<br/>
-         * <strong>That's why you can have three times the same event at the same place if you mess up with the configuration</strong>
-         * @param newYear: year of the events required by the view.
-         * @param newMonth: month of the events required by the view <br/><strong>1 based (not like JAVA API) --> January = 1 and December = 12</strong>.
-         * @return a list of the events happening <strong>during the specified month</strong>.
-         */
-        List<WeekViewEvent> onMonthChange(int newYear, int newMonth);
-    }
-
     public interface EventLongPressListener {
         /**
          * Similar to {@link com.alamkanak.weekview.WeekView.EventClickListener} but with a long press.

library/src/main/java/com/alamkanak/weekview/WeekViewLoader.java

@@ -7,17 +7,18 @@ public interface WeekViewLoader {
     /**
      * Convert a date into a double that will be used to reference when you're loading data.
      *
-     * All periods that have the same integer part, define one period. Dates that are later in time should have a greater return value.
+     * All periods that have the same integer part, define one period. Dates that are later in time
+     * should have a greater return value.
      *
      * @param instance the date
      * @return The period index in which the date falls (floating point number).
      */
-    public double toWeekViewPeriodIndex(Calendar instance);
+    double toWeekViewPeriodIndex(Calendar instance);
 
     /**
      * Load the events within the period
      * @param periodIndex the period to load
      * @return A list with the events of this period
      */
-    public List<WeekViewEvent> onLoad(int periodIndex);
+    List<WeekViewEvent> onLoad(int periodIndex);
 }

sample/src/main/java/com/alamkanak/weekview/sample/MainActivity.java

@@ -9,6 +9,7 @@
 import android.widget.Toast;
 
 import com.alamkanak.weekview.DateTimeInterpreter;
+import com.alamkanak.weekview.MonthLoader;
 import com.alamkanak.weekview.WeekView;
 import com.alamkanak.weekview.WeekViewEvent;
 
@@ -23,7 +24,7 @@
  * Created by Raquib-ul-Alam Kanak on 7/21/2014.
  * Website: http://alamkanak.github.io/
  */
-public class MainActivity extends ActionBarActivity implements WeekView.MonthChangeListener,
+public class MainActivity extends ActionBarActivity implements MonthLoader.MonthChangeListener,
         WeekView.EventClickListener, WeekView.EventLongPressListener {
 
     private static final int TYPE_DAY_VIEW = 1;