Skip to content

Allow sequences to be canceled #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiphirx merged 1 commit into from
Jul 17, 2017
Merged

Allow sequences to be canceled #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetSequence.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
package com.getkeepsafe.taptargetview;

import android.app.Activity;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread;

import java.util.Collections;
import java.util.LinkedList;
Expand All @@ -31,7 +33,10 @@
public class TapTargetSequence {
private final Activity activity;
private final Queue<TapTarget> targets;
private boolean started;
private boolean active;

@Nullable
private TapTargetView currentView;

Listener listener;
boolean considerOuterCircleCanceled;
Expand Down Expand Up @@ -101,18 +106,42 @@ public TapTargetSequence listener(Listener listener) {
}

/** Immediately starts the sequence and displays the first target from the queue **/
@UiThread
public void start() {
if (targets.isEmpty() || started) {
if (targets.isEmpty() || active) {
return;
}

started = true;
active = true;
showNext();
}

/**
* Cancels the sequence, if the current target is cancelable.
* When the sequence is canceled, the current target is dismissed and the remaining targets are
* removed from the sequence.
* @return whether the sequence was canceled or not
*/
@UiThread
public boolean cancel() {
if (targets.isEmpty() || !active) {
return false;
}
if (currentView == null || !currentView.cancelable) {
return false;
}
currentView.dismiss(false);
active = false;
targets.clear();
if (listener != null) {
listener.onSequenceCanceled(currentView.target);
}
return true;
}

void showNext() {
try {
TapTargetView.showFor(activity, targets.remove(), tapTargetListener);
currentView = TapTargetView.showFor(activity, targets.remove(), tapTargetListener);
} catch (NoSuchElementException e) {
// No more targets
if (listener != null) {
Expand Down
8 changes: 2 additions & 6 deletions taptargetview/src/main/java/com/getkeepsafe/taptargetview/TapTargetView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public void onUpdate(float lerpTime) {
.onEnd(new FloatValueAnimatorBuilder.EndListener() {
@Override
public void onEnd() {
onDismiss();
onDismiss(true);
ViewUtil.removeView(parent, TapTargetView.this);
}
})
Expand Down Expand Up @@ -339,7 +339,7 @@ public void onUpdate(float lerpTime) {
.onEnd(new FloatValueAnimatorBuilder.EndListener() {
@Override
public void onEnd() {
onDismiss();
onDismiss(true);
ViewUtil.removeView(parent, TapTargetView.this);
}
})
Expand Down Expand Up @@ -604,10 +604,6 @@ protected void onDetachedFromWindow() {
onDismiss(false);
}

void onDismiss() {
onDismiss(true);
}

void onDismiss(boolean userInitiated) {
if (isDismissed) return;

Expand Down