diff --git a/.gitignore b/.gitignore
index a843c2e23..18f33a429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,14 @@ pom.xml.*
local.properties
build.xml
proguard-project.txt
+
+# Mac OS files
+.DS_Store
+
+#Gradle files
+.gradle/
+.gradle
+.gradle/*
+
+#Build
+build/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 000000000..248e71b89
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,16 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.0.0'
+ }
+}
+
+allprojects {
+ repositories {
+ mavenCentral()
+ }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..8c0fb64a8
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 000000000..0c71e760d
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 000000000..91a7e269e
--- /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 000000000..8a0b282aa
--- /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/library/.gitignore b/library/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/library/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
deleted file mode 100644
index 4314f1b3d..000000000
--- a/library/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
diff --git a/library/build.gradle b/library/build.gradle
new file mode 100644
index 000000000..03950f106
--- /dev/null
+++ b/library/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ minSdkVersion 4
+ targetSdkVersion 22
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+
+ compile 'com.android.support:support-v4:22.+'
+}
diff --git a/library/libs/android-support-v4.jar b/library/libs/android-support-v4.jar
deleted file mode 100644
index 99e063b33..000000000
Binary files a/library/libs/android-support-v4.jar and /dev/null differ
diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
new file mode 100644
index 000000000..ab2b42bac
--- /dev/null
+++ b/library/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/gimbert/dev/android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# 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/library/src/androidTest/java/com/viewpagerindicator/ApplicationTest.java b/library/src/androidTest/java/com/viewpagerindicator/ApplicationTest.java
new file mode 100644
index 000000000..76a0b4885
--- /dev/null
+++ b/library/src/androidTest/java/com/viewpagerindicator/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.viewpagerindicator;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..f6f442d0a
--- /dev/null
+++ b/library/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/library/src/com/viewpagerindicator/CirclePageIndicator.java b/library/src/main/java/com/viewpagerindicator/CirclePageIndicator.java
similarity index 99%
rename from library/src/com/viewpagerindicator/CirclePageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/CirclePageIndicator.java
index 885daaa6a..185039fe0 100644
--- a/library/src/com/viewpagerindicator/CirclePageIndicator.java
+++ b/library/src/main/java/com/viewpagerindicator/CirclePageIndicator.java
@@ -290,7 +290,7 @@ protected void onDraw(Canvas canvas) {
canvas.drawCircle(dX, dY, mRadius, mPaintFill);
}
- public boolean onTouchEvent(android.view.MotionEvent ev) {
+ public boolean onTouchEvent(MotionEvent ev) {
if (super.onTouchEvent(ev)) {
return true;
}
@@ -552,7 +552,7 @@ public void writeToParcel(Parcel dest, int flags) {
}
@SuppressWarnings("UnusedDeclaration")
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public static final Creator CREATOR = new Creator() {
@Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
diff --git a/library/src/com/viewpagerindicator/IconPageIndicator.java b/library/src/main/java/com/viewpagerindicator/IconPageIndicator.java
similarity index 100%
rename from library/src/com/viewpagerindicator/IconPageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/IconPageIndicator.java
diff --git a/library/src/com/viewpagerindicator/IconPagerAdapter.java b/library/src/main/java/com/viewpagerindicator/IconPagerAdapter.java
similarity index 100%
rename from library/src/com/viewpagerindicator/IconPagerAdapter.java
rename to library/src/main/java/com/viewpagerindicator/IconPagerAdapter.java
diff --git a/library/src/com/viewpagerindicator/IcsLinearLayout.java b/library/src/main/java/com/viewpagerindicator/IcsLinearLayout.java
similarity index 95%
rename from library/src/com/viewpagerindicator/IcsLinearLayout.java
rename to library/src/main/java/com/viewpagerindicator/IcsLinearLayout.java
index cbf619e42..b885c4f00 100644
--- a/library/src/com/viewpagerindicator/IcsLinearLayout.java
+++ b/library/src/main/java/com/viewpagerindicator/IcsLinearLayout.java
@@ -104,7 +104,7 @@ private void drawDividersVertical(Canvas canvas) {
if (child != null && child.getVisibility() != GONE) {
if (hasDividerBeforeChildAt(i)) {
- final android.widget.LinearLayout.LayoutParams lp = (android.widget.LinearLayout.LayoutParams) child.getLayoutParams();
+ final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int top = child.getTop() - lp.topMargin/* - mDividerHeight*/;
drawHorizontalDivider(canvas, top);
}
@@ -131,7 +131,7 @@ private void drawDividersHorizontal(Canvas canvas) {
if (child != null && child.getVisibility() != GONE) {
if (hasDividerBeforeChildAt(i)) {
- final android.widget.LinearLayout.LayoutParams lp = (android.widget.LinearLayout.LayoutParams) child.getLayoutParams();
+ final LayoutParams lp = (LayoutParams) child.getLayoutParams();
final int left = child.getLeft() - lp.leftMargin/* - mDividerWidth*/;
drawVerticalDivider(canvas, left);
}
diff --git a/library/src/com/viewpagerindicator/LinePageIndicator.java b/library/src/main/java/com/viewpagerindicator/LinePageIndicator.java
similarity index 98%
rename from library/src/com/viewpagerindicator/LinePageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/LinePageIndicator.java
index a009cbfbb..0bf4e8be7 100644
--- a/library/src/com/viewpagerindicator/LinePageIndicator.java
+++ b/library/src/main/java/com/viewpagerindicator/LinePageIndicator.java
@@ -190,7 +190,7 @@ protected void onDraw(Canvas canvas) {
}
}
- public boolean onTouchEvent(android.view.MotionEvent ev) {
+ public boolean onTouchEvent(MotionEvent ev) {
if (super.onTouchEvent(ev)) {
return true;
}
@@ -433,7 +433,7 @@ public void writeToParcel(Parcel dest, int flags) {
}
@SuppressWarnings("UnusedDeclaration")
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public static final Creator CREATOR = new Creator() {
@Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
diff --git a/library/src/com/viewpagerindicator/PageIndicator.java b/library/src/main/java/com/viewpagerindicator/PageIndicator.java
similarity index 100%
rename from library/src/com/viewpagerindicator/PageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/PageIndicator.java
diff --git a/library/src/com/viewpagerindicator/TabPageIndicator.java b/library/src/main/java/com/viewpagerindicator/TabPageIndicator.java
similarity index 100%
rename from library/src/com/viewpagerindicator/TabPageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/TabPageIndicator.java
diff --git a/library/src/com/viewpagerindicator/TitlePageIndicator.java b/library/src/main/java/com/viewpagerindicator/TitlePageIndicator.java
similarity index 99%
rename from library/src/com/viewpagerindicator/TitlePageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/TitlePageIndicator.java
index f155d830a..1d2c97848 100644
--- a/library/src/com/viewpagerindicator/TitlePageIndicator.java
+++ b/library/src/main/java/com/viewpagerindicator/TitlePageIndicator.java
@@ -541,7 +541,7 @@ protected void onDraw(Canvas canvas) {
}
}
- public boolean onTouchEvent(android.view.MotionEvent ev) {
+ public boolean onTouchEvent(MotionEvent ev) {
if (super.onTouchEvent(ev)) {
return true;
}
@@ -847,7 +847,7 @@ public void writeToParcel(Parcel dest, int flags) {
}
@SuppressWarnings("UnusedDeclaration")
- public static final Parcelable.Creator CREATOR = new Parcelable.Creator() {
+ public static final Creator CREATOR = new Creator() {
@Override
public SavedState createFromParcel(Parcel in) {
return new SavedState(in);
diff --git a/library/src/com/viewpagerindicator/UnderlinePageIndicator.java b/library/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java
similarity index 100%
rename from library/src/com/viewpagerindicator/UnderlinePageIndicator.java
rename to library/src/main/java/com/viewpagerindicator/UnderlinePageIndicator.java
diff --git a/library/res/color/vpi__dark_theme.xml b/library/src/main/res/color/vpi__dark_theme.xml
similarity index 100%
rename from library/res/color/vpi__dark_theme.xml
rename to library/src/main/res/color/vpi__dark_theme.xml
diff --git a/library/res/color/vpi__light_theme.xml b/library/src/main/res/color/vpi__light_theme.xml
similarity index 100%
rename from library/res/color/vpi__light_theme.xml
rename to library/src/main/res/color/vpi__light_theme.xml
diff --git a/library/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-hdpi/vpi__tab_selected_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_selected_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_selected_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_selected_holo.9.png
diff --git a/library/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_unselected_focused_holo.9.png
diff --git a/library/res/drawable-hdpi/vpi__tab_unselected_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_unselected_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_unselected_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_unselected_holo.9.png
diff --git a/library/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png b/library/src/main/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png
rename to library/src/main/res/drawable-hdpi/vpi__tab_unselected_pressed_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_selected_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_selected_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_selected_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_selected_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_unselected_focused_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_unselected_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_unselected_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_unselected_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_unselected_holo.9.png
diff --git a/library/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png b/library/src/main/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png
rename to library/src/main/res/drawable-mdpi/vpi__tab_unselected_pressed_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_selected_focused_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_selected_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_selected_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_selected_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_selected_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_selected_pressed_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_unselected_focused_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_unselected_holo.9.png
diff --git a/library/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png b/library/src/main/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from library/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png
rename to library/src/main/res/drawable-xhdpi/vpi__tab_unselected_pressed_holo.9.png
diff --git a/library/res/drawable/vpi__tab_indicator.xml b/library/src/main/res/drawable/vpi__tab_indicator.xml
similarity index 100%
rename from library/res/drawable/vpi__tab_indicator.xml
rename to library/src/main/res/drawable/vpi__tab_indicator.xml
diff --git a/library/res/values/vpi__attrs.xml b/library/src/main/res/values/vpi__attrs.xml
similarity index 100%
rename from library/res/values/vpi__attrs.xml
rename to library/src/main/res/values/vpi__attrs.xml
diff --git a/library/res/values/vpi__colors.xml b/library/src/main/res/values/vpi__colors.xml
similarity index 100%
rename from library/res/values/vpi__colors.xml
rename to library/src/main/res/values/vpi__colors.xml
diff --git a/library/res/values/vpi__defaults.xml b/library/src/main/res/values/vpi__defaults.xml
similarity index 100%
rename from library/res/values/vpi__defaults.xml
rename to library/src/main/res/values/vpi__defaults.xml
diff --git a/library/res/values/vpi__styles.xml b/library/src/main/res/values/vpi__styles.xml
similarity index 100%
rename from library/res/values/vpi__styles.xml
rename to library/src/main/res/values/vpi__styles.xml
diff --git a/sample/.gitignore b/sample/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/sample/build.gradle b/sample/build.gradle
new file mode 100644
index 000000000..fdb428c57
--- /dev/null
+++ b/sample/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 22
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ applicationId "com.viewpagerindicator.sample"
+ minSdkVersion 4
+ targetSdkVersion 22
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+ compile project(":library")
+}
diff --git a/sample/libs/android-support-v4.jar b/sample/libs/android-support-v4.jar
deleted file mode 100644
index 99e063b33..000000000
Binary files a/sample/libs/android-support-v4.jar and /dev/null differ
diff --git a/sample/proguard-rules.pro b/sample/proguard-rules.pro
new file mode 100644
index 000000000..ab2b42bac
--- /dev/null
+++ b/sample/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/gimbert/dev/android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# 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/sample/src/androidTest/java/com/viewpagerindicator/sample/ApplicationTest.java b/sample/src/androidTest/java/com/viewpagerindicator/sample/ApplicationTest.java
new file mode 100644
index 000000000..08b23e6dc
--- /dev/null
+++ b/sample/src/androidTest/java/com/viewpagerindicator/sample/ApplicationTest.java
@@ -0,0 +1,13 @@
+package com.viewpagerindicator.sample;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * Testing Fundamentals
+ */
+public class ApplicationTest extends ApplicationTestCase {
+ public ApplicationTest() {
+ super(Application.class);
+ }
+}
\ No newline at end of file
diff --git a/sample/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
similarity index 83%
rename from sample/AndroidManifest.xml
rename to sample/src/main/AndroidManifest.xml
index bbcb3afbe..0966cb242 100644
--- a/sample/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -1,16 +1,9 @@
-
+ package="com.viewpagerindicator.sample">
-
-
-
+ android:icon="@mipmap/icon">
+ android:name=".SampleLinesDefault"
+ android:label="Lines/Default">
+ android:name=".SampleLinesStyledLayout"
+ android:label="Lines/Styled (via layout)"
+ android:theme="@android:style/Theme.Light">
+ android:name=".SampleLinesStyledMethods"
+ android:label="Lines/Styled (via methods)"
+ android:theme="@android:style/Theme.Light">
+ android:name=".SampleLinesStyledTheme"
+ android:label="Lines/Styled (via theme)"
+ android:theme="@style/StyledIndicators">
@@ -237,57 +230,57 @@
-
-
-
-
-
-
+
+
+
+
+
+
+ android:name=".SampleUnderlinesDefault"
+ android:label="Underlines/Default">
+ android:name=".SampleUnderlinesNoFade"
+ android:label="Underlines/No Fade">
+ android:name=".SampleUnderlinesStyledLayout"
+ android:label="Underlines/Styled (via layout)"
+ android:theme="@android:style/Theme.Light">
+ android:name=".SampleUnderlinesStyledMethods"
+ android:label="Underlines/Styled (via methods)"
+ android:theme="@android:style/Theme.Light">
+ android:name=".SampleUnderlinesStyledTheme"
+ android:label="Underlines/Styled (via theme)"
+ android:theme="@style/StyledIndicators">
@@ -295,4 +288,5 @@
+
diff --git a/sample/src/com/viewpagerindicator/sample/BaseSampleActivity.java b/sample/src/main/java/com/viewpagerindicator/sample/BaseSampleActivity.java
similarity index 100%
rename from sample/src/com/viewpagerindicator/sample/BaseSampleActivity.java
rename to sample/src/main/java/com/viewpagerindicator/sample/BaseSampleActivity.java
diff --git a/sample/src/com/viewpagerindicator/sample/ListSamples.java b/sample/src/main/java/com/viewpagerindicator/sample/ListSamples.java
similarity index 97%
rename from sample/src/com/viewpagerindicator/sample/ListSamples.java
rename to sample/src/main/java/com/viewpagerindicator/sample/ListSamples.java
index c175e8e1c..eb37a8e17 100644
--- a/sample/src/com/viewpagerindicator/sample/ListSamples.java
+++ b/sample/src/main/java/com/viewpagerindicator/sample/ListSamples.java
@@ -1,132 +1,132 @@
-package com.viewpagerindicator.sample;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import android.app.ListActivity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.SimpleAdapter;
-
-public class ListSamples extends ListActivity {
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- Intent intent = getIntent();
- String path = intent.getStringExtra("com.jakewharton.android.viewpagerindicator.sample.Path");
-
- if (path == null) {
- path = "";
- }
-
- setListAdapter(new SimpleAdapter(this, getData(path),
- android.R.layout.simple_list_item_1, new String[] { "title" },
- new int[] { android.R.id.text1 }));
- getListView().setTextFilterEnabled(true);
- }
-
- protected List