sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log in button in navigation menu implemented

Browse Source
This commit is contained in:
Caesar2011
2018-07-30 23:29:37 +02:00
parent 279594bf7d
commit 601759ebb1
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
View File

@@ -57,12 +57,6 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang
return fragment; return fragment;
} }
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
invalidate(false);
}
public void invalidate(boolean forceRefresh) { public void invalidate(boolean forceRefresh) {
if (getActivity() != null) { if (getActivity() != null) {
KVV kvv = ((MainActivity) getActivity()).getKVV(); KVV kvv = ((MainActivity) getActivity()).getKVV();
@@ -92,6 +86,7 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang
mWeekView.setMonthChangeListener(this); mWeekView.setMonthChangeListener(this);
mWeekView.setScrollListener(this); mWeekView.setScrollListener(this);
mWeekView.setEventDoubleTapListener(this); mWeekView.setEventDoubleTapListener(this);
invalidate(false);
return v; return v;
} }
@@ -140,7 +135,6 @@ public class ScheduleFragment extends Fragment implements MonthLoader.MonthChang
} }
} }
return events; return events;
//(List<? extends WeekViewEvent>) new WeekViewEvent(l,"Test", 2018, 7, 3,15,00,2018, 7, 3, 20,00); //(List<? extends WeekViewEvent>) 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 //int id, String title, int startYear, int startMonth, int startDay, int startHour, int startMinute, int endYear, int endMonth, int endDay, int endHour, int endMinute

4
app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/MonthLoader.java
View File

@@ -21,12 +21,12 @@ public class MonthLoader implements WeekViewLoader {
} }
@Override @Override
public List<? extends WeekViewEvent> onLoad(int periodIndex) { public List<? extends WeekViewEvent> onLoad(int periodIndex, boolean forceRefresh) {
SparseArray<List<? extends WeekViewEvent>> newCache = new SparseArray<>(3); SparseArray<List<? extends WeekViewEvent>> newCache = new SparseArray<>(3);
ArrayList<WeekViewEvent> result = new ArrayList<>(); ArrayList<WeekViewEvent> result = new ArrayList<>();
for (int i = periodIndex - 1; i <= periodIndex + 1; i++) { for (int i = periodIndex - 1; i <= periodIndex + 1; i++) {
List<? extends WeekViewEvent> events = cachedEvents.get(i, null); List<? extends WeekViewEvent> events = cachedEvents.get(i, null);
if (events == null) if (events == null || forceRefresh)
events = mOnMonthChangeListener.onMonthChange(i / 12, i % 12 + 1); events = mOnMonthChangeListener.onMonthChange(i / 12, i % 12 + 1);
newCache.put(i, events); newCache.put(i, events);
result.addAll(events); result.addAll(events);

11
app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
View File

@@ -1310,7 +1310,7 @@ public class WeekView extends View {
if (mWeekViewLoader != null) { if (mWeekViewLoader != null) {
int periodToFetch = (int) mWeekViewLoader.toWeekViewPeriodIndex(day); int periodToFetch = (int) mWeekViewLoader.toWeekViewPeriodIndex(day);
if (!isInEditMode() && (mFetchedPeriod < 0 || mFetchedPeriod != periodToFetch || mRefreshEvents)) { if (!isInEditMode() && (mFetchedPeriod < 0 || mFetchedPeriod != periodToFetch || mRefreshEvents)) {
List<? extends WeekViewEvent> newEvents = mWeekViewLoader.onLoad(periodToFetch); List<? extends WeekViewEvent> newEvents = mWeekViewLoader.onLoad(periodToFetch, mRefreshEvents);
// Clear events. // Clear events.
this.clearEvents(); this.clearEvents();
@@ -1584,17 +1584,14 @@ public class WeekView extends View {
return mEventLongPressListener; return mEventLongPressListener;
} }
//Event für Doppelkick/////////////////////// wird offenbar nicht gebraucht public GestureDetector.OnDoubleTapListener getEventDoubleTapListener() {
/*public GestureDetector.OnDoubleTapListener getEventDoubleTapListener() { return mOnDoubleTapListener;
return mOnDoubleTapListener; // oder der mDoubleTapListener ???? }
}*/
public void setEventLongPressListener(EventLongPressListener eventLongPressListener) { public void setEventLongPressListener(EventLongPressListener eventLongPressListener) {
this.mEventLongPressListener = eventLongPressListener; this.mEventLongPressListener = eventLongPressListener;
} }
//Event für Doppelkick
public void setEventDoubleTapListener(DoubleTapListener eventDoubleTapListener) { public void setEventDoubleTapListener(DoubleTapListener eventDoubleTapListener) {
this.mDoubleTapListener = eventDoubleTapListener; this.mDoubleTapListener = eventDoubleTapListener;
} }

2
app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekViewLoader.java
View File

@@ -23,5 +23,5 @@ public interface WeekViewLoader {
* @param periodIndex the period to load * @param periodIndex the period to load
* @return A list with the events of this period * @return A list with the events of this period
*/ */
List<? extends WeekViewEvent> onLoad(int periodIndex); List<? extends WeekViewEvent> onLoad(int periodIndex, boolean forceRefresh);
} }