mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Implement left/right swipe in whats new view

Browse source
This commit is contained in:
Bartosz Przybylski 2015-12-02 18:51:22 +01:00 committed by AndyScherzinger
parent 3d9f35e6cf
commit 0ecda26c73
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 85 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/com/owncloud/android/ui/activity/WhatsNewActivity.java
View file

@ -28,7 +28,9 @@ import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.GestureDetector;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
@ -50,7 +52,6 @@ import com.owncloud.android.ui.whatsnew.ProgressIndicator;
* @author Bartosz Przybylski * @author Bartosz Przybylski
*/ */
public class WhatsNewActivity extends Activity { public class WhatsNewActivity extends Activity {
private static String TAG = WhatsNewActivity.class.getSimpleName();
private static final String KEY_LAST_SEEN_VERSION_CODE = "lastSeenVersionCode"; private static final String KEY_LAST_SEEN_VERSION_CODE = "lastSeenVersionCode";
@ -83,11 +84,7 @@ public class WhatsNewActivity extends Activity {
onFinish(); onFinish();
finish(); finish();
} }
if (!mProgress.hasNextStep()) { updateNextButtonIfNeeded();
mForwardFinishButton.setImageResource(R.drawable.ic_ok);
} else {
mForwardFinishButton.setImageResource(R.drawable.ic_menu_forward);
}
} }
}); });
Button skipButton = (Button) findViewById(R.id.skip); Button skipButton = (Button) findViewById(R.id.skip);
@ -133,6 +130,48 @@ public class WhatsNewActivity extends Activity {
if (item.shouldShowContentText()) if (item.shouldShowContentText())
tv2.setText(item.getContentText()); tv2.setText(item.getContentText());
} }
mContentPanel.setOnTouchListener(new OnSwipeTouchListener(getApplicationContext()) {
@Override
public void onSwipeLeft() {
handleMoveToNext();
}
@Override
public void onSwipeRight() {
handleMoveToPrev();
}
});
}
@Override
public void onBackPressed() {
onFinish();
super.onBackPressed();
}
private void updateNextButtonIfNeeded() {
if (!mProgress.hasNextStep())
mForwardFinishButton.setImageResource(R.drawable.ic_ok);
else
mForwardFinishButton.setImageResource(R.drawable.ic_menu_forward);
}
private void handleMoveToNext() {
if (mProgress.hasNextStep()) {
mProgress.animateToNextStep();
mContentPanel.animate().x(-mContentPanel.getChildAt(++mCurrentStep).getLeft());
updateNextButtonIfNeeded();
}
}
private void handleMoveToPrev() {
if (mProgress.hasPrevStep()) {
mProgress.animateToPrevStep();
mContentPanel.animate().x(-mContentPanel.getChildAt(--mCurrentStep).getLeft());
updateNextButtonIfNeeded();
}
} }
private void onFinish() { private void onFinish() {
@ -169,4 +208,44 @@ public class WhatsNewActivity extends Activity {
} }
public abstract class OnSwipeTouchListener implements View.OnTouchListener {
private final GestureDetector gestureDetector;
public OnSwipeTouchListener(Context context) {
gestureDetector = new GestureDetector(context, new GestureListener());
}
abstract public void onSwipeLeft();
abstract public void onSwipeRight();
public boolean onTouch(View v, MotionEvent event) {
return gestureDetector.onTouchEvent(event);
}
private final class GestureListener extends GestureDetector.SimpleOnGestureListener {
private static final int SWIPE_DISTANCE_THRESHOLD = 100;
private static final int SWIPE_VELOCITY_THRESHOLD = 100;
@Override
public boolean onDown(MotionEvent e) { return true; }
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
final float distanceX = e2.getX() - e1.getX();
final float distanceY = e2.getY() - e1.getY();
if (Math.abs(distanceX) > Math.abs(distanceY) && Math.abs(distanceX) > SWIPE_DISTANCE_THRESHOLD && Math.abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
if (distanceX > 0)
onSwipeRight();
else
onSwipeLeft();
return true;
}
return false;
}
}
}
} }