diff --git a/build.gradle b/build.gradle index e98e660..82c18d4 100644 --- a/build.gradle +++ b/build.gradle @@ -5,20 +5,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+' + classpath 'com.android.tools.build:gradle:0.13.0' } } -ext { - compileSdkVersion = 19 - buildToolsVersion = "19.1.0" -} - -def isReleaseBuild() { - return version.contains("SNAPSHOT") == false -} - allprojects { version = VERSION_NAME group = GROUP diff --git a/example/build.gradle b/example/build.gradle index 1dd72de..bd1f716 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,26 +1,15 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} -apply plugin: 'android' - -repositories { - mavenCentral() -} +apply plugin: 'com.android.application' android { - compileSdkVersion 19 - buildToolsVersion "19.1" + + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 11 - targetSdkVersion 19 - versionCode 1 - versionName "1.0" + minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) + targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + versionName project.VERSION_NAME + versionCode Integer.parseInt(project.VERSION_CODE) } buildTypes { @@ -32,7 +21,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - compile 'com.android.support:appcompat-v7:19.1.0' - compile 'com.github.markushi:circlebutton:1.1' + compile 'com.android.support:appcompat-v7:20.0.0' + compile project(':library') } diff --git a/example/src/main/res/layout/fragment_main.xml b/example/src/main/res/layout/fragment_main.xml index 1e584ec..ae4514c 100644 --- a/example/src/main/res/layout/fragment_main.xml +++ b/example/src/main/res/layout/fragment_main.xml @@ -1,45 +1,32 @@ - + - + - + - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f8fe10f..2d993e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,7 @@ VERSION_NAME=1.1 VERSION_CODE=2 GROUP=com.github.markushi -POM_DESCRIPTION=Circle Button Android Library -POM_URL=https://github.com/markushi/android-circlebutton -POM_SCM_URL=https://github.com/markushi/android-circlebutton -POM_SCM_CONNECTION=scm:git@github.com:markushi/android-circlebutton.git -POM_SCM_DEV_CONNECTION=scm:git@github.com:markushi/android-circlebutton.git -POM_LICENCE_NAME=The Apache Software License, Version 2.0 -POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt -POM_LICENCE_DIST=repo -POM_DEVELOPER_ID=markushi -POM_DEVELOPER_NAME=Markus Hintersteiner +ANDROID_BUILD_MIN_SDK_VERSION=11 +ANDROID_BUILD_TARGET_SDK_VERSION=20 +ANDROID_BUILD_SDK_VERSION=20 +ANDROID_BUILD_TOOLS_VERSION=20.0.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8c0fb64 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..bc32b32 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Oct 04 11:42:44 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100644 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..8a0b282 --- /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/build.gradle b/library/build.gradle index e870fdb..493f28d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,31 +1,24 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:0.12.+' - } -} - -apply plugin: 'android-sdk-manager' -apply plugin: 'android-library' - -repositories { - mavenCentral() -} +apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion "19.1" + + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { - versionName = VERSION_NAME - versionCode = VERSION_CODE + applicationId "at.markushi.circlebutton" + minSdkVersion 11 + targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) + versionName project.VERSION_NAME + versionCode Integer.parseInt(project.VERSION_CODE) } } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar', '*.aar']) +} + +def isReleaseBuild() { + return version.contains("SNAPSHOT") == false } apply from: '../maven.gradle' diff --git a/library/gradle.properties b/library/gradle.properties index 3a49069..8f6312e 100644 --- a/library/gradle.properties +++ b/library/gradle.properties @@ -1,3 +1,13 @@ POM_NAME=Circle Button Android Library POM_ARTIFACT_ID=circlebutton POM_PACKAGING=aar +POM_DESCRIPTION=Circle Button Android Library +POM_URL=https://github.com/markushi/android-circlebutton +POM_SCM_URL=https://github.com/markushi/android-circlebutton +POM_SCM_CONNECTION=scm:git@github.com:markushi/android-circlebutton.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:markushi/android-circlebutton.git +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=markushi +POM_DEVELOPER_NAME=Markus Hintersteiner diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 9b78cc3..a8e338f 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,9 +1,2 @@ - - - - - + diff --git a/library/src/main/java/at/markushi/ui/CircleButton.java b/library/src/main/java/at/markushi/ui/CircleButton.java index 0e0ca84..110c7c5 100644 --- a/library/src/main/java/at/markushi/ui/CircleButton.java +++ b/library/src/main/java/at/markushi/ui/CircleButton.java @@ -14,134 +14,138 @@ public class CircleButton extends ImageView { - private static final int PRESSED_COLOR_LIGHTUP = 255 / 25; - private static final int PRESSED_RING_ALPHA = 75; - private static final int DEFAULT_PRESSED_RING_WIDTH_DIP = 4; - private static final int ANIMATION_TIME_ID = android.R.integer.config_shortAnimTime; - - private int centerY; - private int centerX; - private int outerRadius; - private int pressedRingRadius; - - private Paint circlePaint; - private Paint focusPaint; - - private float animationProgress; - - private int pressedRingWidth; - private int defaultColor = Color.BLACK; - private int pressedColor; - private ObjectAnimator pressedAnimator; - - public CircleButton(Context context) { - super(context); - init(context, null); - } - - public CircleButton(Context context, AttributeSet attrs) { - super(context, attrs); - init(context, attrs); - } - - public CircleButton(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - init(context, attrs); - } - - @Override - public void setPressed(boolean pressed) { - super.setPressed(pressed); - - if (circlePaint != null) { - circlePaint.setColor(pressed ? pressedColor : defaultColor); - } - - if (pressed) { - showPressedRing(); - } else { - hidePressedRing(); - } - } - - @Override - protected void onDraw(Canvas canvas) { - canvas.drawCircle(centerX, centerY, pressedRingRadius + animationProgress, focusPaint); - canvas.drawCircle(centerX, centerY, outerRadius - pressedRingWidth, circlePaint); - super.onDraw(canvas); - } - - @Override - protected void onSizeChanged(int w, int h, int oldw, int oldh) { - super.onSizeChanged(w, h, oldw, oldh); - centerX = w / 2; - centerY = h / 2; - outerRadius = Math.min(w, h) / 2; - pressedRingRadius = outerRadius - pressedRingWidth - pressedRingWidth / 2; - } - - public float getAnimationProgress() { - return animationProgress; - } - - public void setAnimationProgress(float animationProgress) { - this.animationProgress = animationProgress; - this.invalidate(); - } - - public void setColor(int color) { - this.defaultColor = color; - this.pressedColor = getHighlightColor(color, PRESSED_COLOR_LIGHTUP); - - circlePaint.setColor(defaultColor); - focusPaint.setColor(defaultColor); - focusPaint.setAlpha(PRESSED_RING_ALPHA); - - this.invalidate(); - } - - private void hidePressedRing() { - pressedAnimator.setFloatValues(pressedRingWidth, 0f); - pressedAnimator.start(); - } - - private void showPressedRing() { - pressedAnimator.setFloatValues(animationProgress, pressedRingWidth); - pressedAnimator.start(); - } - - private void init(Context context, AttributeSet attrs) { - this.setFocusable(true); - this.setScaleType(ScaleType.CENTER_INSIDE); - setClickable(true); - - circlePaint = new Paint(Paint.ANTI_ALIAS_FLAG); - circlePaint.setStyle(Paint.Style.FILL); - - focusPaint = new Paint(Paint.ANTI_ALIAS_FLAG); - focusPaint.setStyle(Paint.Style.STROKE); - - pressedRingWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_PRESSED_RING_WIDTH_DIP, getResources() - .getDisplayMetrics()); - - int color = Color.BLACK; - if (attrs != null) { - final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CircleButton); - color = a.getColor(R.styleable.CircleButton_cb_color, color); - pressedRingWidth = (int) a.getDimension(R.styleable.CircleButton_cb_pressedRingWidth, pressedRingWidth); - a.recycle(); - } - - setColor(color); - - focusPaint.setStrokeWidth(pressedRingWidth); - final int pressedAnimationTime = getResources().getInteger(ANIMATION_TIME_ID); - pressedAnimator = ObjectAnimator.ofFloat(this, "animationProgress", 0f, 0f); - pressedAnimator.setDuration(pressedAnimationTime); - } - - private int getHighlightColor(int color, int amount) { - return Color.argb(Math.min(255, Color.alpha(color)), Math.min(255, Color.red(color) + amount), - Math.min(255, Color.green(color) + amount), Math.min(255, Color.blue(color) + amount)); - } + private static final int PRESSED_COLOR_LIGHTUP = 255 / 25; + private static final int DISABLED_COLOR_LIGHTUP = 3 * 255 / 25; + private static final int PRESSED_RING_ALPHA = 75; + private static final int DEFAULT_PRESSED_RING_WIDTH_DIP = 4; + private static final int ANIMATION_TIME_ID = android.R.integer.config_shortAnimTime; + + private int centerY; + private int centerX; + private int outerRadius; + private int pressedRingRadius; + + private Paint circlePaint; + private Paint focusPaint; + + private float animationProgress; + + private int pressedRingWidth; + private int defaultColor = Color.BLACK; + private int pressedColor; + private ObjectAnimator pressedAnimator; + + public CircleButton(Context context) { + super(context); + init(context, null); + } + + public CircleButton(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs); + } + + public CircleButton(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + init(context, attrs); + } + + @Override + public void setPressed(boolean pressed) { + super.setPressed(pressed); + + if (circlePaint != null) { + circlePaint.setColor(pressed ? pressedColor : defaultColor); + } + if (pressed) { + pressedAnimator.setFloatValues(animationProgress, pressedRingWidth); + pressedAnimator.start(); + } else if (0 != animationProgress) { + pressedAnimator.setFloatValues(pressedRingWidth, 0f); + pressedAnimator.start(); + } + } + + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + + if (enabled) { + circlePaint.setColor(defaultColor); + } else { + circlePaint.setColor(getHighlightColor(defaultColor, DISABLED_COLOR_LIGHTUP)); + } + invalidate(); + } + + @Override + protected void onDraw(Canvas canvas) { + canvas.drawCircle(centerX, centerY, pressedRingRadius + animationProgress, focusPaint); + canvas.drawCircle(centerX, centerY, outerRadius - pressedRingWidth, circlePaint); + super.onDraw(canvas); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + centerX = w / 2; + centerY = h / 2; + outerRadius = Math.min(w, h) / 2; + pressedRingRadius = outerRadius - pressedRingWidth - pressedRingWidth / 2; + } + + public float getAnimationProgress() { + return animationProgress; + } + + public void setAnimationProgress(float animationProgress) { + this.animationProgress = animationProgress; + this.invalidate(); + } + + public void setColor(int color) { + this.defaultColor = color; + this.pressedColor = getHighlightColor(color, PRESSED_COLOR_LIGHTUP); + + circlePaint.setColor(defaultColor); + focusPaint.setColor(defaultColor); + focusPaint.setAlpha(PRESSED_RING_ALPHA); + + this.invalidate(); + } + + private void init(Context context, AttributeSet attrs) { + this.setFocusable(true); + this.setScaleType(ScaleType.CENTER_INSIDE); + setClickable(true); + + circlePaint = new Paint(Paint.ANTI_ALIAS_FLAG); + circlePaint.setStyle(Paint.Style.FILL); + + focusPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + focusPaint.setStyle(Paint.Style.STROKE); + + pressedRingWidth = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_PRESSED_RING_WIDTH_DIP, getResources() + .getDisplayMetrics()); + + int color = Color.BLACK; + if (attrs != null) { + final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CircleButton); + color = a.getColor(R.styleable.CircleButton_cb_color, color); + pressedRingWidth = (int) a.getDimension(R.styleable.CircleButton_cb_pressedRingWidth, pressedRingWidth); + a.recycle(); + } + + setColor(color); + + focusPaint.setStrokeWidth(pressedRingWidth); + final int pressedAnimationTime = getResources().getInteger(ANIMATION_TIME_ID); + pressedAnimator = ObjectAnimator.ofFloat(this, "animationProgress", 0f, 0f); + pressedAnimator.setDuration(pressedAnimationTime); + } + + private int getHighlightColor(int color, int amount) { + return Color.argb(Math.min(255, Color.alpha(color)), Math.min(255, Color.red(color) + amount), + Math.min(255, Color.green(color) + amount), Math.min(255, Color.blue(color) + amount)); + } }