From b0aff19ae0cdb44f46a22f433d5c5efd60253aa9 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 23 Mar 2019 21:57:55 +0100 Subject: [PATCH 01/12] hide global map menu entry if necessary --- res/menu/text_secure_normal.xml | 4 +++- src/org/thoughtcrime/securesms/ConversationListActivity.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml index 55acd399e..1d75e1ddc 100644 --- a/res/menu/text_secure_normal.xml +++ b/res/menu/text_secure_normal.xml @@ -17,7 +17,9 @@ android:id="@+id/menu_deaddrop" /> + android:id="@+id/menu_global_map" + android:visible="false" + /> diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 396a88ca4..bf4e69f99 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -92,6 +92,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit menu.clear(); inflater.inflate(R.menu.text_secure_normal, menu); + MenuItem item = menu.findItem(R.id.menu_global_map); + if (Prefs.isLocationStreamingEnabled(this)) { + item.setVisible(true); + } if (!Prefs.isLocationStreamingEnabled(this)) { menu.findItem(R.id.menu_global_map).setVisible(false); From 58c59146bdd49c008d47ed263d22f61464262967 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 24 Mar 2019 23:12:16 +0100 Subject: [PATCH 02/12] implement bottom sheet and a slider for filtering tracks --- res/drawable-hdpi/ic_timeline.png | Bin 0 -> 410 bytes res/drawable-xhdpi/ic_timeline.png | Bin 0 -> 522 bytes res/drawable-xxhdpi/ic_timeline.png | Bin 0 -> 829 bytes res/drawable-xxxhdpi/ic_timeline.png | Bin 0 -> 1079 bytes res/layout/activity_map.xml | 7 +- res/layout/bottom_map_sheet.xml | 79 +++++ res/values/attrs.xml | 15 + res/values/colors.xml | 4 + res/values/dimens.xml | 8 + .../rangeslider/RangeSliderView.java | 275 ++++++++++++++++++ .../components/rangeslider/TextLayer.java | 21 ++ .../components/rangeslider/ThumbLayer.java | 46 +++ .../rangeslider/TimeRangeSlider.java | 83 ++++++ .../components/rangeslider/TrackLayer.java | 48 +++ 14 files changed, 583 insertions(+), 3 deletions(-) create mode 100755 res/drawable-hdpi/ic_timeline.png create mode 100755 res/drawable-xhdpi/ic_timeline.png create mode 100755 res/drawable-xxhdpi/ic_timeline.png create mode 100755 res/drawable-xxxhdpi/ic_timeline.png create mode 100644 res/layout/bottom_map_sheet.xml create mode 100644 src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java create mode 100644 src/org/thoughtcrime/securesms/components/rangeslider/TextLayer.java create mode 100644 src/org/thoughtcrime/securesms/components/rangeslider/ThumbLayer.java create mode 100644 src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java create mode 100644 src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java diff --git a/res/drawable-hdpi/ic_timeline.png b/res/drawable-hdpi/ic_timeline.png new file mode 100755 index 0000000000000000000000000000000000000000..ec39d34d8b0b21ab324876c691e7c380ab763982 GIT binary patch literal 410 zcmV;L0cHM)P)b;@5JjJfWe_(or-Pc)xubCfVEPDAAxHx?5K`J{QTR&Y?BYo=Z%Rwvr@x-ncyS!Z zaU92SoPSB5DLWb(c1-DGOwNYpt~QJ?q{p1*OD*Zy1wN(`HL(kPC50-xz|T_XjG&vq zZ}JUS1YHC^or*kcv06Z02m5~({9mT{)RDq45sY-3D=7digP)K?VIz5Kn}mjMO@(ks%dLm6O57;P3sdUYxTjL;9U-y)n7h^IE#q%xI@$F<1UroN6<_FN z)Bin!yfT5l_+E9;Jo+mt9U-&6j_}0I>hmV2zK$R&fxeEAKwnID9buMJzxwA1>Gj1a z3G{;>(l4^>!?O%9Ba9Y1obpJ`HB+r0`0zi9+i@-n_39vg&!cyovHH+0zvt-{)Yt3s zIqmozr`AvS!lGMP9~$&a?s*2~=QK@@SeDxJ=rQ*kJf`pC_dFB5q$NG)dQDDx_5)v3 z#1k;5^CN!94#70l;eZr7?jMTlLBN(YLB6;I)#6K#OP8R_@CouuoFI2DL3ad3 zpCI=xK|O+!>Jx-ko=>q|^a*m}I)-zCQj;f0m5%Ee_6W+A^y}@{ld(cjy3zz$b?Z4K zFhkej-A`H1ty52*MFMl2WGr z4W`Gw^?f5MTtXp(y34B&MEgDyT6M#GW?k6ZN#_NROc? zDfCR9mQztBCOv*d6|SvUn+-h|eCC0SAAIFK7xtT)nw|tXsi~((M{97U>DloCm(e2i;bD#*j}mgLj{v zZ?{mt6>sQKukT8?;stu3me1Y7t=u%{J^gN>y%n##xKH!9TewI+SKa3@Z@Y!ZdOh|B zrrRw{1$r#j8RciUa5tCDc{@M5g*AQmu`fH6yMJtqQiHJHHnUMm!KNa@zy11m*`k=2}+5OqetucK$Pgaj~;#Z(WCD^TJ+tgV0ldU z*(af3O!q1NPVY~9a7X|E001E9|7%Ye0RR9100000004kV-KFk%;PbsQ00000NkvXX Hu0mjfUc83S literal 0 HcmV?d00001 diff --git a/res/drawable-xxxhdpi/ic_timeline.png b/res/drawable-xxxhdpi/ic_timeline.png new file mode 100755 index 0000000000000000000000000000000000000000..bfe700020b1e369079154694cb12080f438812c6 GIT binary patch literal 1079 zcmV-71jze|P)G0000C2Nkl<$A~WV zXZQitg*ziuKS0&Bs7V)AW15&s+oVAOSpXVU5*J0FW#zafhQ*^(cr#_r{eyECoi}}* zUI;F6gQqmv;fNmJX!C@dOc0y{WhxvXC**(%Wr8y#$HFoBCzr55o--ksq>iM>d!`sV z!5o`N%4{&lPzg$GBc#t3C4!-m&_qs|k0b;`;tn!E?!;U@9A@Yv1EkMo&=Yg@5;9;a zF<0vuqlXNbL&jpR)^Zh5j@;-MZex;NM3G-^^fyT`NgGk5?L_}J zC5-Y&{jp|W{}!_tB}WxeR(2bSte&#{{ai+?CZB#!L&lZ;w1tT`VCYt zO$SMxPu%AP9l9Lym6rY2)AQ-|r>r2Kq5f4$xFSy#8FH%RGt*xT{hA6wzkv!ue+Cuk z^|!t0pU~@1QNhHy>7VqbzlNMcYD{SLhyE2F@R|-?1mP#oSy5LI`cvlv1^%Z%;|wd9 zI+gy$XzOoL08m$uq}NaDRQe0JA~~i0DFA&1)JcHQPhGEHUx8kK=m&rTbwvd_{q@if zkSHq9=}$ucU=mTB5)!;e55rjQDyks%OgI(yiw%Q2& zDJls4lM4OzDyaI?-&W|iRza2gDC_SqmF2e#p?})I_iUlxXa&pO^cNNS?NzW$&YS*K zy?z@ndxd@jFZ+gm1FyS>egi-FuusXHerO?zw0!Ab*XuX-qrctIujL3)q;LO@XO|8y zxX)*k`eEPlJs-s#Pes0z2~F2b9tP?1Co9!{}K=&NHM4;q4qR2c!hO3A@#t34co(Zu}k3THF zMPPNG9@yWf2a0|ACbI;Y?bF{fNs!?_eT>m2_US>wO`g#@woiX-{XYJ`_TZ2J0000$ x(Erz-Faj3<00000000000000000000fB>gYa_-vZOZ@-<002ovPDHLkV1i?x2#Ejy literal 0 HcmV?d00001 diff --git a/res/layout/activity_map.xml b/res/layout/activity_map.xml index c62eab440..b1b8c722b 100644 --- a/res/layout/activity_map.xml +++ b/res/layout/activity_map.xml @@ -1,6 +1,5 @@ - - + + + diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml new file mode 100644 index 000000000..56988d315 --- /dev/null +++ b/res/layout/bottom_map_sheet.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 276753894..977c6a0b8 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -239,4 +239,19 @@ + + + + + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 161564139..5b9673df9 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -50,4 +50,8 @@ #44000000 + #552090ea + #ff2090ea + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 759c9c1ce..8d2a38ef5 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -53,4 +53,12 @@ 2dp + 6dp + 14dp + 4dp + 12sp + 6dp + 100 + 100 + diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java new file mode 100644 index 000000000..43e506c31 --- /dev/null +++ b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java @@ -0,0 +1,275 @@ +package org.thoughtcrime.securesms.components.rangeslider; + +import android.content.Context; +import android.content.res.Resources; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.support.v4.content.ContextCompat; +import android.util.AttributeSet; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; + +import org.thoughtcrime.securesms.R; + +import java.util.ArrayList; + +public class RangeSliderView extends View { + + private static final String TAG = RangeSliderView.class.getName(); + private int trackTintColor; + private int trackHighlightTintColor; + private float trackHeight; + private float thumbRadius; + private float thumbOutlineSize; + private float displayTextFontSize; + private float displayTextBasicOffsetY; + private int sliderPaddingLeft; + private int sliderPaddingRight; + + private ThumbLayer minValueThumb; + private TextLayer minValueDisplayLabel; + + private ThumbLayer maxValueThumb; + private TextLayer maxValueDisplayLabel; + + private TrackLayer track; + + private ArrayList values; + + protected int minValue; + protected int maxValue; + protected int steps; + + private float beginTrackOffsetX; + + private OnValueChangedListener onValueChangedListener; + + public interface OnValueChangedListener { + void onValueChanged(int minValue, int maxValue); + String parseMinValueDisplayText(int minValue); + String parseMaxValueDisplayText(int maxValue); + } + + public RangeSliderView(Context context) { + this(context, null); + } + + public RangeSliderView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public RangeSliderView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + int [] attributes = new int [] {android.R.attr.paddingLeft, + android.R.attr.paddingStart, + android.R.attr.paddingRight, + android.R.attr.paddingEnd}; + + TypedArray arr = context.obtainStyledAttributes(attrs, attributes); + + sliderPaddingLeft = arr.getDimensionPixelOffset(0, + arr.getDimensionPixelOffset(1, -1)); + sliderPaddingRight = arr.getDimensionPixelOffset(2, + arr.getDimensionPixelOffset(3, -1)); + + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RangeSliderView); + trackTintColor = typedArray.getColor( + R.styleable.RangeSliderView_trackTintColor, + ContextCompat.getColor(context, R.color.trackTintColor) + ); + trackHighlightTintColor = typedArray.getColor( + R.styleable.RangeSliderView_trackHighlightTintColor, + ContextCompat.getColor(context, R.color.trackHighlightTintColor) + ); + + Resources resources = context.getResources(); + trackHeight = typedArray.getDimension( + R.styleable.RangeSliderView_trackHeight, + resources.getDimension(R.dimen.slider_trackHeight) + ); + thumbRadius = typedArray.getDimension( + R.styleable.RangeSliderView_thumbRadius, + resources.getDimension(R.dimen.slider_thumbRadius) + ); + thumbOutlineSize = typedArray.getDimension( + R.styleable.RangeSliderView_thumbOutlineSize, + resources.getDimension(R.dimen.slider_thumbOutlineSize) + ); + displayTextFontSize = typedArray.getDimension( + R.styleable.RangeSliderView_displayTextFontSize, + resources.getDimension(R.dimen.slider_displayTextFontSize) + ); + displayTextBasicOffsetY = resources.getDimension(R.dimen.slider_displayTextBasicOffsetY); + minValue = typedArray.getInt( + R.styleable.RangeSliderView_minValue, + 100 + ); + maxValue = typedArray.getInt( + R.styleable.RangeSliderView_maxValue, + 100 + ); + + minValueThumb = new ThumbLayer(thumbRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); + minValueDisplayLabel = new TextLayer(displayTextFontSize, trackHighlightTintColor); + + maxValueThumb = new ThumbLayer(thumbRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); + maxValueDisplayLabel = new TextLayer(displayTextFontSize, trackHighlightTintColor); + + track = new TrackLayer(sliderPaddingLeft, sliderPaddingRight, trackHeight, trackTintColor, trackHighlightTintColor); + + values = new ArrayList<>(); + for (int index = 1; index <= 100; index++) { + values.add(index); + } + } + + public void setOnValueChangedListener(OnValueChangedListener onValueChangedListener) { + this.onValueChangedListener = onValueChangedListener; + invalidate(); + } + + public void setRangeValues(ArrayList values) { + this.values = values; + setMinAndMaxValue(this.values.get(0), this.values.get(this.values.size() - 1)); + } + + public void setMinAndMaxValue(int minValue, int maxValue) { + this.minValue = minValue; + this.maxValue = maxValue; + invalidate(); + + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + float offsetY = getHeight() / 2; + float minValueOffsetX = getPositionFromIndex(minValue); + float maxValueOffsetX = getPositionFromIndex(maxValue); + float displayLabelOffsetY = offsetY - thumbRadius - displayTextBasicOffsetY; + + Log.d(TAG, "onDraw minValueOffsetX: " + minValueOffsetX + ", maxValueOffsetX: " + maxValueOffsetX); + track.draw(canvas, getWidth(), minValueOffsetX, maxValueOffsetX, offsetY - trackHeight / 2); + + minValueThumb.draw(canvas, minValueOffsetX, offsetY); + if (onValueChangedListener != null) { + minValueDisplayLabel.draw( + canvas, + onValueChangedListener.parseMinValueDisplayText(minValue), + minValueOffsetX, + displayLabelOffsetY + ); + } else { + minValueDisplayLabel.draw(canvas, String.valueOf(minValue), minValueOffsetX, displayLabelOffsetY); + } + + maxValueThumb.draw(canvas, maxValueOffsetX, offsetY); + if (onValueChangedListener != null) { + maxValueDisplayLabel.draw( + canvas, + onValueChangedListener.parseMaxValueDisplayText(maxValue), + maxValueOffsetX, + displayLabelOffsetY + ); + } else { + maxValueDisplayLabel.draw(canvas, String.valueOf(maxValue), maxValueOffsetX, displayLabelOffsetY); + } + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (event.getAction() == MotionEvent.ACTION_CANCEL || event.getAction() == MotionEvent.ACTION_UP) { + minValueThumb.isHighlight = false; + maxValueThumb.isHighlight = false; + invalidate(); + return true; + } + + int offsetX = (int) event.getX(); + if (offsetX < sliderPaddingLeft || offsetX > getWidth() - sliderPaddingRight) { + Log.d(TAG, "ignore touch in padding"); + return true; + } + + float radius = getThumbRadius(); + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + float minValuePosition = getPositionFromIndex(minValue); + Log.d(TAG, "action_down minVal: " + minValue + ", " + minValuePosition ); + if (offsetX >= minValuePosition - radius && offsetX <= minValuePosition + radius) { + minValueThumb.isHighlight = true; + } else { + float maxValuePosition = getPositionFromIndex(maxValue); + if (offsetX >= maxValuePosition - radius && offsetX <= maxValuePosition + radius) { + maxValueThumb.isHighlight = true; + } + } + + if (minValueThumb.isHighlight || maxValueThumb.isHighlight) { + beginTrackOffsetX = offsetX; + invalidate(); + } else { + beginTrackOffsetX = -1; + } + break; + case MotionEvent.ACTION_MOVE: + if (minValue == maxValue && beginTrackOffsetX > -1 && offsetX > beginTrackOffsetX && !maxValueThumb.isHighlight) { + minValueThumb.isHighlight = false; + maxValueThumb.isHighlight = true; + } + int count = values.size(); + int index = getIndexFromPosition(offsetX); + Log.d(TAG, "move - index: " + index + ", offsetX: " + offsetX); + if (index < 0) { + index = 0; + } else if (index > count - 1) { + index = count - 1; + } + + if (minValueThumb.isHighlight) { + if (index > values.indexOf(maxValue)) { + minValue = maxValue; + } else { + minValue = values.get(index); + } + } else if (maxValueThumb.isHighlight) { + if (index < values.indexOf(minValue)) { + maxValue = minValue; + } else { + maxValue = values.get(index); + } + } + + if (minValueThumb.isHighlight || maxValueThumb.isHighlight) { + if (onValueChangedListener != null) { + onValueChangedListener.onValueChanged(minValue, maxValue); + } + invalidate(); + } + break; + } + + return true; + } + + protected int getIndexFromPosition(int offsetX) { + int count = values.size(); + return ((offsetX - sliderPaddingLeft) * count / getSliderWidth()); + } + protected float getPositionFromIndex(int value) { + int count = values.size(); + Log.d(TAG, "value: " + value +", position: " + (getSliderWidth() / count) * value + sliderPaddingLeft); + return (getSliderWidth() / count) * value + sliderPaddingLeft; + } + + public int getSliderWidth() { + return getWidth() - sliderPaddingLeft - sliderPaddingRight; + } + + private int getThumbRadius() { + return (int) (thumbRadius + thumbOutlineSize / 2); + } +} diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TextLayer.java b/src/org/thoughtcrime/securesms/components/rangeslider/TextLayer.java new file mode 100644 index 000000000..4f6928aa2 --- /dev/null +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TextLayer.java @@ -0,0 +1,21 @@ +package org.thoughtcrime.securesms.components.rangeslider; + +import android.graphics.Canvas; +import android.graphics.Paint; + +class TextLayer { + + private Paint paint; + + TextLayer(float fontSize, int color) { + paint = new Paint(); + paint.setAntiAlias(true); + paint.setColor(color); + paint.setTextSize(fontSize); + paint.setTextAlign(Paint.Align.CENTER); + } + + void draw(Canvas canvas, String text, float offsetX, float offsetY) { + canvas.drawText(text, offsetX, offsetY, paint); + } +} diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/ThumbLayer.java b/src/org/thoughtcrime/securesms/components/rangeslider/ThumbLayer.java new file mode 100644 index 000000000..da0864971 --- /dev/null +++ b/src/org/thoughtcrime/securesms/components/rangeslider/ThumbLayer.java @@ -0,0 +1,46 @@ +package org.thoughtcrime.securesms.components.rangeslider; + +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; + +class ThumbLayer { + + private float radius; + private float outlineSize; + + private int highlightColor; + + private Paint outlinePaint; + private Paint fillPaint; + + boolean isHighlight = false; + + ThumbLayer(float radius, float outlineSize, int outlineColor, int highlightColor) { + this.radius = radius; + this.outlineSize = outlineSize; + this.highlightColor = highlightColor; + + outlinePaint = new Paint(); + outlinePaint.setAntiAlias(true); + outlinePaint.setColor(outlineColor); + outlinePaint.setStyle(Paint.Style.STROKE); + outlinePaint.setStrokeWidth(outlineSize); + + fillPaint = new Paint(); + fillPaint.setAntiAlias(true); + fillPaint.setStyle(Paint.Style.FILL); + fillPaint.setStrokeWidth(0); + } + + void draw(Canvas canvas, float cx, float cy) { + canvas.drawCircle(cx, cy, radius, outlinePaint); + + if (isHighlight) { + fillPaint.setColor(highlightColor); + } else { + fillPaint.setColor(Color.WHITE); + } + canvas.drawCircle(cx, cy, radius - outlineSize / 2, fillPaint); + } +} diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java new file mode 100644 index 000000000..c5cf0bed5 --- /dev/null +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java @@ -0,0 +1,83 @@ +package org.thoughtcrime.securesms.components.rangeslider; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; + +import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.util.DateUtils; +import org.thoughtcrime.securesms.util.DynamicLanguage; + +import java.util.Locale; + +/** + * Created by cyberta on 24.03.19. + */ + +public class TimeRangeSlider extends RangeSliderView implements RangeSliderView.OnValueChangedListener { + // timeframe in seconds + private static final int DEFAULT_TIMEFRAME_2D = 60 * 60 * 24 * 2; + private static final int DEFAULT_STEPS = 60 * 10; + int timeFrame; + Locale locale; + OnTimestampChangedListener listener; + + + public TimeRangeSlider(Context context) { + this(context, null, 0); + } + + public TimeRangeSlider(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public TimeRangeSlider(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.RangeSliderView); + timeFrame = typedArray.getInt( + R.styleable.TimeRangeSlider_timeFrame, + DEFAULT_TIMEFRAME_2D + ); + + locale = DynamicLanguage.getSelectedLocale(context); + super.setOnValueChangedListener(this); + } + + public interface OnTimestampChangedListener { + void onValueChanged(long startTimestamp, long stopTimestamp); + } + + + public void setOnTimestampChangedListener(OnTimestampChangedListener timestampChangedListener) { + listener = timestampChangedListener; + } + + @Override + public void onValueChanged(int minValue, int maxValue) { + if (listener != null) { + listener.onValueChanged(getTimestampForValue(minValue), getTimestampForValue(maxValue)); + } + } + + @Override + public String parseMinValueDisplayText(int minValue) { + return getStringForValue(minValue); + } + + @Override + public String parseMaxValueDisplayText(int maxValue) { + return getStringForValue(maxValue); + } + + + private String getStringForValue(int value) { + return DateUtils.getExtendedRelativeTimeSpanString(this.getContext(), locale, getTimestampForValue(value)); + } + + private long getTimestampForValue(int value) { + return System.currentTimeMillis() - ((timeFrame / 100) * (100 - value) * 1000); + } + + +} diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java b/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java new file mode 100644 index 000000000..c6781e484 --- /dev/null +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java @@ -0,0 +1,48 @@ +package org.thoughtcrime.securesms.components.rangeslider; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.RectF; + +class TrackLayer { + + private float height; + private float radius; + private int paddingLeft = 0; + private int paddingRight = 0; + + private Paint centerPaint; + private Paint backgoundPaint; + + TrackLayer(int paddingLeft, int paddingRight, float height, int color, int highlightColor) { + this.height = height; + radius = this.height / 2; + + centerPaint = new Paint(); + centerPaint.setAntiAlias(true); + centerPaint.setColor(highlightColor); + centerPaint.setStyle(Paint.Style.FILL); + + backgoundPaint = new Paint(); + backgoundPaint.setAntiAlias(true); + backgoundPaint.setColor(color); + backgoundPaint.setStyle(Paint.Style.FILL); + + this.paddingLeft = paddingLeft; + this.paddingRight = paddingRight; + } + + void draw(Canvas canvas, int width, float offsetLeft, float offsetRight, float offsetY) { + draw(canvas, backgoundPaint, paddingLeft, width - paddingRight, offsetY); + draw(canvas, centerPaint, offsetLeft, offsetRight, offsetY); + } + + void draw(Canvas canvas, Paint paint, float startX, float endX, float offsetY) { + canvas.drawRoundRect( + new RectF(startX, offsetY, endX, offsetY + height), + radius, + radius, + paint + ); + } +} From 869fb5c16b10561c4b374f37dbe4ca810a93cada Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 24 Mar 2019 23:17:56 +0100 Subject: [PATCH 03/12] clean up dead code --- .../securesms/connect/ApplicationDcContext.java | 16 ---------------- .../thoughtcrime/securesms/map/MapActivity.java | 12 ------------ 2 files changed, 28 deletions(-) diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index 60b900d88..fd1912a9e 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -719,20 +719,4 @@ public class ApplicationDcContext extends DcContext { return 0; } - - /*********************************************************************************************** - * core related helper methods - **********************************************************************************************/ - - public int[] getChatIds() { - DcChatlist chats = getChatlist(0, null, 0); - int count = chats.getCnt(); - int[] chatIds = new int[count]; - for (int i = 0; i < count; i++) { - DcChat dcChat = chats.getChat(i); - chatIds[i] = dcChat.getId(); - } - return chatIds; - } - } diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java index a29cbe566..e7711a71a 100644 --- a/src/org/thoughtcrime/securesms/map/MapActivity.java +++ b/src/org/thoughtcrime/securesms/map/MapActivity.java @@ -182,16 +182,4 @@ public class MapActivity extends BaseActivity implements Observer { } } - private int[] getChatIds(Intent intent) { - if (intent == null) { - return new int[]{-1}; - } - - int[] chatIds = intent.getIntArrayExtra(CHAT_IDS); - if (chatIds == null || chatIds.length == 0) { - chatIds = new int[1]; - chatIds[0] = getIntent().getIntExtra(CHAT_ID, -1); - } - return chatIds; - } } From d41323e69efebf2017b4e8ce7b893c0fa364b2a0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Mar 2019 13:21:38 +0100 Subject: [PATCH 04/12] beautify slider element. --- res/layout/bottom_map_sheet.xml | 3 +- .../rangeslider/RangeSliderView.java | 82 ++++++++++++------- .../rangeslider/TimeRangeSlider.java | 55 +++++++++++-- .../components/rangeslider/TrackLayer.java | 21 ++++- .../securesms/util/DateUtils.java | 5 ++ 5 files changed, 126 insertions(+), 40 deletions(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index 56988d315..49b31bda1 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -60,8 +60,7 @@ = sliderPaddingLeft + ) { + minRangeDisplayLabel.draw( + canvas, + getDeltaInTime(getContext()), + minValueOffsetX - getDeltaInPixel(), + displayLabelOffsetBelow + ); + } + + if (maxValueOffsetX + getDeltaInPixel() <= (getWidth() - sliderPaddingRight)) { + maxRangeDisplayLabel.draw( + canvas, + getDeltaInTime(getContext()), + maxValueOffsetX + getDeltaInPixel(), + displayLabelOffsetBelow + ); + } + + } } public interface OnTimestampChangedListener { @@ -62,6 +100,9 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. @Override public String parseMinValueDisplayText(int minValue) { + if (minValue == maxValue) { + return ""; + } return getStringForValue(minValue); } @@ -76,7 +117,11 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. } private long getTimestampForValue(int value) { - return System.currentTimeMillis() - ((timeFrame / 100) * (100 - value) * 1000); + return System.currentTimeMillis() - ((timeFrame / getCount()) * (getCount() - value) * 1000); + } + + public String getDeltaInTime(Context context) { + return DateUtils.getFormattedTimespan(context, (int) (timeFrame * 1000 / getCount() * getDeltaInValues())); } diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java b/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java index c6781e484..391932138 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TrackLayer.java @@ -32,9 +32,26 @@ class TrackLayer { this.paddingRight = paddingRight; } - void draw(Canvas canvas, int width, float offsetLeft, float offsetRight, float offsetY) { + void draw(Canvas canvas, int width, float offsetLeft, float offsetRight, float offsetY, float delta) { draw(canvas, backgoundPaint, paddingLeft, width - paddingRight, offsetY); - draw(canvas, centerPaint, offsetLeft, offsetRight, offsetY); + if (offsetLeft == offsetRight) { + float maxEndX = width - paddingRight; + float minStartX = paddingLeft; + float offsetDeltaLeft = offsetLeft - delta; + float offsetDeltaRight = offsetRight + delta; + + if (offsetLeft - delta < minStartX) { + offsetDeltaLeft = minStartX; + } else if (offsetRight + delta > maxEndX) { + offsetDeltaRight = maxEndX; + } + + draw(canvas, centerPaint, offsetDeltaLeft, offsetDeltaRight, offsetY); + } + else { + draw(canvas, centerPaint, offsetLeft, offsetRight, offsetY); + } + } void draw(Canvas canvas, Paint paint, float startX, float endX, float offsetY) { diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 160f78b69..90662e731 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -175,4 +175,9 @@ public class DateUtils extends android.text.format.DateUtils { TimeUnit.MILLISECONDS.toMinutes(millis), TimeUnit.MILLISECONDS.toSeconds(millis-(TimeUnit.MILLISECONDS.toMinutes(millis)*60000))); } + + public static String getFormattedTimespan(Context c, int timestamp) { + int mins = timestamp / (1000 * 60); + return c.getResources().getQuantityString(R.plurals.n_minutes, mins, mins); + } } From f68853e7ec4889405e2e3de604d21fbe366d3348 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Mar 2019 13:32:55 +0100 Subject: [PATCH 05/12] open bottom sheet with time range slider on icon click --- res/layout/bottom_map_sheet.xml | 2 +- .../securesms/map/MapActivity.java | 29 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index 49b31bda1..bd0801286 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="150dp" android:id="@+id/bottom_sheet" - app:behavior_hideable="false" + app:behavior_hideable="true" app:behavior_peekHeight="35dp" app:layout_behavior="android.support.design.widget.BottomSheetBehavior" android:background="@color/transparent" diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java index e7711a71a..be60fe1e7 100644 --- a/src/org/thoughtcrime/securesms/map/MapActivity.java +++ b/src/org/thoughtcrime/securesms/map/MapActivity.java @@ -3,15 +3,19 @@ package org.thoughtcrime.securesms.map; import android.content.Intent; import android.graphics.PointF; import android.os.Bundle; +import android.support.design.widget.BottomSheetBehavior; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AlertDialog; import android.util.Log; +import android.view.View; +import android.widget.RelativeLayout; import com.b44t.messenger.DcMsg; import com.mapbox.geojson.Feature; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.maps.SupportMapFragment; @@ -20,6 +24,7 @@ import org.thoughtcrime.securesms.BaseActivity; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.ConversationActivity; import org.thoughtcrime.securesms.R; +import org.thoughtcrime.securesms.components.rangeslider.TimeRangeSlider; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.geolocation.DcLocation; @@ -27,6 +32,8 @@ import java.util.List; import java.util.Observable; import java.util.Observer; +import static android.support.design.widget.BottomSheetBehavior.STATE_COLLAPSED; +import static android.support.design.widget.BottomSheetBehavior.STATE_EXPANDED; import static com.b44t.messenger.DcChat.DC_CHAT_NO_CHAT; import static org.thoughtcrime.securesms.map.MapDataManager.MARKER_SELECTED; import static org.thoughtcrime.securesms.map.MapDataManager.MESSAGE_ID; @@ -40,6 +47,7 @@ public class MapActivity extends BaseActivity implements Observer { private DcLocation dcLocation; private MapDataManager mapDataManager; + private MapboxMap mapboxMap; @Override protected void onCreate(Bundle savedInstanceState) { @@ -67,6 +75,7 @@ public class MapActivity extends BaseActivity implements Observer { mapFragment.getMapAsync(mapboxMap -> mapboxMap.setStyle(Style.MAPBOX_STREETS, style -> { + this.mapboxMap = mapboxMap; mapboxMap.setCameraPosition(new CameraPosition.Builder() .target(new LatLng(dcLocation.getLastLocation().getLatitude(), dcLocation.getLastLocation().getLongitude())) .zoom(9) @@ -151,6 +160,25 @@ public class MapActivity extends BaseActivity implements Observer { } })); + TimeRangeSlider timeRangeSlider = this.findViewById(R.id.timeRangeSlider); + timeRangeSlider.setOnTimestampChangedListener(this); + + View bottomSheet = this.findViewById(R.id.bottom_sheet); + BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet); + + + RelativeLayout bottomSheetSlider = this.findViewById(R.id.bottomSheetSlider); + bottomSheetSlider.setOnClickListener(v -> { + switch (behavior.getState()) { + case STATE_EXPANDED: + behavior.setState(STATE_COLLAPSED); + break; + default: + behavior.setState(STATE_EXPANDED); + break; + } + }); + } @Override @@ -181,5 +209,4 @@ public class MapActivity extends BaseActivity implements Observer { //TODO: consider implementing a button -> center map to current location } } - } From 06525bcaf6ce00ec018c9d6ee7861cc29d136ea2 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Mar 2019 13:43:44 +0100 Subject: [PATCH 06/12] replace hard coded string in bottom sheet --- res/layout/bottom_map_sheet.xml | 13 ++----------- res/values/strings.xml | 4 ++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index bd0801286..dc129de1d 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -34,16 +34,12 @@ /> - - - - @@ -52,13 +48,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="Show location traces in time frame" + android:text="@string/filter_map_on_time" android:paddingTop="8dp" android:background="@color/white" android:textColor="@android:color/black" /> - - - - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 3c8dfe476..a0986a0e3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -219,6 +219,10 @@ Contact request No contact requests.\n\nIf you want classic emails to appear here as contact requests, you can change the corresponding setting in the app settings. + + Show location traces in time frame + + Search Search for chats, contacts, and messages From dfd8d67480becde803ea99a15b1ebf7d93ccf65f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Mar 2019 15:02:27 +0100 Subject: [PATCH 07/12] if slider has max position, show 'Last Position', implement longpress for moving both thumb views, initial filter implementation --- res/values/strings.xml | 1 + .../rangeslider/RangeSliderView.java | 42 +++++++++++++++---- .../rangeslider/TimeRangeSlider.java | 3 ++ .../securesms/map/MapActivity.java | 24 ++++++++++- .../securesms/map/MapDataManager.java | 20 ++++++++- 5 files changed, 80 insertions(+), 10 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index a0986a0e3..67860c29a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -221,6 +221,7 @@ Show location traces in time frame + Last position diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java index 5dfacf477..8e361e55b 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java @@ -7,6 +7,7 @@ import android.graphics.Canvas; import android.support.v4.content.ContextCompat; import android.util.AttributeSet; import android.util.Log; +import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; @@ -43,8 +44,11 @@ public class RangeSliderView extends View { protected float delta; private float beginTrackOffsetX; + private boolean isThumbViewLocked; private OnValueChangedListener onValueChangedListener; + GestureDetector longPressDetector; + public interface OnValueChangedListener { void onValueChanged(int minValue, int maxValue); @@ -125,6 +129,17 @@ public class RangeSliderView extends View { values.add(index); } delta = 0; + + longPressDetector = new GestureDetector(new GestureDetector.SimpleOnGestureListener() { + public void onLongPress(MotionEvent e) { + if (minValue == maxValue && (minValueThumb.isHighlight || maxValueThumb.isHighlight)) { + isThumbViewLocked = true; + minValueThumb.isHighlight = true; + maxValueThumb.isHighlight = true; + invalidate(); + } + } + }); } void setOnValueChangedListener(OnValueChangedListener onValueChangedListener) { @@ -183,21 +198,28 @@ public class RangeSliderView extends View { @Override public boolean onTouchEvent(MotionEvent event) { + longPressDetector.onTouchEvent(event); + if (event.getAction() == MotionEvent.ACTION_CANCEL) { minValueThumb.isHighlight = false; maxValueThumb.isHighlight = false; + isThumbViewLocked = false; invalidate(); return true; } - if (event.getAction() == MotionEvent.ACTION_UP && (minValueThumb.isHighlight || maxValueThumb.isHighlight)) { - if (onValueChangedListener != null) { - onValueChangedListener.onValueChanged(minValue, maxValue); + + if (event.getAction() == MotionEvent.ACTION_UP) { + isThumbViewLocked = false; + if (minValueThumb.isHighlight || maxValueThumb.isHighlight) { + if (onValueChangedListener != null) { + onValueChangedListener.onValueChanged(minValue, maxValue); + } + minValueThumb.isHighlight = false; + maxValueThumb.isHighlight = false; + invalidate(); + return true; } - minValueThumb.isHighlight = false; - maxValueThumb.isHighlight = false; - invalidate(); - return true; } int offsetX = (int) event.getX(); @@ -232,6 +254,7 @@ public class RangeSliderView extends View { minValueThumb.isHighlight = false; maxValueThumb.isHighlight = true; } + int count = values.size(); int index = getIndexFromPosition(offsetX); Log.d(TAG, "move - index: " + index + ", offsetX: " + offsetX); @@ -241,7 +264,10 @@ public class RangeSliderView extends View { index = count - 1; } - if (minValueThumb.isHighlight) { + if (isThumbViewLocked) { + minValue = values.get(index); + maxValue = values.get(index); + } else if (minValueThumb.isHighlight) { if (index > values.indexOf(maxValue)) { minValue = maxValue; } else { diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java index e4ea2ed40..4a27b0429 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java @@ -108,6 +108,9 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. @Override public String parseMaxValueDisplayText(int maxValue) { + if (minValue == maxValue && maxValue == getCount()) { + return getContext().getResources().getString(R.string.filter_last_position); + } return getStringForValue(maxValue); } diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java index be60fe1e7..a1ab7ffb0 100644 --- a/src/org/thoughtcrime/securesms/map/MapActivity.java +++ b/src/org/thoughtcrime/securesms/map/MapActivity.java @@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.map; import android.content.Intent; import android.graphics.PointF; import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.design.widget.BottomSheetBehavior; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AlertDialog; @@ -13,8 +15,11 @@ import android.widget.RelativeLayout; import com.b44t.messenger.DcMsg; import com.mapbox.geojson.Feature; import com.mapbox.mapboxsdk.camera.CameraPosition; +import com.mapbox.mapboxsdk.camera.CameraUpdate; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; +import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException; import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.maps.SupportMapFragment; @@ -34,11 +39,12 @@ import java.util.Observer; import static android.support.design.widget.BottomSheetBehavior.STATE_COLLAPSED; import static android.support.design.widget.BottomSheetBehavior.STATE_EXPANDED; +import static android.support.design.widget.BottomSheetBehavior.STATE_HIDDEN; import static com.b44t.messenger.DcChat.DC_CHAT_NO_CHAT; import static org.thoughtcrime.securesms.map.MapDataManager.MARKER_SELECTED; import static org.thoughtcrime.securesms.map.MapDataManager.MESSAGE_ID; -public class MapActivity extends BaseActivity implements Observer { +public class MapActivity extends BaseActivity implements Observer, TimeRangeSlider.OnTimestampChangedListener { public static final String TAG = MapActivity.class.getSimpleName(); public static final String CHAT_ID = "chat_id"; @@ -209,4 +215,20 @@ public class MapActivity extends BaseActivity implements Observer { //TODO: consider implementing a button -> center map to current location } } + + @Override + public void onValueChanged(long startTimestamp, long stopTimestamp) { + if (this.mapboxMap == null) { + return; + } + LatLngBounds.Builder boundingBuilder = new LatLngBounds.Builder(); + mapDataManager.filter(startTimestamp, stopTimestamp, boundingBuilder); + try { + mapboxMap.easeCamera( + CameraUpdateFactory.newLatLngBounds(boundingBuilder.build(), 50, 50, 50, 200), + 500); + } catch (InvalidLatLngBoundsException e) { + e.printStackTrace(); + } + } } diff --git a/src/org/thoughtcrime/securesms/map/MapDataManager.java b/src/org/thoughtcrime/securesms/map/MapDataManager.java index 2cf377ea6..2a7596725 100644 --- a/src/org/thoughtcrime/securesms/map/MapDataManager.java +++ b/src/org/thoughtcrime/securesms/map/MapDataManager.java @@ -204,12 +204,24 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn } } + public void filter(long startTimestamp, long endTimestamp, LatLngBounds.Builder builder) { + int[] contactIds = getContactIds(chatId); + for (int contactId : contactIds) { + resetSource(chatId); + updateSource(chatId, contactId, startTimestamp, endTimestamp, builder); + } + } + private void updateSource(int chatId, int contactId) { updateSource(chatId, contactId, null); } private void updateSource(int chatId, int contactId, LatLngBounds.Builder boundingBuilder) { - DcArray locations = dcContext.getLocations(chatId, contactId, System.currentTimeMillis() - TIMEOUT, TIMESTAMP_NOW); + updateSource(chatId, contactId, System.currentTimeMillis() - TIMEOUT, TIMESTAMP_NOW, boundingBuilder ); + } + + private void updateSource(int chatId, int contactId, long startTimestamp, long endTimestamp, LatLngBounds.Builder boundingBuilder) { + DcArray locations = dcContext.getLocations(chatId, contactId, startTimestamp, endTimestamp); MapSource contactMapMetadata = contactMapSources.get(contactId); if (contactMapMetadata == null) { contactMapMetadata = addContactMapSource(contactId); @@ -405,6 +417,12 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn } } + private void resetSource(int contactId) { + MapSource contactMapMetadata = contactMapSources.get(contactId); + if (contactMapMetadata != null) { + featureCollections.put(contactMapMetadata.getMarkerFeatureCollection(), new FeatureTreeSet()); + } + } private void replaceSelectedMarker(String featureId) { Feature feature = getFeatureWithId(featureId); From f57b72d0726c31b0ece134cf8c420d2da0421274 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 25 Mar 2019 15:15:03 +0100 Subject: [PATCH 08/12] avoid IllegalStateExceptions but show an error in the logs if chat id is 0 of a message linked to a marker --- src/org/thoughtcrime/securesms/map/MapActivity.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java index a1ab7ffb0..c3396f76b 100644 --- a/src/org/thoughtcrime/securesms/map/MapActivity.java +++ b/src/org/thoughtcrime/securesms/map/MapActivity.java @@ -141,6 +141,11 @@ public class MapActivity extends BaseActivity implements Observer, TimeRangeSlid } } + if (chatId == 0) { + Log.e(TAG, "Chat id is 0. Cannot open chat"); + return true; + } + Intent intent = new Intent(MapActivity.this, ConversationActivity.class); intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, chatId); intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, 0); From 37974f2ce8f1595124200246ec0a1d63e352abdd Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 26 Mar 2019 16:05:11 +0100 Subject: [PATCH 09/12] implement filtering, move time label above the slider, minor performance optimizations --- res/layout/bottom_map_sheet.xml | 5 +- res/values/dimens.xml | 2 +- .../rangeslider/RangeSliderView.java | 33 +++++---- .../rangeslider/TimeRangeSlider.java | 32 +++++++-- .../securesms/map/GenerateInfoWindowTask.java | 2 +- .../securesms/map/MapActivity.java | 27 +++---- .../securesms/map/MapDataManager.java | 71 ++++++++++++++++--- 7 files changed, 122 insertions(+), 50 deletions(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index dc129de1d..c3ffe21b4 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="150dp" + android:layout_height="165dp" android:id="@+id/bottom_sheet" app:behavior_hideable="true" app:behavior_peekHeight="35dp" @@ -50,12 +50,13 @@ android:gravity="center" android:text="@string/filter_map_on_time" android:paddingTop="8dp" + android:paddingBottom="8dp" android:background="@color/white" android:textColor="@android:color/black" /> 14dp 4dp 12sp - 6dp + 8dp 100 100 diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java index 8e361e55b..ccd5d591e 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java @@ -43,6 +43,11 @@ public class RangeSliderView extends View { protected int maxValue; protected float delta; + protected float offsetY; + protected float maxValueDisplayLabelOffsetY; + protected float minValueDisplayLabelOffsetY; + protected float trackOffsetY; + private float beginTrackOffsetX; private boolean isThumbViewLocked; @@ -159,19 +164,22 @@ public class RangeSliderView extends View { } + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + this.offsetY = getHeight() / 5 * 3; + maxValueDisplayLabelOffsetY = offsetY - thumbRadius - thumbOutlineSize - trackHeight / 2 - displayTextBasicOffsetY - displayTextFontSize; + minValueDisplayLabelOffsetY = maxValueDisplayLabelOffsetY + displayTextFontSize + displayTextFontSize / 2; + trackOffsetY = offsetY - trackHeight / 2; + } + @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - float offsetY = getHeight() / 2; float minValueOffsetX = getPositionFromIndex(minValue); float maxValueOffsetX = getPositionFromIndex(maxValue); - float displayLabelOffsetAbove = offsetY - thumbRadius - displayTextBasicOffsetY; - float displayLabelOffsetBelow = offsetY + thumbRadius + thumbOutlineSize + displayTextFontSize; - - Log.d(TAG, "onDraw minValueOffsetX: " + minValueOffsetX + ", maxValueOffsetX: " + maxValueOffsetX); - track.draw(canvas, getWidth(), minValueOffsetX, maxValueOffsetX, offsetY - trackHeight / 2, getDeltaInPixel()); - + track.draw(canvas, getWidth(), minValueOffsetX, maxValueOffsetX, trackOffsetY, getDeltaInPixel()); minValueThumb.draw(canvas, minValueOffsetX, offsetY); maxValueThumb.draw(canvas, maxValueOffsetX, offsetY); @@ -180,19 +188,17 @@ public class RangeSliderView extends View { canvas, onValueChangedListener.parseMinValueDisplayText(minValue), minValueOffsetX, - displayLabelOffsetBelow + minValueDisplayLabelOffsetY ); maxValueDisplayLabel.draw( canvas, onValueChangedListener.parseMaxValueDisplayText(maxValue), maxValueOffsetX, - displayLabelOffsetAbove + maxValueDisplayLabelOffsetY ); - - } else { - minValueDisplayLabel.draw(canvas, String.valueOf(minValue), minValueOffsetX, displayLabelOffsetBelow); - maxValueDisplayLabel.draw(canvas, String.valueOf(maxValue), maxValueOffsetX, displayLabelOffsetAbove); + minValueDisplayLabel.draw(canvas, String.valueOf(minValue), minValueOffsetX, minValueDisplayLabelOffsetY); + maxValueDisplayLabel.draw(canvas, String.valueOf(maxValue), maxValueOffsetX, maxValueDisplayLabelOffsetY); } } @@ -208,7 +214,6 @@ public class RangeSliderView extends View { return true; } - if (event.getAction() == MotionEvent.ACTION_UP) { isThumbViewLocked = false; if (minValueThumb.isHighlight || maxValueThumb.isHighlight) { diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java index 4a27b0429..cd2896af5 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java @@ -25,6 +25,8 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. private TextLayer minRangeDisplayLabel; private TextLayer maxRangeDisplayLabel; + float displayLabelOffsetBelow; + public TimeRangeSlider(Context context) { this(context, null, 0); @@ -50,14 +52,18 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. delta = DEFAULT_DELTA / (timeFrame * 1000) * getCount(); } + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + displayLabelOffsetBelow = offsetY + thumbRadius + thumbOutlineSize + trackHeight / 2 + displayTextBasicOffsetY; + } + @Override protected void onDraw(Canvas canvas) { super.onDraw(canvas); - float offsetY = getHeight() / 2; float minValueOffsetX = getPositionFromIndex(minValue); float maxValueOffsetX = getPositionFromIndex(maxValue); - float displayLabelOffsetBelow = offsetY + thumbRadius + thumbOutlineSize + displayTextFontSize; if (minValue == maxValue) { if (minValueOffsetX - getDeltaInPixel() >= sliderPaddingLeft @@ -83,7 +89,13 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. } public interface OnTimestampChangedListener { - void onValueChanged(long startTimestamp, long stopTimestamp); + void onTimestampChanged(long startTimestamp, long stopTimestamp); + + /** + * filter for lastPosition beginning from startTimestamp to now + * @param startTimestamp begin of time frame + */ + void onFilterLastPosition(long startTimestamp); } @@ -94,7 +106,19 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. @Override public void onValueChanged(int minValue, int maxValue) { if (listener != null) { - listener.onValueChanged(getTimestampForValue(minValue), getTimestampForValue(maxValue)); + long minTimeStamp = getTimestampForValue(minValue); + if (minValue == maxValue) { + if (minValue == getCount()) { + // filter last location + listener.onFilterLastPosition(System.currentTimeMillis() - (long) DEFAULT_DELTA); + } else { + // filter for time of event with delta before and after + listener.onTimestampChanged(minTimeStamp - (long) DEFAULT_DELTA, minTimeStamp + (long) DEFAULT_DELTA); + } + } else { + //filter for time span + listener.onTimestampChanged(minTimeStamp, getTimestampForValue(maxValue)); + } } } diff --git a/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java b/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java index 6f3699d9c..6d584690b 100644 --- a/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java +++ b/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java @@ -116,7 +116,7 @@ public class GenerateInfoWindowTask extends AsyncTask, HashMa String id = feature.getStringProperty(INFO_WINDOW_ID); imagesMap.put(id, bitmap); - if (i % 10 == 0) { + if (i % 20 == 0) { publishProgress(new HashMap<>(imagesMap)); imagesMap.clear(); } diff --git a/src/org/thoughtcrime/securesms/map/MapActivity.java b/src/org/thoughtcrime/securesms/map/MapActivity.java index c3396f76b..b562be297 100644 --- a/src/org/thoughtcrime/securesms/map/MapActivity.java +++ b/src/org/thoughtcrime/securesms/map/MapActivity.java @@ -3,8 +3,6 @@ package org.thoughtcrime.securesms.map; import android.content.Intent; import android.graphics.PointF; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.design.widget.BottomSheetBehavior; import android.support.v4.app.FragmentTransaction; import android.support.v7.app.AlertDialog; @@ -15,11 +13,8 @@ import android.widget.RelativeLayout; import com.b44t.messenger.DcMsg; import com.mapbox.geojson.Feature; import com.mapbox.mapboxsdk.camera.CameraPosition; -import com.mapbox.mapboxsdk.camera.CameraUpdate; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; -import com.mapbox.mapboxsdk.exceptions.InvalidLatLngBoundsException; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.geometry.LatLngBounds; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.maps.SupportMapFragment; @@ -39,7 +34,6 @@ import java.util.Observer; import static android.support.design.widget.BottomSheetBehavior.STATE_COLLAPSED; import static android.support.design.widget.BottomSheetBehavior.STATE_EXPANDED; -import static android.support.design.widget.BottomSheetBehavior.STATE_HIDDEN; import static com.b44t.messenger.DcChat.DC_CHAT_NO_CHAT; import static org.thoughtcrime.securesms.map.MapDataManager.MARKER_SELECTED; import static org.thoughtcrime.securesms.map.MapDataManager.MESSAGE_ID; @@ -95,6 +89,7 @@ public class MapActivity extends BaseActivity implements Observer, TimeRangeSlid } mapDataManager = new MapDataManager(this, mapBoxStyle, chatId, (latLngBounds) -> { + Log.d(TAG, "on Data initialized"); mapboxMap.easeCamera(CameraUpdateFactory.newLatLngBounds(latLngBounds, 50), 1000); }); @@ -145,7 +140,7 @@ public class MapActivity extends BaseActivity implements Observer, TimeRangeSlid Log.e(TAG, "Chat id is 0. Cannot open chat"); return true; } - + Intent intent = new Intent(MapActivity.this, ConversationActivity.class); intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, chatId); intent.putExtra(ConversationActivity.LAST_SEEN_EXTRA, 0); @@ -222,18 +217,16 @@ public class MapActivity extends BaseActivity implements Observer, TimeRangeSlid } @Override - public void onValueChanged(long startTimestamp, long stopTimestamp) { + public void onTimestampChanged(long startTimestamp, long stopTimestamp) { if (this.mapboxMap == null) { return; } - LatLngBounds.Builder boundingBuilder = new LatLngBounds.Builder(); - mapDataManager.filter(startTimestamp, stopTimestamp, boundingBuilder); - try { - mapboxMap.easeCamera( - CameraUpdateFactory.newLatLngBounds(boundingBuilder.build(), 50, 50, 50, 200), - 500); - } catch (InvalidLatLngBoundsException e) { - e.printStackTrace(); - } + mapDataManager.filter(startTimestamp, stopTimestamp); + + } + + @Override + public void onFilterLastPosition(long startTimestamp) { + mapDataManager.filterLastPositions(startTimestamp); } } diff --git a/src/org/thoughtcrime/securesms/map/MapDataManager.java b/src/org/thoughtcrime/securesms/map/MapDataManager.java index 2a7596725..bdbedfb1b 100644 --- a/src/org/thoughtcrime/securesms/map/MapDataManager.java +++ b/src/org/thoughtcrime/securesms/map/MapDataManager.java @@ -46,9 +46,13 @@ import java.util.Map; import static com.b44t.messenger.DcContext.DC_EVENT_LOCATION_CHANGED; import static com.b44t.messenger.DcContext.DC_GCL_ADD_SELF; +import static com.mapbox.mapboxsdk.style.expressions.Expression.all; import static com.mapbox.mapboxsdk.style.expressions.Expression.eq; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; +import static com.mapbox.mapboxsdk.style.expressions.Expression.gt; +import static com.mapbox.mapboxsdk.style.expressions.Expression.gte; import static com.mapbox.mapboxsdk.style.expressions.Expression.literal; +import static com.mapbox.mapboxsdk.style.expressions.Expression.lte; import static com.mapbox.mapboxsdk.style.expressions.Expression.switchCase; import static com.mapbox.mapboxsdk.style.expressions.Expression.toBool; import static com.mapbox.mapboxsdk.style.layers.Property.ICON_ANCHOR_BOTTOM_LEFT; @@ -73,6 +77,8 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn public static final int ALL_CHATS_GLOBAL_MAP = 0; public static final long TIMESTAMP_NOW = 0L; public static final long TIMEOUT = 3 * 60 * 60 * 1000; + private static final long DEFAULT_LAST_POSITION_DELTA = 1000*60*30; // 30 min + private static final String TAG = MapDataManager.class.getSimpleName(); private Style mapboxStyle; private HashMap contactMapSources; @@ -98,9 +104,11 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn int[] contactIds = getContactIds(chatId); + long now = System.currentTimeMillis(); for (int contactId : contactIds) { updateSource(chatId, contactId, boundingBuilder); generateInfoWindows(contactId); + filterLastPosition(contactId, now - DEFAULT_LAST_POSITION_DELTA); } dcContext.eventCenter.addObserver(DC_EVENT_LOCATION_CHANGED, this); @@ -204,14 +212,39 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn } } - public void filter(long startTimestamp, long endTimestamp, LatLngBounds.Builder builder) { + + public void filter(long startTimestamp, long endTimestamp) { int[] contactIds = getContactIds(chatId); for (int contactId : contactIds) { - resetSource(chatId); - updateSource(chatId, contactId, startTimestamp, endTimestamp, builder); + MapSource contactMapMetadata = contactMapSources.get(contactId); + SymbolLayer markerLayer = (SymbolLayer) mapboxStyle.getLayer(contactMapMetadata.getMarkerLayer()); + Expression filter = all( + lte(get(TIMESTAMP), endTimestamp), + gte(get(TIMESTAMP), startTimestamp)); + markerLayer.withFilter(filter); + LineLayer lineLayer = (LineLayer) mapboxStyle.getLayer(contactMapMetadata.getLineLayer()); + lineLayer.withFilter(filter); } } + public void filterLastPositions(long startTimestamp) { + int[] contactIds = getContactIds(chatId); + for (int contactId : contactIds) { + filterLastPosition(contactId, startTimestamp); + } + } + + private void filterLastPosition(int contactId, long startTimestamp) { + MapSource contactMapMetadata = contactMapSources.get(contactId); + SymbolLayer markerLayer = (SymbolLayer) mapboxStyle.getLayer(contactMapMetadata.getMarkerLayer()); + Expression filter = all( + eq((get(LAST_LOCATION)), literal(true)), + gte(get(TIMESTAMP), startTimestamp)); + markerLayer.withFilter(filter); + LineLayer lineLayer = (LineLayer) mapboxStyle.getLayer(contactMapMetadata.getLineLayer()); + lineLayer.withFilter(filter); + } + private void updateSource(int chatId, int contactId) { updateSource(chatId, contactId, null); } @@ -221,6 +254,7 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn } private void updateSource(int chatId, int contactId, long startTimestamp, long endTimestamp, LatLngBounds.Builder boundingBuilder) { + //long start = System.currentTimeMillis(); DcArray locations = dcContext.getLocations(chatId, contactId, startTimestamp, endTimestamp); MapSource contactMapMetadata = contactMapSources.get(contactId); if (contactMapMetadata == null) { @@ -254,10 +288,21 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn sortedPointFeatures.first().getFeature().addBooleanProperty(LAST_LOCATION, true); } - FeatureCollection pointFeatureCollection = FeatureCollection.fromFeatures(sortedPointFeatures.getFeatureList()); - FeatureCollection lineFeatureCollection = FeatureCollection.fromFeatures(new Feature[] {Feature.fromGeometry( - LineString.fromLngLats(sortedPointFeatures.getPointList()) - )}); + ArrayList sortedPointList = sortedPointFeatures.getPointList(); + ArrayList sortedFeatureList = sortedPointFeatures.getFeatureList(); + FeatureCollection pointFeatureCollection = FeatureCollection.fromFeatures(sortedFeatureList); + ArrayList lineFeatures = new ArrayList<>(); + + for (int i = 0; i < sortedPointFeatures.size() - 1; i++) { + Feature f = sortedFeatureList.get(i); + Number numberProperty = f.getNumberProperty(TIMESTAMP); + LineString l = LineString.fromLngLats(sortedPointList.subList(i, i+2)); + Feature lineFeature = Feature.fromGeometry(l, new JsonObject(), "l_" + f.id()); + lineFeature.addNumberProperty(TIMESTAMP, numberProperty); + lineFeatures.add(lineFeature); + } + + FeatureCollection lineFeatureCollection = FeatureCollection.fromFeatures(lineFeatures); GeoJsonSource lineSource = (GeoJsonSource) mapboxStyle.getSource(contactMapMetadata.getLineSource()); lineSource.setGeoJson(lineFeatureCollection); @@ -266,6 +311,8 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn featureCollections.put(contactMapMetadata.getMarkerFeatureCollection(), sortedPointFeatures); generateMissingInfoWindows(contactId); + + //Log.d(TAG, "update Source took " + (System.currentTimeMillis() - start) + " ms"); } private void generateMissingInfoWindows(int contactId) { @@ -293,7 +340,9 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn private void generateInfoWindows(int contactId) { MapSource contactMapMetadata = contactMapSources.get(contactId); FeatureTreeSet collection = featureCollections.get(contactMapMetadata.getMarkerFeatureCollection()); - new GenerateInfoWindowTask(this, contactId).execute(collection.getFeatureList()); + if (collection.size() > 0) { + new GenerateInfoWindowTask(this, contactId).execute(collection.getFeatureList()); + } } private void initGeoJsonSources(MapSource source) { @@ -340,12 +389,10 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn switchCase(toBool(get(LAST_LOCATION)), literal(1.0f), switchCase(eq(get(MESSAGE_ID), literal(0)), literal(0.7f), literal(1.1f)))); Expression markerIcon = switchCase(toBool(get(LAST_LOCATION)), literal(source.getMarkerLastPositon()), literal(source.getMarkerIcon())); - Expression allowOverlap = eq(get(LAST_LOCATION), literal(true)); mapboxStyle.addLayer(new SymbolLayer(source.getMarkerLayer(), source.getMarkerSource()) .withProperties( iconImage(markerIcon), - iconSize(markerSize), - iconAllowOverlap(allowOverlap)) + iconSize(markerSize)) ); mapboxStyle.addLayer(new LineLayer(source.getLineLayer(), source.getLineSource()) @@ -421,6 +468,8 @@ public class MapDataManager implements DcEventCenter.DcEventDelegate, GenerateIn MapSource contactMapMetadata = contactMapSources.get(contactId); if (contactMapMetadata != null) { featureCollections.put(contactMapMetadata.getMarkerFeatureCollection(), new FeatureTreeSet()); + GeoJsonSource pointSource = (GeoJsonSource) mapboxStyle.getSource(contactMapMetadata.getMarkerSource()); + pointSource.setGeoJson(FeatureCollection.fromFeatures(new ArrayList<>())); } } From 1b43a3fe3f35d6cf5c007f14fb6dd149a722d3de Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 26 Mar 2019 16:12:14 +0100 Subject: [PATCH 10/12] map bottom should not be hidable --- res/layout/bottom_map_sheet.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index c3ffe21b4..62704915d 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="165dp" android:id="@+id/bottom_sheet" - app:behavior_hideable="true" + app:behavior_hideable="false" app:behavior_peekHeight="35dp" app:layout_behavior="android.support.design.widget.BottomSheetBehavior" android:background="@color/transparent" From 97c47153ec568d361048f1f2e99f50d5e0ad583c Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 26 Mar 2019 18:30:38 +0100 Subject: [PATCH 11/12] fix rounding issue in slider, some more minor performance improvements --- res/layout/bottom_map_sheet.xml | 4 +- .../rangeslider/RangeSliderView.java | 38 +++++++++---------- .../rangeslider/TimeRangeSlider.java | 5 +-- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/res/layout/bottom_map_sheet.xml b/res/layout/bottom_map_sheet.xml index 62704915d..ab7a194c2 100644 --- a/res/layout/bottom_map_sheet.xml +++ b/res/layout/bottom_map_sheet.xml @@ -60,8 +60,8 @@ android:paddingStart="32dp" android:paddingEnd="32dp" - android:paddingLeft="32dp" - android:paddingRight="32dp" + android:paddingLeft="40dp" + android:paddingRight="40dp" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java index ccd5d591e..35a0660a5 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java @@ -22,7 +22,7 @@ public class RangeSliderView extends View { protected int trackTintColor; protected int trackHighlightTintColor; protected float trackHeight; - protected float thumbRadius; + protected float thumbInnerRadius; protected float thumbOutlineSize; protected float displayTextFontSize; protected float displayTextBasicOffsetY; @@ -47,6 +47,8 @@ public class RangeSliderView extends View { protected float maxValueDisplayLabelOffsetY; protected float minValueDisplayLabelOffsetY; protected float trackOffsetY; + protected float thumbRadius; + protected float sliderWidth; private float beginTrackOffsetX; private boolean isThumbViewLocked; @@ -99,7 +101,7 @@ public class RangeSliderView extends View { R.styleable.RangeSliderView_trackHeight, resources.getDimension(R.dimen.slider_trackHeight) ); - thumbRadius = typedArray.getDimension( + thumbInnerRadius = typedArray.getDimension( R.styleable.RangeSliderView_thumbRadius, resources.getDimension(R.dimen.slider_thumbRadius) ); @@ -121,10 +123,10 @@ public class RangeSliderView extends View { 100 ); - minValueThumb = new ThumbLayer(thumbRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); + minValueThumb = new ThumbLayer(thumbInnerRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); minValueDisplayLabel = new TextLayer(displayTextFontSize, trackHighlightTintColor); - maxValueThumb = new ThumbLayer(thumbRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); + maxValueThumb = new ThumbLayer(thumbInnerRadius, thumbOutlineSize, trackHighlightTintColor, trackTintColor); maxValueDisplayLabel = new TextLayer(displayTextFontSize, trackHighlightTintColor); track = new TrackLayer(sliderPaddingLeft, sliderPaddingRight, trackHeight, trackTintColor, trackHighlightTintColor); @@ -168,9 +170,11 @@ public class RangeSliderView extends View { protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); this.offsetY = getHeight() / 5 * 3; - maxValueDisplayLabelOffsetY = offsetY - thumbRadius - thumbOutlineSize - trackHeight / 2 - displayTextBasicOffsetY - displayTextFontSize; + maxValueDisplayLabelOffsetY = offsetY - thumbInnerRadius - thumbOutlineSize - trackHeight / 2 - displayTextBasicOffsetY - displayTextFontSize; minValueDisplayLabelOffsetY = maxValueDisplayLabelOffsetY + displayTextFontSize + displayTextFontSize / 2; trackOffsetY = offsetY - trackHeight / 2; + sliderWidth = getWidth() - sliderPaddingLeft - sliderPaddingRight; + thumbRadius = thumbInnerRadius + thumbOutlineSize / 2; } @Override @@ -228,21 +232,20 @@ public class RangeSliderView extends View { } int offsetX = (int) event.getX(); - if (offsetX < sliderPaddingLeft || offsetX > getWidth() - sliderPaddingRight) { - Log.d(TAG, "ignore touch in padding"); + if (offsetX < (sliderPaddingLeft - (thumbRadius / 2)) || offsetX > getWidth() - sliderPaddingRight + (thumbRadius / 2)) { + //Log.d(TAG, "ignore touch in padding"); return true; } - float radius = getThumbRadius(); switch (event.getAction()) { case MotionEvent.ACTION_DOWN: float minValuePosition = getPositionFromIndex(minValue); Log.d(TAG, "action_down minVal: " + minValue + ", " + minValuePosition ); - if (offsetX >= minValuePosition - radius && offsetX <= minValuePosition + radius) { + if (offsetX >= minValuePosition - thumbRadius && offsetX <= minValuePosition + thumbRadius) { minValueThumb.isHighlight = true; } else { float maxValuePosition = getPositionFromIndex(maxValue); - if (offsetX >= maxValuePosition - radius && offsetX <= maxValuePosition + radius) { + if (offsetX >= maxValuePosition - thumbRadius && offsetX <= maxValuePosition + thumbRadius) { maxValueThumb.isHighlight = true; } } @@ -296,16 +299,16 @@ public class RangeSliderView extends View { } protected int getIndexFromPosition(int offsetX) { - return ((offsetX - sliderPaddingLeft) * getCount() / getSliderWidth()); + return (int) (((offsetX - sliderPaddingLeft) * getCount()) / sliderWidth); } + protected float getPositionFromIndex(int value) { - Log.d(TAG, "value: " + value +", position: " + (getSliderWidth() / getCount()) * value + sliderPaddingLeft); - return (getSliderWidth() / getCount()) * value + sliderPaddingLeft; + return ((sliderWidth / (float) getCount()) * value) + sliderPaddingLeft; } public float getDeltaInPixel() { // '* 2' is just an offset factor to increase the visibility - return (getSliderWidth() / getCount()) * delta + (2 * thumbRadius + thumbOutlineSize); + return (sliderWidth / getCount()) * delta + (2 * thumbInnerRadius + thumbOutlineSize); } public float getDeltaInValues() { @@ -316,11 +319,4 @@ public class RangeSliderView extends View { return values.size(); } - public int getSliderWidth() { - return getWidth() - sliderPaddingLeft - sliderPaddingRight; - } - - private int getThumbRadius() { - return (int) (thumbRadius + thumbOutlineSize / 2); - } } diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java index cd2896af5..311701f28 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/TimeRangeSlider.java @@ -55,7 +55,7 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { super.onSizeChanged(w, h, oldw, oldh); - displayLabelOffsetBelow = offsetY + thumbRadius + thumbOutlineSize + trackHeight / 2 + displayTextBasicOffsetY; + displayLabelOffsetBelow = offsetY + thumbInnerRadius + thumbOutlineSize + trackHeight / 2 + displayTextBasicOffsetY; } @Override @@ -66,8 +66,7 @@ public class TimeRangeSlider extends RangeSliderView implements RangeSliderView. float maxValueOffsetX = getPositionFromIndex(maxValue); if (minValue == maxValue) { - if (minValueOffsetX - getDeltaInPixel() >= sliderPaddingLeft - ) { + if (minValueOffsetX - getDeltaInPixel() >= sliderPaddingLeft) { minRangeDisplayLabel.draw( canvas, getDeltaInTime(getContext()), From 39c7103cf619685248025b90b7617cfc7af734ea Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 26 Mar 2019 18:45:45 +0100 Subject: [PATCH 12/12] review fix in slider --- .../securesms/components/rangeslider/RangeSliderView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java index 35a0660a5..4efd72fbd 100644 --- a/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java +++ b/src/org/thoughtcrime/securesms/components/rangeslider/RangeSliderView.java @@ -232,7 +232,7 @@ public class RangeSliderView extends View { } int offsetX = (int) event.getX(); - if (offsetX < (sliderPaddingLeft - (thumbRadius / 2)) || offsetX > getWidth() - sliderPaddingRight + (thumbRadius / 2)) { + if (offsetX < (sliderPaddingLeft - thumbRadius) || offsetX > getWidth() - sliderPaddingRight + thumbRadius) { //Log.d(TAG, "ignore touch in padding"); return true; }