Skip to content

Add notion of isDismissing and gate onReady() callbacks on it #243

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 2 commits into from
Jan 7, 2018
Merged

Add notion of isDismissing and gate onReady() callbacks on it #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cced8ea
Add notion of isDismissing and gate onReady() callbacks on it
ZacSweers Jan 7, 2018
1a1d9de
Return early (and earlier!)
ZacSweers Jan 7, 2018
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
6 changes: 6 additions & 0 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 @@ -68,6 +68,7 @@
@SuppressLint("ViewConstructor")
public class TapTargetView extends View {
private boolean isDismissed = false;
private boolean isDismissing = false;
private boolean isInteractable = true;

final int TARGET_PADDING;
Expand Down Expand Up @@ -429,6 +430,9 @@ public TapTargetView(final Context context,
globalLayoutListener = new ViewTreeObserver.OnGlobalLayoutListener() {
@Override
public void onGlobalLayout() {
if (isDismissing) {
return;
}
updateTextLayouts();
target.onReady(new Runnable() {
@Override
Expand Down Expand Up @@ -607,6 +611,7 @@ protected void onDetachedFromWindow() {
void onDismiss(boolean userInitiated) {
if (isDismissed) return;

isDismissing = false;
isDismissed = true;

for (final ValueAnimator animator : animators) {
Expand Down Expand Up @@ -732,6 +737,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
* (results in different dismiss animations)
*/
public void dismiss(boolean tappedTarget) {
isDismissing = true;
pulseAnimation.cancel();
expandAnimation.cancel();
if (tappedTarget) {
Expand Down