diff options
author | ziadb <ziadb@google.com> | 2018-07-27 11:19:19 -0400 |
---|---|---|
committer | Ziad Ben Hadj-Alouane <ziadb@google.com> | 2018-07-27 15:46:21 +0000 |
commit | 3c9a0c04f243f7c8ed21de8ebb666d0516ff555f (patch) | |
tree | beef8a187c5c2810e64dcb2cfa2659b4555a5f48 /platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java | |
parent | 4a466d69090dc1842dc7b4cb8d3b0ca4cf57b396 (diff) |
SkAR Java: refactoring main app class & finger painting class
Main things to look at:
1) onDrawFrame changes + moving many functions as separate helpers
2) SkARFingerPainting changes (name should change too)
Bug: skia:
Change-Id: I5068ce6c416a2f5d6c6c389cd63d08d5350e83e6
Reviewed-on: https://skia-review.googlesource.com/143701
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java')
-rw-r--r-- | platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java index bcbfe2aa98..6dcfd8fb13 100644 --- a/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java +++ b/platform_tools/android/apps/skar_java/src/main/java/com/google/skar/examples/helloskar/helpers/TapHelper.java @@ -1,10 +1,11 @@ /* - * Copyright 2017 Google Inc. All Rights Reserved. + * Copyright 2018 Google LLC All Rights Reserved. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -12,19 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package com.google.skar.examples.helloskar.helpers; import android.content.Context; -import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -72,7 +68,9 @@ public final class TapHelper implements OnTouchListener { if (e2.getPointerCount() == 1 && e1.getPointerCount() == 1) { previousScroll = isScrolling; isScrolling = true; - queuedFingerHold.offer(new ScrollEvent(e2, startedScrolling())); + + queuedFingerHold.offer(new ScrollEvent(e2, isStartedScrolling())); + return true; } return false; @@ -97,10 +95,6 @@ public final class TapHelper implements OnTouchListener { public ScrollEvent holdPoll() { return queuedFingerHold.poll(); } - public boolean startedScrolling() { - return isScrolling && !previousScroll; - } - @Override public boolean onTouch(View view, MotionEvent motionEvent) { boolean val = gestureDetector.onTouchEvent(motionEvent); @@ -113,4 +107,5 @@ public final class TapHelper implements OnTouchListener { } return val; } + private boolean isStartedScrolling() { return isScrolling && !previousScroll; } } |