抽取calendar library

xiaojianglaile · Feb 20, 2017 · 0cf57ef · 0cf57ef
1 parent 0b27ad4
commit 0cf57ef
Show file tree

Hide file tree

Showing 79 changed files with 207 additions and 448 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,6 +20,5 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':common')
-    compile 'joda-time:joda-time:2.9.4'
+    compile project(':calendar')
 }
diff --git a/app/src/main/java/com/jeek/calendar/activity/AddEventSetActivity.java b/app/src/main/java/com/jeek/calendar/activity/AddEventSetActivity.java
@@ -8,7 +8,7 @@
 import android.widget.TextView;
 
 import com.jeek.calendar.R;
-import com.jeek.calendar.bean.EventSet;
+import com.jimmy.common.bean.EventSet;
 import com.jeek.calendar.dialog.SelectColorDialog;
 import com.jeek.calendar.task.eventset.AddEventSetTask;
 import com.jeek.calendar.utils.JeekUtils;

diff --git a/app/src/main/java/com/jeek/calendar/activity/MainActivity.java b/app/src/main/java/com/jeek/calendar/activity/MainActivity.java
@@ -21,11 +21,10 @@
 
 import com.jeek.calendar.R;
 import com.jeek.calendar.adapter.EventSetAdapter;
-import com.jeek.calendar.bean.EventSet;
+import com.jimmy.common.bean.EventSet;
 import com.jeek.calendar.fragment.EventSetFragment;
 import com.jeek.calendar.fragment.ScheduleFragment;
 import com.jeek.calendar.task.eventset.LoadEventSetTask;
-import com.jeek.calendar.widget.drag.DragContainerLayout;
 import com.jimmy.common.base.app.BaseActivity;
 import com.jimmy.common.base.app.BaseFragment;
 import com.jimmy.common.listener.OnTaskFinishedListener;

diff --git a/app/src/main/java/com/jeek/calendar/activity/ScheduleDetailActivity.java b/app/src/main/java/com/jeek/calendar/activity/ScheduleDetailActivity.java
@@ -9,8 +9,8 @@
 import android.widget.TextView;
 
 import com.jeek.calendar.R;
-import com.jeek.calendar.bean.EventSet;
-import com.jeek.calendar.bean.Schedule;
+import com.jimmy.common.bean.EventSet;
+import com.jimmy.common.bean.Schedule;
 import com.jeek.calendar.dialog.InputLocationDialog;
 import com.jeek.calendar.dialog.SelectDateDialog;
 import com.jeek.calendar.dialog.SelectEventSetDialog;

diff --git a/app/src/main/java/com/jeek/calendar/adapter/EventSetAdapter.java b/app/src/main/java/com/jeek/calendar/adapter/EventSetAdapter.java
@@ -11,7 +11,7 @@
 
 import com.jeek.calendar.R;
 import com.jeek.calendar.activity.MainActivity;
-import com.jeek.calendar.bean.EventSet;
+import com.jimmy.common.bean.EventSet;
 import com.jeek.calendar.dialog.ConfirmDialog;
 import com.jeek.calendar.task.eventset.RemoveEventSetTask;
 import com.jeek.calendar.utils.JeekUtils;

diff --git a/app/src/main/java/com/jeek/calendar/adapter/ScheduleAdapter.java b/app/src/main/java/com/jeek/calendar/adapter/ScheduleAdapter.java
@@ -1,6 +1,5 @@
 package com.jeek.calendar.adapter;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -13,7 +12,7 @@
 
 import com.jeek.calendar.R;
 import com.jeek.calendar.activity.ScheduleDetailActivity;
-import com.jeek.calendar.bean.Schedule;
+import com.jimmy.common.bean.Schedule;
 import com.jeek.calendar.dialog.ConfirmDialog;
 import com.jeek.calendar.fragment.ScheduleFragment;
 import com.jeek.calendar.task.schedule.RemoveScheduleTask;

diff --git a/app/src/main/java/com/jeek/calendar/adapter/SelectEventSetAdapter.java b/app/src/main/java/com/jeek/calendar/adapter/SelectEventSetAdapter.java
@@ -10,7 +10,7 @@
 import android.widget.TextView;
 
 import com.jeek.calendar.R;
-import com.jeek.calendar.bean.EventSet;
+import com.jimmy.common.bean.EventSet;
 
 import java.util.List;
 

diff --git a/app/src/main/java/com/jeek/calendar/dialog/SelectEventSetDialog.java b/app/src/main/java/com/jeek/calendar/dialog/SelectEventSetDialog.java
@@ -12,7 +12,7 @@
 import com.jeek.calendar.R;
 import com.jeek.calendar.activity.AddEventSetActivity;
 import com.jeek.calendar.adapter.SelectEventSetAdapter;
-import com.jeek.calendar.bean.EventSet;
+import com.jimmy.common.bean.EventSet;
 import com.jeek.calendar.task.eventset.LoadEventSetTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/fragment/EventSetFragment.java b/app/src/main/java/com/jeek/calendar/fragment/EventSetFragment.java
@@ -18,8 +18,8 @@
 
 import com.jeek.calendar.R;
 import com.jeek.calendar.adapter.ScheduleAdapter;
-import com.jeek.calendar.bean.EventSet;
-import com.jeek.calendar.bean.Schedule;
+import com.jimmy.common.bean.EventSet;
+import com.jimmy.common.bean.Schedule;
 import com.jeek.calendar.dialog.SelectDateDialog;
 import com.jeek.calendar.task.eventset.GetScheduleTask;
 import com.jeek.calendar.task.schedule.AddScheduleTask;

