diff --git a/README.md b/README.md index 2418a98..b180155 100644 --- a/README.md +++ b/README.md @@ -3,18 +3,18 @@ Onboarding library for android with Gradient, Image or Solid color backgrounds. ![](preview/preview.gif) -##Installation +## Installation -###Gradle +### Gradle Add it as a dependency in your app's build.gradle file ```groovy dependencies { - compile 'com.codemybrainsout.onboarding:onboarder:1.0.3' + compile 'com.codemybrainsout.onboarding:onboarder:1.0.4' } ``` -##How to use +## How to use **First of all, you will have to extend your activity like this** @@ -46,7 +46,7 @@ pages.add(ahoyOnboarderCard3); setOnboardPages(pages); ``` -###Choose from one of these three background types +### Choose from one of these three background types - **Gradient Background** ```java @@ -84,11 +84,11 @@ Typeface face = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Light.ttf"); setFont(face); ``` -###Landscape mode +### Landscape mode ![](preview/preview-landscape.png) -###Other properties +### Other properties ```java //Show/Hide navigation controls @@ -105,24 +105,24 @@ setFinishButtonTitle("Get Started"); setFinishButtonDrawableStyle(ContextCompat.getDrawable(this, R.drawable.rounded_button)); ``` -##Thanks +## Thanks * [dynamitechetan/Flowing-Gradient](https://github.com/dynamitechetan/Flowing-Gradient) * [chyrta/AndroidOnboarder](https://github.com/chyrta/AndroidOnboarder) -##Changelog +## Changelog -###v1.0.1 +### v1.0.1 Landscape layout by [Maxwell](https://github.com/wax911) -###v1.0.2 +### v1.0.2 FinishButtonDrawableStyle by [Maxwell](https://github.com/wax911) -##Support +## Support If you've any questions regarding this library, please contact us at help@codemybrainsout.com -##Credits +## Credits This project was initiated by **Code My Brains Out**. You can contribute to this project by submitting issues or/and by forking this repo and sending a pull request. @@ -134,7 +134,7 @@ Follow us on: Author: [Rahul Juneja](https://github.com/ahulr) -#License +# License ``` Copyright (C) 2016 Code My Brains Out diff --git a/app/build.gradle b/app/build.gradle index 9961e3d..89aa4b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.codemybrainsout.onboarding" minSdkVersion 15 targetSdkVersion 24 - versionCode 4 - versionName "1.0.3" + versionCode 5 + versionName "1.0.4" } buildTypes { release { diff --git a/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java b/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java index 333c550..7d3ecdf 100644 --- a/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java +++ b/app/src/main/java/com/codemybrainsout/onboarding/GradientBackgroundExampleActivity.java @@ -38,8 +38,8 @@ protected void onCreate(Bundle savedInstanceState) { for (AhoyOnboarderCard page : pages) { page.setTitleColor(R.color.white); page.setDescriptionColor(R.color.grey_200); - page.setTitleTextSize(dpToPixels(12, this)); - page.setDescriptionTextSize(dpToPixels(8, this)); + //page.setTitleTextSize(dpToPixels(12, this)); + //page.setDescriptionTextSize(dpToPixels(8, this)); //page.setIconLayoutParams(width, height, marginTop, marginLeft, marginRight, marginBottom); } diff --git a/build.gradle b/build.gradle index 8c41ef7..df4e931 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { } plugins { - id "com.jfrog.bintray" version "1.7" + id "com.jfrog.bintray" version "1.7.3" } allprojects { diff --git a/gradle.properties b/gradle.properties index a3ad87a..e44ebea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,7 +18,7 @@ # org.gradle.parallel=true GROUP=com.codemybrainsout.onboarding -VERSION_NAME=1.0.3 +VERSION_NAME=1.0.4 POM_DESCRIPTION=Onboarding library for android with Gradient, Image or Solid color backgrounds. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..54bcef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ceb82a9..2a5ac7f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 02 15:39:20 IST 2017 +#Fri Jul 28 19:57:08 IST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..4453cce 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then 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=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @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 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= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows 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. @@ -60,11 +59,6 @@ set _SKIP=2 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 diff --git a/onboarder/build.gradle b/onboarder/build.gradle index d55a029..381ea14 100644 --- a/onboarder/build.gradle +++ b/onboarder/build.gradle @@ -7,8 +7,8 @@ android { defaultConfig { minSdkVersion 15 targetSdkVersion 25 - versionCode 4 - versionName "1.0.3" + versionCode 5 + versionName "1.0.4" } buildTypes { release {