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

Unused logs removed

Browse Source
This commit is contained in:
Caesar2011
2018-07-30 23:36:45 +02:00
parent 601759ebb1
commit ef404dd816
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,6 @@ public class WeekView extends View {
@Override @Override
public boolean onDoubleTap(MotionEvent e){ public boolean onDoubleTap(MotionEvent e){
log.d("onDoubleTapEvent");
Calendar selectedTime = getTimeFromPoint(e.getX(), e.getY()); Calendar selectedTime = getTimeFromPoint(e.getX(), e.getY());
if (selectedTime != null && mDoubleTapListener != null) { if (selectedTime != null && mDoubleTapListener != null) {
mDoubleTapListener.mOnDoubleTapListener((Calendar) selectedTime.clone()); mDoubleTapListener.mOnDoubleTapListener((Calendar) selectedTime.clone());
@@ -315,7 +314,6 @@ public class WeekView extends View {
@Override @Override
public boolean onSingleTapConfirmed(MotionEvent e) { public boolean onSingleTapConfirmed(MotionEvent e) {
log.d("onSingleTapConfirmed");
// If the tap was on an event then trigger the callback. // If the tap was on an event then trigger the callback.
if (mEventRects != null && mEventClickListener != null) { if (mEventRects != null && mEventClickListener != null) {
List<EventRect> reversedEventRects = mEventRects; List<EventRect> reversedEventRects = mEventRects;
@@ -1081,15 +1079,16 @@ public class WeekView extends View {
private void drawEvents(Calendar date, float startFromPixel, Canvas canvas) { private void drawEvents(Calendar date, float startFromPixel, Canvas canvas) {
if (mEventRects != null && mEventRects.size() > 0) { if (mEventRects != null && mEventRects.size() > 0) {
for (int i = 0; i < mEventRects.size(); i++) { for (int i = 0; i < mEventRects.size(); i++) {
if (isSameDay(mEventRects.get(i).event.getStartTime(), date) && !mEventRects.get(i).event.isAllDay()) { EventRect eventRect = mEventRects.get(i);
float top = mHourHeight * mEventRects.get(i).top / 60 + getEventsTop(); if (isSameDay(eventRect.event.getStartTime(), date) && !eventRect.event.isAllDay()) {
float bottom = mHourHeight * mEventRects.get(i).bottom / 60 + getEventsTop(); float top = mHourHeight * eventRect.top / 60 + getEventsTop();
float bottom = mHourHeight * eventRect.bottom / 60 + getEventsTop();
// Calculate left and right. // Calculate left and right.
float left = startFromPixel + mEventRects.get(i).left * mWidthPerDay; float left = startFromPixel + eventRect.left * mWidthPerDay;
if (left < startFromPixel) if (left < startFromPixel)
left += mOverlappingEventGap; left += mOverlappingEventGap;
float right = left + mEventRects.get(i).width * mWidthPerDay; float right = left + eventRect.width * mWidthPerDay;
if (right < startFromPixel + mWidthPerDay) if (right < startFromPixel + mWidthPerDay)
right -= mOverlappingEventGap; right -= mOverlappingEventGap;
@@ -1100,24 +1099,24 @@ public class WeekView extends View {
right > mHeaderColumnWidth && right > mHeaderColumnWidth &&
bottom > mHeaderHeight + mHeaderRowPadding * 2 + mTimeTextHeight / 2 + mHeaderMarginBottom bottom > mHeaderHeight + mHeaderRowPadding * 2 + mTimeTextHeight / 2 + mHeaderMarginBottom
) { ) {
mEventRects.get(i).rectF = new RectF(left, top, right, bottom); eventRect.rectF = new RectF(left, top, right, bottom);
if (mEventRects.get(i).event.getColor() != null) if (eventRect.event.getColor() != null)
mEventRects.get(i).event.getColor().setPaintColor(mEventBackgroundPaint); eventRect.event.getColor().setPaintColor(mEventBackgroundPaint);
else else
mEventBackgroundPaint.setColor(mDefaultEventColor); mEventBackgroundPaint.setColor(mDefaultEventColor);
mEventBackgroundPaint.setShader(mEventRects.get(i).event.getShader()); mEventBackgroundPaint.setShader(eventRect.event.getShader());
canvas.drawRoundRect(mEventRects.get(i).rectF, mEventCornerRadius, mEventCornerRadius, mEventBackgroundPaint); canvas.drawRoundRect(eventRect.rectF, mEventCornerRadius, mEventCornerRadius, mEventBackgroundPaint);
float topToUse = top; float topToUse = top;
if (mEventRects.get(i).event.getStartTime().get(Calendar.HOUR_OF_DAY) < mMinTime) if (eventRect.event.getStartTime().get(Calendar.HOUR_OF_DAY) < mMinTime)
topToUse = mHourHeight * getPassedMinutesInDay(mMinTime, 0) / 60 + getEventsTop(); topToUse = mHourHeight * getPassedMinutesInDay(mMinTime, 0) / 60 + getEventsTop();
if (!mNewEventIdentifier.equals(mEventRects.get(i).event.getIdentifier())) if (!mNewEventIdentifier.equals(eventRect.event.getIdentifier()))
drawEventTitle(mEventRects.get(i).event, mEventRects.get(i).rectF, canvas, topToUse, left); drawEventTitle(eventRect.event, eventRect.rectF, canvas, topToUse, left);
else else
drawEmptyImage(mEventRects.get(i).event, mEventRects.get(i).rectF, canvas, topToUse, left); drawEmptyImage(eventRect.event, eventRect.rectF, canvas, topToUse, left);
} else } else
mEventRects.get(i).rectF = null; eventRect.rectF = null;
} }
} }
} }