diff --git a/.gitignore b/.gitignore index 71ed7f5..de4da9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,24 @@ -# built application files -# *.apk -# *.ap_ - -# files for the dex VM -*.dex - -# Java class files -*.class - -# generated files +.DS_Store bin/ gen/ - -# Local configuration file (sdk path, etc) -local.properties - -# Eclipse project files .classpath .project +.idea +*.iml +*.iws +*.ipr + +out +docs +libs.bak +local.properties +.settings +proguard-project.txt +gen-annotation-processed +target +.apt_generated +*.apklib +classes +gen-external-apklibs +.gradle +build diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ec91c91 --- /dev/null +++ b/build.gradle @@ -0,0 +1,26 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.6.+' + classpath 'com.github.townsfolk:gradle-release:1.2' + } +} + +task wrapper(type: Wrapper) { + gradleVersion = '1.8' +} + +apply plugin: 'release' + +allprojects { + repositories { + mavenCentral() + } + + tasks.withType(Compile) { + options.encoding = "UTF-8" + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..667288a Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..39328f2 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Nov 08 16:35:39 CST 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/build.gradle b/lib/build.gradle new file mode 100644 index 0000000..27bc80f --- /dev/null +++ b/lib/build.gradle @@ -0,0 +1,11 @@ +apply plugin: 'android-library' + +dependencies { + compile 'com.android.support:support-v4:19.0.0' + compile 'com.nineoldandroids:library:2.4.0' +} + +android { + compileSdkVersion 19 + buildToolsVersion "19" +} diff --git a/lib/libs/android-support-v4.jar b/lib/libs/android-support-v4.jar deleted file mode 100644 index 6080877..0000000 Binary files a/lib/libs/android-support-v4.jar and /dev/null differ diff --git a/lib/libs/nineoldandroids-2.4.0.jar b/lib/libs/nineoldandroids-2.4.0.jar deleted file mode 100644 index 43ee45f..0000000 Binary files a/lib/libs/nineoldandroids-2.4.0.jar and /dev/null differ diff --git a/lib/proguard-project.txt b/lib/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/lib/proguard-project.txt +++ /dev/null @@ -1,20 +0,0 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/lib/project.properties b/lib/project.properties deleted file mode 100644 index 019cc55..0000000 --- a/lib/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 -android.library=false diff --git a/lib/res/values/ids.xml b/lib/res/values/ids.xml deleted file mode 100644 index cd2f76b..0000000 --- a/lib/res/values/ids.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/lib/src/com/jfeinstein/jazzyviewpager/MainActivity.java b/lib/src/com/jfeinstein/jazzyviewpager/MainActivity.java deleted file mode 100644 index 3ff8a9a..0000000 --- a/lib/src/com/jfeinstein/jazzyviewpager/MainActivity.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.jfeinstein.jazzyviewpager; - -import android.app.Activity; -import android.graphics.Color; -import android.os.Bundle; -import android.support.v4.view.PagerAdapter; -import android.view.Gravity; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.TextView; - -import com.jfeinstein.jazzyviewpager.JazzyViewPager.TransitionEffect; - -public class MainActivity extends Activity { - - private JazzyViewPager mJazzy; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - setupJazziness(TransitionEffect.Tablet); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - menu.add("Toggle Fade"); - String[] effects = this.getResources().getStringArray(R.array.jazzy_effects); - for (String effect : effects) - menu.add(effect); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getTitle().toString().equals("Toggle Fade")) { - mJazzy.setFadeEnabled(!mJazzy.getFadeEnabled()); - } else { - TransitionEffect effect = TransitionEffect.valueOf(item.getTitle().toString()); - setupJazziness(effect); - } - return true; - } - - private void setupJazziness(TransitionEffect effect) { - mJazzy = (JazzyViewPager) findViewById(R.id.jazzy_pager); - mJazzy.setTransitionEffect(effect); - mJazzy.setAdapter(new MainAdapter()); - mJazzy.setPageMargin(30); - } - - private class MainAdapter extends PagerAdapter { - @Override - public Object instantiateItem(ViewGroup container, final int position) { - TextView text = new TextView(MainActivity.this); - text.setGravity(Gravity.CENTER); - text.setTextSize(30); - text.setTextColor(Color.WHITE); - text.setText("Page " + position); - text.setPadding(30, 30, 30, 30); - int bg = Color.rgb((int) Math.floor(Math.random()*128)+64, - (int) Math.floor(Math.random()*128)+64, - (int) Math.floor(Math.random()*128)+64); - text.setBackgroundColor(bg); - container.addView(text, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - mJazzy.setObjectForPosition(text, position); - return text; - } - @Override - public void destroyItem(ViewGroup container, int position, Object obj) { - container.removeView(mJazzy.findViewFromObject(position)); - } - @Override - public int getCount() { - return 10; - } - @Override - public boolean isViewFromObject(View view, Object obj) { - if (view instanceof OutlineContainer) { - return ((OutlineContainer) view).getChildAt(0) == obj; - } else { - return view == obj; - } - } - } -} diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml new file mode 100644 index 0000000..d9424c7 --- /dev/null +++ b/lib/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/lib/src/com/jfeinstein/jazzyviewpager/JazzyViewPager.java b/lib/src/main/java/com/jfeinstein/jazzyviewpager/JazzyViewPager.java similarity index 84% rename from lib/src/com/jfeinstein/jazzyviewpager/JazzyViewPager.java rename to lib/src/main/java/com/jfeinstein/jazzyviewpager/JazzyViewPager.java index f95b624..51f1b65 100644 --- a/lib/src/com/jfeinstein/jazzyviewpager/JazzyViewPager.java +++ b/lib/src/main/java/com/jfeinstein/jazzyviewpager/JazzyViewPager.java @@ -35,6 +35,9 @@ public class JazzyViewPager extends ViewPager { private static final float ZOOM_MAX = 0.5f; private static final float ROT_MAX = 15.0f; + private static final float ZOOM_OUT_IN_MIN_SCALE = 0.85f; + private static final float ZOOM_OUT_IN_MIN_ALPHA = 0.5f; + public enum TransitionEffect { Standard, Tablet, @@ -47,7 +50,8 @@ public enum TransitionEffect { ZoomOut, RotateUp, RotateDown, - Accordion + Accordion, + ZoomOutAndIn } private static final boolean API_11; @@ -415,6 +419,78 @@ protected void animateStack(View left, View right, float positionOffset, int pos } } + /** + * This animation refers to the Zoom-out page transformer available on developer.android.com + * @see http://developer.android.com/training/animation/screen-slide.html + * @param left + * @param right + * @param positionOffset + */ + private void animateZoomOutAndIn(View left, View right, float positionOffset) { + + if (mState != State.IDLE) { + if (left != null) { + int pageWidth = left.getWidth(); + int pageHeight = left.getHeight(); + + manageLayer(left, true); + if (positionOffset < -1) { + ViewHelper.setAlpha(left, 0f); + } else if (positionOffset < 1) { + float scaleFactor = Math.max(ZOOM_OUT_IN_MIN_SCALE, 1 - Math.abs(positionOffset)); + float vertMargin = pageHeight * (1 - scaleFactor) / 2; + float horzMargin = pageWidth * (1 - scaleFactor) / 2; + + if (positionOffset < 0) { + ViewHelper.setTranslationX(left, horzMargin - vertMargin / 2); + } else { + ViewHelper.setTranslationX(left, -horzMargin + vertMargin / 2); + } + + ViewHelper.setScaleX(left, scaleFactor); + ViewHelper.setScaleY(left, scaleFactor); + + ViewHelper.setAlpha(left,ZOOM_OUT_IN_MIN_ALPHA + + (scaleFactor - ZOOM_OUT_IN_MIN_SCALE) / (1 - ZOOM_OUT_IN_MIN_SCALE) * + (1- ZOOM_OUT_IN_MIN_ALPHA)); + + } else { + ViewHelper.setAlpha(left, 0f); + } + } + + if (right != null) { + int pageWidth = right.getWidth(); + int pageHeight = right.getHeight(); + + manageLayer(right, true); + if (positionOffset < -1) { + ViewHelper.setAlpha(right, 0f); + } else if (positionOffset < 1) { + float scaleFactor = Math.max(ZOOM_OUT_IN_MIN_SCALE, 1 - Math.abs(positionOffset - 1)); + float vertMargin = pageHeight * (1 - scaleFactor) / 2; + float horzMargin = pageWidth * (1 - scaleFactor) / 2; + + if (positionOffset < 0) { + ViewHelper.setTranslationX(right, horzMargin - vertMargin / 2); + } else { + ViewHelper.setTranslationX(right, -horzMargin + vertMargin / 2); + } + + ViewHelper.setScaleX(right, scaleFactor); + ViewHelper.setScaleY(right, scaleFactor); + + ViewHelper.setAlpha(right, ZOOM_OUT_IN_MIN_ALPHA + + (scaleFactor - ZOOM_OUT_IN_MIN_SCALE) / (1 - ZOOM_OUT_IN_MIN_SCALE) * + (1 - ZOOM_OUT_IN_MIN_ALPHA)); + + } else { + ViewHelper.setAlpha(right, 0f); + } + } + } + } + @TargetApi(Build.VERSION_CODES.HONEYCOMB) private void manageLayer(View v, boolean enableHardware) { if (!API_11) return; @@ -541,6 +617,9 @@ else if (mState == State.GOING_LEFT && goingRight) case Accordion: animateAccordion(mLeft, mRight, effectOffset); break; + case ZoomOutAndIn: + animateZoomOutAndIn(mLeft, mRight, effectOffset); + break; } super.onPageScrolled(position, positionOffset, positionOffsetPixels); diff --git a/lib/src/com/jfeinstein/jazzyviewpager/OutlineContainer.java b/lib/src/main/java/com/jfeinstein/jazzyviewpager/OutlineContainer.java similarity index 100% rename from lib/src/com/jfeinstein/jazzyviewpager/OutlineContainer.java rename to lib/src/main/java/com/jfeinstein/jazzyviewpager/OutlineContainer.java diff --git a/lib/src/com/jfeinstein/jazzyviewpager/Util.java b/lib/src/main/java/com/jfeinstein/jazzyviewpager/Util.java similarity index 100% rename from lib/src/com/jfeinstein/jazzyviewpager/Util.java rename to lib/src/main/java/com/jfeinstein/jazzyviewpager/Util.java diff --git a/lib/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml similarity index 100% rename from lib/res/values/attrs.xml rename to lib/src/main/res/values/attrs.xml diff --git a/lib/res/values/colors.xml b/lib/src/main/res/values/colors.xml similarity index 100% rename from lib/res/values/colors.xml rename to lib/src/main/res/values/colors.xml diff --git a/lib/res/values/strings.xml b/lib/src/main/res/values/strings.xml similarity index 89% rename from lib/res/values/strings.xml rename to lib/src/main/res/values/strings.xml index c030e66..c73105f 100644 --- a/lib/res/values/strings.xml +++ b/lib/src/main/res/values/strings.xml @@ -1,8 +1,6 @@ - - JazzyViewPager - + Standard Tablet @@ -17,5 +15,5 @@ RotateDown Accordion - + \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle new file mode 100644 index 0000000..b21f099 --- /dev/null +++ b/sample/build.gradle @@ -0,0 +1,14 @@ +apply plugin: 'android' + +dependencies { + compile 'com.android.support:support-v4:19.0.0' + compile 'com.nineoldandroids:library:2.4.0' + + compile project(':lib') +} + + +android { + compileSdkVersion 19 + buildToolsVersion "19" +} diff --git a/lib/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml similarity index 85% rename from lib/AndroidManifest.xml rename to sample/src/main/AndroidManifest.xml index 17a0719..1d158aa 100644 --- a/lib/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -14,7 +14,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > diff --git a/sample/src/main/java/com/jfeinstein/jazzyviewpager/sample/MainActivity.java b/sample/src/main/java/com/jfeinstein/jazzyviewpager/sample/MainActivity.java new file mode 100644 index 0000000..533264b --- /dev/null +++ b/sample/src/main/java/com/jfeinstein/jazzyviewpager/sample/MainActivity.java @@ -0,0 +1,98 @@ +package com.jfeinstein.jazzyviewpager.sample; + +import android.app.Activity; +import android.graphics.Color; +import android.os.Bundle; +import android.support.v4.view.PagerAdapter; +import android.view.Gravity; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewGroup.LayoutParams; +import android.widget.TextView; +import com.jfeinstein.jazzyviewpager.JazzyViewPager; +import com.jfeinstein.jazzyviewpager.JazzyViewPager.TransitionEffect; +import com.jfeinstein.jazzyviewpager.OutlineContainer; + +public class MainActivity extends Activity { + + static final String TOGGLE_FADE = "Toggle Fade"; + + private JazzyViewPager mJazzy; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + setupJazziness(TransitionEffect.Tablet); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuItem i = menu.add(TOGGLE_FADE); + i.setCheckable(true); + i.setChecked(mJazzy.getFadeEnabled()); + + for (TransitionEffect effect : JazzyViewPager.TransitionEffect.values()) + menu.add(effect.toString()); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getTitle().toString().equals(TOGGLE_FADE)) { + mJazzy.setFadeEnabled(!mJazzy.getFadeEnabled()); + item.setChecked(mJazzy.getFadeEnabled()); + } else { + TransitionEffect effect = TransitionEffect.valueOf(item.getTitle().toString()); + setupJazziness(effect); + } + return true; + } + + private void setupJazziness(TransitionEffect effect) { + mJazzy = (JazzyViewPager) findViewById(R.id.jazzy_pager); + mJazzy.setTransitionEffect(effect); + mJazzy.setAdapter(new MainAdapter()); + mJazzy.setPageMargin(30); + } + + private class MainAdapter extends PagerAdapter { + @Override + public Object instantiateItem(ViewGroup container, final int position) { + TextView text = new TextView(MainActivity.this); + text.setGravity(Gravity.CENTER); + text.setTextSize(30); + text.setTextColor(Color.WHITE); + text.setText("Page " + position); + text.setPadding(30, 30, 30, 30); + int bg = Color.rgb((int) Math.floor(Math.random() * 128) + 64, + (int) Math.floor(Math.random() * 128) + 64, + (int) Math.floor(Math.random() * 128) + 64); + text.setBackgroundColor(bg); + container.addView(text, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); + mJazzy.setObjectForPosition(text, position); + return text; + } + + @Override + public void destroyItem(ViewGroup container, int position, Object obj) { + container.removeView(mJazzy.findViewFromObject(position)); + } + + @Override + public int getCount() { + return 10; + } + + @Override + public boolean isViewFromObject(View view, Object obj) { + if (view instanceof OutlineContainer) { + return ((OutlineContainer) view).getChildAt(0) == obj; + } else { + return view == obj; + } + } + } +} diff --git a/lib/res/drawable-hdpi/ic_launcher.png b/sample/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from lib/res/drawable-hdpi/ic_launcher.png rename to sample/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/lib/res/drawable-mdpi/ic_launcher.png b/sample/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from lib/res/drawable-mdpi/ic_launcher.png rename to sample/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/lib/res/drawable-xhdpi/ic_launcher.png b/sample/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from lib/res/drawable-xhdpi/ic_launcher.png rename to sample/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/lib/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml similarity index 100% rename from lib/res/layout/activity_main.xml rename to sample/src/main/res/layout/activity_main.xml diff --git a/lib/res/menu/activity_main.xml b/sample/src/main/res/menu/activity_main.xml similarity index 100% rename from lib/res/menu/activity_main.xml rename to sample/src/main/res/menu/activity_main.xml diff --git a/lib/res/values-v11/styles.xml b/sample/src/main/res/values-v11/styles.xml similarity index 100% rename from lib/res/values-v11/styles.xml rename to sample/src/main/res/values-v11/styles.xml diff --git a/lib/res/values-v14/styles.xml b/sample/src/main/res/values-v14/styles.xml similarity index 100% rename from lib/res/values-v14/styles.xml rename to sample/src/main/res/values-v14/styles.xml diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml new file mode 100644 index 0000000..251c89c --- /dev/null +++ b/sample/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + JazzyViewPager + + \ No newline at end of file diff --git a/lib/res/values/styles.xml b/sample/src/main/res/values/styles.xml similarity index 100% rename from lib/res/values/styles.xml rename to sample/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..b55ed31 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':lib' +include ':sample' \ No newline at end of file