diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java index aba56fe..1a17f4b 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java @@ -57,12 +57,6 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang return fragment; } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - invalidate(false); - } - public void invalidate(boolean forceRefresh) { if (getActivity() != null) { KVV kvv = ((MainActivity) getActivity()).getKVV(); @@ -92,6 +86,7 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang mWeekView.setMonthChangeListener(this); mWeekView.setScrollListener(this); mWeekView.setEventDoubleTapListener(this); + invalidate(false); return v; } @@ -140,7 +135,6 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang } } - return events; //(List) new WeekViewEvent(l,"Test", 2018, 7, 3,15,00,2018, 7, 3, 20,00); //int id, String title, int startYear, int startMonth, int startDay, int startHour, int startMinute, int endYear, int endMonth, int endDay, int endHour, int endMinute diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/MonthLoader.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/MonthLoader.java index 2f76cb1..17c63ed 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/MonthLoader.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/MonthLoader.java @@ -21,12 +21,12 @@ public class MonthLoader implements WeekViewLoader { } @Override - public List onLoad(int periodIndex) { + public List onLoad(int periodIndex, boolean forceRefresh) { SparseArray> newCache = new SparseArray<>(3); ArrayList result = new ArrayList<>(); for (int i = periodIndex - 1; i <= periodIndex + 1; i++) { List events = cachedEvents.get(i, null); - if (events == null) + if (events == null || forceRefresh) events = mOnMonthChangeListener.onMonthChange(i / 12, i % 12 + 1); newCache.put(i, events); result.addAll(events); diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java index 25a770c..624bc5f 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java @@ -1310,7 +1310,7 @@ public class WeekView extends View { if (mWeekViewLoader != null) { int periodToFetch = (int) mWeekViewLoader.toWeekViewPeriodIndex(day); if (!isInEditMode() && (mFetchedPeriod < 0 || mFetchedPeriod != periodToFetch || mRefreshEvents)) { - List newEvents = mWeekViewLoader.onLoad(periodToFetch); + List newEvents = mWeekViewLoader.onLoad(periodToFetch, mRefreshEvents); // Clear events. this.clearEvents(); @@ -1584,17 +1584,14 @@ public class WeekView extends View { return mEventLongPressListener; } - //Event für Doppelkick/////////////////////// wird offenbar nicht gebraucht - /*public GestureDetector.OnDoubleTapListener getEventDoubleTapListener() { - return mOnDoubleTapListener; // oder der mDoubleTapListener ???? - }*/ - + public GestureDetector.OnDoubleTapListener getEventDoubleTapListener() { + return mOnDoubleTapListener; + } public void setEventLongPressListener(EventLongPressListener eventLongPressListener) { this.mEventLongPressListener = eventLongPressListener; } - //Event für Doppelkick public void setEventDoubleTapListener(DoubleTapListener eventDoubleTapListener) { this.mDoubleTapListener = eventDoubleTapListener; } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewLoader.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewLoader.java index e42ef61..18159ac 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewLoader.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewLoader.java @@ -23,5 +23,5 @@ public interface WeekViewLoader { * @param periodIndex the period to load * @return A list with the events of this period */ - List onLoad(int periodIndex); + List onLoad(int periodIndex, boolean forceRefresh); }