diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index c521ca2..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs diff=csharp
-*.sln merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
diff --git a/.gitignore b/.gitignore
index a987335..18a3c58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,21 @@
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Eclipse project files
-.classpath
-.project
+.classpath
+project.properties
+.project
+.settings
+bin/
+gen/
+.idea/
+*.iml
+out
+tests
+lint.xml
+local.properties
+ant.properties
+.DS_Store
+build.log
+build-log.xml
+.gradle
+build
+signing.properties
+library/lib/
+library/obj/
diff --git a/README.md b/README.md
index 6126dfa..beafadc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
Color Picker for Android
===================================
+Forked to improve ease of use as a library module and added support for production of a maven artifact via the `uploadArchives` gradle task.
+
Easy to use, fully functional color picker with compact design based on HSV color model. Project consists two main classes which can be easily extended and suited to user requirements.
* ColorPicker.java - basic color picker which allows user to pick a single color
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..26f985f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,10 @@
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.+'
+ }
+}
diff --git a/AndroidManifest.xml b/demo/AndroidManifest.xml
similarity index 63%
rename from AndroidManifest.xml
rename to demo/AndroidManifest.xml
index 99f5b95..282eb4f 100644
--- a/AndroidManifest.xml
+++ b/demo/AndroidManifest.xml
@@ -1,20 +1,16 @@
-
-
@@ -22,9 +18,9 @@
-
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/demo/build.gradle b/demo/build.gradle
new file mode 100644
index 0000000..c085919
--- /dev/null
+++ b/demo/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+apply plugin: 'maven'
+
+android {
+
+ compileSdkVersion 19
+ buildToolsVersion '19.1.0'
+
+ defaultConfig {
+ minSdkVersion 8
+ targetSdkVersion 19
+ }
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ resources.srcDirs = ['src']
+ res.srcDirs = ['res']
+ java.srcDirs = ['src']
+ }
+ }
+}
+
+dependencies {
+ compile project(':library')
+}
diff --git a/res/drawable-nodpi/ic_launcher.png b/demo/res/drawable-nodpi/ic_launcher.png
similarity index 100%
rename from res/drawable-nodpi/ic_launcher.png
rename to demo/res/drawable-nodpi/ic_launcher.png
diff --git a/res/layout/act_demo.xml b/demo/res/layout/act_demo.xml
similarity index 100%
rename from res/layout/act_demo.xml
rename to demo/res/layout/act_demo.xml
diff --git a/res/layout/act_multi_picker.xml b/demo/res/layout/act_multi_picker.xml
similarity index 100%
rename from res/layout/act_multi_picker.xml
rename to demo/res/layout/act_multi_picker.xml
diff --git a/res/layout/act_picker.xml b/demo/res/layout/act_picker.xml
similarity index 100%
rename from res/layout/act_picker.xml
rename to demo/res/layout/act_picker.xml
diff --git a/res/layout/act_pref.xml b/demo/res/layout/act_pref.xml
similarity index 100%
rename from res/layout/act_pref.xml
rename to demo/res/layout/act_pref.xml
diff --git a/res/values-v11/styles.xml b/demo/res/values-v11/styles.xml
similarity index 100%
rename from res/values-v11/styles.xml
rename to demo/res/values-v11/styles.xml
diff --git a/res/values-v14/styles.xml b/demo/res/values-v14/styles.xml
similarity index 100%
rename from res/values-v14/styles.xml
rename to demo/res/values-v14/styles.xml
diff --git a/res/values/dimens.xml b/demo/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to demo/res/values/dimens.xml
diff --git a/res/values/strings.xml b/demo/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to demo/res/values/strings.xml
diff --git a/res/values/styles.xml b/demo/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to demo/res/values/styles.xml
diff --git a/src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java b/demo/src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java
similarity index 93%
rename from src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java
rename to demo/src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java
index 225b836..798f7a6 100644
--- a/src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java
+++ b/demo/src/com/chiralcode/colorpicker/demo/ColorPickerActivity.java
@@ -9,7 +9,6 @@
import android.widget.Toast;
import com.chiralcode.colorpicker.ColorPicker;
-import com.chiralcode.colorpicker.R;
public class ColorPickerActivity extends Activity {
diff --git a/src/com/chiralcode/colorpicker/demo/DemoActivity.java b/demo/src/com/chiralcode/colorpicker/demo/DemoActivity.java
similarity index 95%
rename from src/com/chiralcode/colorpicker/demo/DemoActivity.java
rename to demo/src/com/chiralcode/colorpicker/demo/DemoActivity.java
index a4fb0b0..4e08ea0 100644
--- a/src/com/chiralcode/colorpicker/demo/DemoActivity.java
+++ b/demo/src/com/chiralcode/colorpicker/demo/DemoActivity.java
@@ -11,7 +11,6 @@
import com.chiralcode.colorpicker.ColorPickerDialog;
import com.chiralcode.colorpicker.ColorPickerDialog.OnColorSelectedListener;
-import com.chiralcode.colorpicker.R;
public class DemoActivity extends ListActivity {
diff --git a/src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java b/demo/src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java
similarity index 93%
rename from src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java
rename to demo/src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java
index 1af5c32..6f4139b 100644
--- a/src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java
+++ b/demo/src/com/chiralcode/colorpicker/demo/MultiColorPickerActivity.java
@@ -9,7 +9,6 @@
import android.widget.Toast;
import com.chiralcode.colorpicker.MultiColorPicker;
-import com.chiralcode.colorpicker.R;
public class MultiColorPickerActivity extends Activity {
diff --git a/src/com/chiralcode/colorpicker/demo/PreferencesActivity.java b/demo/src/com/chiralcode/colorpicker/demo/PreferencesActivity.java
similarity index 87%
rename from src/com/chiralcode/colorpicker/demo/PreferencesActivity.java
rename to demo/src/com/chiralcode/colorpicker/demo/PreferencesActivity.java
index a37d198..2b8687f 100644
--- a/src/com/chiralcode/colorpicker/demo/PreferencesActivity.java
+++ b/demo/src/com/chiralcode/colorpicker/demo/PreferencesActivity.java
@@ -3,7 +3,7 @@
import android.os.Bundle;
import android.preference.PreferenceActivity;
-import com.chiralcode.colorpicker.R;
+import com.chiralcode.colorpicker.demo.R;
public class PreferencesActivity extends PreferenceActivity {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..5838598
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..6534b7f
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Jun 09 23:26:49 PDT 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.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/library/AndroidManifest.xml b/library/AndroidManifest.xml
new file mode 100644
index 0000000..279c923
--- /dev/null
+++ b/library/AndroidManifest.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
diff --git a/library/build.gradle b/library/build.gradle
new file mode 100644
index 0000000..384e5d3
--- /dev/null
+++ b/library/build.gradle
@@ -0,0 +1,61 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.+'
+ }
+}
+
+android {
+ compileSdkVersion 19
+ buildToolsVersion '19.1.0'
+
+ defaultConfig {
+ minSdkVersion 8
+ targetSdkVersion 19
+ }
+
+ android {
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = ['src']
+ resources.srcDirs = ['src']
+ aidl.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ res.srcDirs = ['res']
+ }
+ }
+ }
+}
+
+uploadArchives {
+ repositories.mavenDeployer {
+ repository(url: "file:///${project.buildDir}/mvn-repo")
+
+ pom.groupId = 'com.chiralcode'
+ pom.artifactId = 'colorpicker'
+ pom.version = '1.0.0'
+ pom.packaging = 'aar'
+
+ pom.project {
+ url 'https://github.com/rhodey/Android-Color-Picker'
+ licenses {
+ license {
+ name 'Apache License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0'
+ }
+ }
+ developers {
+ developer {
+ id 'chiralcode'
+ name 'Chiral Code'
+ }
+ }
+ }
+ }
+}
diff --git a/library/res/values/strings.xml b/library/res/values/strings.xml
new file mode 100644
index 0000000..4e97d0f
--- /dev/null
+++ b/library/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ colorpicker
+
diff --git a/library/res/values/styles.xml b/library/res/values/styles.xml
new file mode 100644
index 0000000..4ea9326
--- /dev/null
+++ b/library/res/values/styles.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/com/chiralcode/colorpicker/ColorPicker.java b/library/src/com/chiralcode/colorpicker/ColorPicker.java
similarity index 100%
rename from src/com/chiralcode/colorpicker/ColorPicker.java
rename to library/src/com/chiralcode/colorpicker/ColorPicker.java
diff --git a/src/com/chiralcode/colorpicker/ColorPickerDialog.java b/library/src/com/chiralcode/colorpicker/ColorPickerDialog.java
similarity index 100%
rename from src/com/chiralcode/colorpicker/ColorPickerDialog.java
rename to library/src/com/chiralcode/colorpicker/ColorPickerDialog.java
diff --git a/src/com/chiralcode/colorpicker/ColorPickerPreference.java b/library/src/com/chiralcode/colorpicker/ColorPickerPreference.java
similarity index 100%
rename from src/com/chiralcode/colorpicker/ColorPickerPreference.java
rename to library/src/com/chiralcode/colorpicker/ColorPickerPreference.java
diff --git a/src/com/chiralcode/colorpicker/MultiColorPicker.java b/library/src/com/chiralcode/colorpicker/MultiColorPicker.java
similarity index 100%
rename from src/com/chiralcode/colorpicker/MultiColorPicker.java
rename to library/src/com/chiralcode/colorpicker/MultiColorPicker.java
diff --git a/project.properties b/project.properties
index a3ee5ab..2fecfaf 100644
--- a/project.properties
+++ b/project.properties
@@ -9,6 +9,4 @@
#
# 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=true
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..1012564
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include ':library'
+include ':demo'