diff --git a/app/src/main/java/com/jeek/calendar/fragment/ScheduleFragment.java b/app/src/main/java/com/jeek/calendar/fragment/ScheduleFragment.java
@@ -18,15 +18,13 @@
 import com.jeek.calendar.R;
 import com.jeek.calendar.activity.MainActivity;
 import com.jeek.calendar.adapter.ScheduleAdapter;
-import com.jeek.calendar.bean.Schedule;
+import com.jimmy.common.bean.Schedule;
 import com.jeek.calendar.dialog.SelectDateDialog;
 import com.jeek.calendar.task.schedule.AddScheduleTask;
 import com.jeek.calendar.task.schedule.LoadScheduleTask;
 import com.jeek.calendar.widget.calendar.OnCalendarClickListener;
 import com.jeek.calendar.widget.calendar.schedule.ScheduleLayout;
 import com.jeek.calendar.widget.calendar.schedule.ScheduleRecyclerView;
-import com.jeek.calendar.widget.drag.DragContainerLayout;
-import com.jeek.calendar.widget.drag.OnDragFinishedListener;
 import com.jimmy.common.base.app.BaseFragment;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 import com.jimmy.common.util.DeviceUtils;
@@ -39,7 +37,7 @@
  * Created by Jimmy on 2016/10/11 0011.
  */
 public class ScheduleFragment extends BaseFragment implements OnCalendarClickListener, View.OnClickListener,
-        OnTaskFinishedListener<List<Schedule>>, SelectDateDialog.OnSelectDateListener, OnDragFinishedListener {
+        OnTaskFinishedListener<List<Schedule>>, SelectDateDialog.OnSelectDateListener {
 
     private ScheduleLayout slSchedule;
     private ScheduleRecyclerView rvScheduleList;
@@ -235,19 +233,4 @@ public int getCurrentCalendarPosition() {
         return slSchedule.getMonthCalendar().getCurrentItem();
     }
 
-    @Override
-    public void onSelectDisplayBoard(int x, int y) {
-        ToastUtils.showShortToast(mActivity, "x:" + x + ";y:" + y);
-    }
-
-    @Override
-    public void onSelectTopBarRightButton() {
-        ToastUtils.showShortToast(mActivity, "Delete");
-    }
-
-    @Override
-    public void onSelectOther() {
-        ToastUtils.showShortToast(mActivity, "Other");
-    }
-
 }
diff --git a/app/src/main/java/com/jeek/calendar/task/eventset/AddEventSetTask.java b/app/src/main/java/com/jeek/calendar/task/eventset/AddEventSetTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.EventSet;
-import com.jeek.calendar.data.EventSetDao;
+import com.jimmy.common.bean.EventSet;
+import com.jimmy.common.data.EventSetDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/eventset/GetScheduleTask.java b/app/src/main/java/com/jeek/calendar/task/eventset/GetScheduleTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.Schedule;
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.bean.Schedule;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/eventset/LoadEventSetMapTask.java b/app/src/main/java/com/jeek/calendar/task/eventset/LoadEventSetMapTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.EventSet;
-import com.jeek.calendar.data.EventSetDao;
+import com.jimmy.common.bean.EventSet;
+import com.jimmy.common.data.EventSetDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/eventset/LoadEventSetTask.java b/app/src/main/java/com/jeek/calendar/task/eventset/LoadEventSetTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.EventSet;
-import com.jeek.calendar.data.EventSetDao;
+import com.jimmy.common.bean.EventSet;
+import com.jimmy.common.data.EventSetDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/eventset/RemoveEventSetTask.java b/app/src/main/java/com/jeek/calendar/task/eventset/RemoveEventSetTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.data.EventSetDao;
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.data.EventSetDao;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/schedule/AddScheduleTask.java b/app/src/main/java/com/jeek/calendar/task/schedule/AddScheduleTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.Schedule;
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.bean.Schedule;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/schedule/LoadScheduleTask.java b/app/src/main/java/com/jeek/calendar/task/schedule/LoadScheduleTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.Schedule;
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.bean.Schedule;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/schedule/RemoveScheduleTask.java b/app/src/main/java/com/jeek/calendar/task/schedule/RemoveScheduleTask.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/task/schedule/UpdateScheduleTask.java b/app/src/main/java/com/jeek/calendar/task/schedule/UpdateScheduleTask.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 
-import com.jeek.calendar.bean.Schedule;
-import com.jeek.calendar.data.ScheduleDao;
+import com.jimmy.common.bean.Schedule;
+import com.jimmy.common.data.ScheduleDao;
 import com.jimmy.common.base.task.BaseAsyncTask;
 import com.jimmy.common.listener.OnTaskFinishedListener;
 

diff --git a/app/src/main/java/com/jeek/calendar/utils/JeekUtils.java b/app/src/main/java/com/jeek/calendar/utils/JeekUtils.java
@@ -18,7 +18,7 @@ public static String timeStamp2Time(long time) {
     public static int getEventSetColor(int color) {
         switch (color) {
             case 0:
-                return R.color.color_schedule_purple;
+                return R.color.holiday_text_color;
             case 1:
                 return R.color.color_schedule_blue;
             case 2:
@@ -30,7 +30,7 @@ public static int getEventSetColor(int color) {
             case 5:
                 return R.color.color_schedule_yellow;
             default:
-                return R.color.color_schedule_purple;
+                return R.color.holiday_text_color;
         }
     }
 

diff --git a/app/src/main/java/com/jeek/calendar/widget/drag/DragContainerLayout.java b/app/src/main/java/com/jeek/calendar/widget/drag/DragContainerLayout.java