diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..603b140 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..82c96fc --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,38 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 29 + defaultConfig { + applicationId "xyz.sangcomz.indicatordecoratorsample" + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04' + implementation 'androidx.viewpager2:viewpager2:1.0.0-beta04' + + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation project(path: ':indicatordecorator') +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# 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 *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/xyz/sangcomz/indicatordecoratorsample/ExampleInstrumentedTest.kt b/app/src/androidTest/java/xyz/sangcomz/indicatordecoratorsample/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..04413d7 --- /dev/null +++ b/app/src/androidTest/java/xyz/sangcomz/indicatordecoratorsample/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package xyz.sangcomz.indicatordecoratorsample + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("xyz.sangcomz.indicatordecoratorsample", appContext.packageName) + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0dfc239 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/ListAdapter.kt b/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/ListAdapter.kt new file mode 100644 index 0000000..6c2b4a1 --- /dev/null +++ b/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/ListAdapter.kt @@ -0,0 +1,31 @@ +package xyz.sangcomz.indicatordecoratorsample + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView + +class ListAdapter(private val list: List>) : + RecyclerView.Adapter() { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + return ViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.item, parent, false)) + } + + override fun getItemCount() = list.size + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + holder.setData(list[position]) + } + + class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + private val container = itemView + private val textView = itemView.findViewById(R.id.textView) + + fun setData(data: Pair) { + container.setBackgroundColor(ContextCompat.getColor(container.context, data.first)) + textView.text = data.second + } + } +} \ No newline at end of file diff --git a/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/MainActivity.kt b/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/MainActivity.kt new file mode 100644 index 0000000..94dc18a --- /dev/null +++ b/app/src/main/java/xyz/sangcomz/indicatordecoratorsample/MainActivity.kt @@ -0,0 +1,38 @@ +package xyz.sangcomz.indicatordecoratorsample + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.recyclerview.widget.PagerSnapHelper +import kotlinx.android.synthetic.main.activity_main.* +import xyz.sangcomz.indicatordecorator.IndicatorItemDecoration +import xyz.sangcomz.indicatordecorator.LinePagerIndicatorDecoration + +class MainActivity : AppCompatActivity() { + + private val adapter: ListAdapter = ListAdapter( + listOf( + R.color.page1 to "page 1", + R.color.page2 to "page 2", + R.color.page3 to "page 3", + R.color.page4 to "page 4", + R.color.page5 to "page 5", + R.color.page6 to "page 6", + R.color.page7 to "page 7", + R.color.page8 to "page 8" + ) + ) + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + viewPager.adapter = adapter + viewPager.addItemDecoration(IndicatorItemDecoration()) +// viewPager.addItemDecoration(LinePagerIndicatorDecoration()) + + recyclerView.adapter = adapter + PagerSnapHelper().attachToRecyclerView(recyclerView) +// recyclerView.addItemDecoration(IndicatorItemDecoration()) + recyclerView.addItemDecoration(LinePagerIndicatorDecoration()) + } +} diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..1f6bb29 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..68a6c42 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,30 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item.xml b/app/src/main/res/layout/item.xml new file mode 100644 index 0000000..8ba86ac --- /dev/null +++ b/app/src/main/res/layout/item.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..898f3ed Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..dffca36 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..64ba76f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..dae5e08 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e5ed465 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..14ed0af Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..b0907ca Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..d8ae031 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c18de9 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..beed3cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..5786422 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,14 @@ + + + #008577 + #00574B + #D81B60 + #D81B5D + #C51BD8 + #1B3AD8 + #1BD8B2 + #3ED81B + #B5D81B + #D85D1B + #D81B1B + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..785935b --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + IndicatorDecorator + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/xyz/sangcomz/indicatordecoratorsample/ExampleUnitTest.kt b/app/src/test/java/xyz/sangcomz/indicatordecoratorsample/ExampleUnitTest.kt new file mode 100644 index 0000000..2ac2472 --- /dev/null +++ b/app/src/test/java/xyz/sangcomz/indicatordecoratorsample/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package xyz.sangcomz.indicatordecoratorsample + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..f729556 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + ext.kotlin_version = '1.3.50' + repositories { + google() + jcenter() + + } + dependencies { + classpath 'com.android.tools.build:gradle:3.5.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..23339e0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f 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..d6f0dcd --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Sep 22 15:00:26 KST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +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" -a "$nonstop" = "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"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # 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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 + +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 + +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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/indicatordecorator/.gitignore b/indicatordecorator/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/indicatordecorator/.gitignore @@ -0,0 +1 @@ +/build diff --git a/indicatordecorator/build.gradle b/indicatordecorator/build.gradle new file mode 100644 index 0000000..cf1ae15 --- /dev/null +++ b/indicatordecorator/build.gradle @@ -0,0 +1,36 @@ +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +android { + compileSdkVersion 29 + + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/indicatordecorator/consumer-rules.pro b/indicatordecorator/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/indicatordecorator/proguard-rules.pro b/indicatordecorator/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/indicatordecorator/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# 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 *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/indicatordecorator/src/androidTest/java/xyz/sangcomz/indicatordecorator/ExampleInstrumentedTest.kt b/indicatordecorator/src/androidTest/java/xyz/sangcomz/indicatordecorator/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..9507cb2 --- /dev/null +++ b/indicatordecorator/src/androidTest/java/xyz/sangcomz/indicatordecorator/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package xyz.sangcomz.indicatordecorator + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("xyz.sangcomz.indicatordecorator.test", appContext.packageName) + } +} diff --git a/indicatordecorator/src/main/AndroidManifest.xml b/indicatordecorator/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8ec8c8d --- /dev/null +++ b/indicatordecorator/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/IndicatorItemDecoration.kt b/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/IndicatorItemDecoration.kt new file mode 100644 index 0000000..4124a0e --- /dev/null +++ b/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/IndicatorItemDecoration.kt @@ -0,0 +1,113 @@ +package xyz.sangcomz.indicatordecorator + +import android.content.res.Resources +import android.graphics.Canvas +import android.graphics.Color +import android.graphics.Paint +import android.graphics.Rect +import android.view.View + +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView + +class IndicatorItemDecoration : RecyclerView.ItemDecoration() { + + private val colorActive = Color.BLACK + private val colorInactive = Color.GRAY + private val radius = (DP * 3.5).toFloat() + private val offset = (DP * 8).toInt() + + private var selectedPage = 0 + + /** + * Indicator width. + */ + private val mIndicatorItemLength = radius * 2 + /** + * Padding between indicators. + */ + private val mIndicatorItemPadding = DP * 4 + + private val mPaint = Paint() + + init { + mPaint.strokeCap = Paint.Cap.ROUND + mPaint.isAntiAlias = true + } + + override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { + super.onDrawOver(c, parent, state) + + val adapter = parent.adapter ?: return + + val itemCount = adapter.itemCount + + val totalLength = mIndicatorItemLength * itemCount + val paddingBetweenItems = Math.max(0, itemCount - 1) * mIndicatorItemPadding + val indicatorTotalWidth = totalLength + paddingBetweenItems + val indicatorStartX = (parent.width - indicatorTotalWidth) / 2f + + val indicatorPosY = parent.height - radius + + drawInactiveIndicators(c, indicatorStartX, indicatorPosY, itemCount) + + val layoutManager = parent.layoutManager as? LinearLayoutManager + val activePosition = layoutManager?.findFirstVisibleItemPosition() + if (activePosition == RecyclerView.NO_POSITION) { + return + } + + val view = layoutManager?.findViewByPosition(activePosition!!)!! + println("activeView width, left:::: ${view.width}, ${view.left}") + println("activeView width + left:::: ${view.width + view.left}") + + selectedPage = activePosition ?: 0 + if (view.width / 2 > view.width + view.left) 1 else 0 + + println("selectedPage :::: $selectedPage") + +// if (layoutManager?.findLastVisibleItemPosition() != RecyclerView.NO_POSITION) { +// selectedPage = layoutManager?.findLastVisibleItemPosition() ?: 0 +// } + + drawSelectedIndicators(c, indicatorStartX, indicatorPosY) + } + + private fun drawInactiveIndicators( + c: Canvas, + indicatorStartX: Float, + indicatorPosY: Float, + itemCount: Int + ) { + mPaint.color = colorInactive + + val itemWidth = mIndicatorItemLength + mIndicatorItemPadding + + var start = indicatorStartX + for (i in 0 until itemCount) { + c.drawCircle(start + radius, indicatorPosY, radius, mPaint) + start += itemWidth + } + } + + private fun drawSelectedIndicators(c: Canvas, indicatorStartX: Float, indicatorPosY: Float) { + mPaint.color = colorActive + val itemWidth = mIndicatorItemLength + mIndicatorItemPadding + val start = indicatorStartX + itemWidth * selectedPage + c.drawCircle(start + radius, indicatorPosY, radius, mPaint) + } + + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { + super.getItemOffsets(outRect, view, parent, state) + outRect.bottom = (offset + radius).toInt() + } + + companion object { + + private val DP = Resources.getSystem().displayMetrics.density + } +} \ No newline at end of file diff --git a/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/LinePagerIndicatorDecoration.kt b/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/LinePagerIndicatorDecoration.kt new file mode 100644 index 0000000..834c70c --- /dev/null +++ b/indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/LinePagerIndicatorDecoration.kt @@ -0,0 +1,159 @@ +package xyz.sangcomz.indicatordecorator + + +import android.content.res.Resources +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Rect +import android.view.View +import android.view.animation.AccelerateDecelerateInterpolator +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView + +class LinePagerIndicatorDecoration : RecyclerView.ItemDecoration() { + + private val colorActive = -0x1 + private val colorInactive = 0x66FFFFFF + + /** + * Height of the space the indicator takes up at the bottom of the view. + */ + private val mIndicatorHeight = (DP * 16).toInt() + + /** + * Indicator stroke width. + */ + private val mIndicatorStrokeWidth = DP * 2 + + /** + * Indicator width. + */ + private val mIndicatorItemLength = DP * 16 + /** + * Padding between indicators. + */ + private val mIndicatorItemPadding = DP * 4 + + /** + * Some more natural animation interpolation + */ + private val mInterpolator = AccelerateDecelerateInterpolator() + + private val mPaint = Paint() + + init { + mPaint.strokeCap = Paint.Cap.ROUND + mPaint.strokeWidth = mIndicatorStrokeWidth + mPaint.style = Paint.Style.STROKE + mPaint.isAntiAlias = true + } + + override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { + super.onDrawOver(c, parent, state) + + val itemCount = parent.adapter!!.itemCount + + // center horizontally, calculate width and subtract half from center + val totalLength = mIndicatorItemLength * itemCount + val paddingBetweenItems = Math.max(0, itemCount - 1) * mIndicatorItemPadding + val indicatorTotalWidth = totalLength + paddingBetweenItems + val indicatorStartX = (parent.width - indicatorTotalWidth) / 2f + + // center vertically in the allotted space + val indicatorPosY = parent.height - mIndicatorHeight / 2f + + drawInactiveIndicators(c, indicatorStartX, indicatorPosY, itemCount) + + + // find active page (which should be highlighted) + val layoutManager = parent.layoutManager as LinearLayoutManager? + val activePosition = layoutManager!!.findFirstVisibleItemPosition() + if (activePosition == RecyclerView.NO_POSITION) { + return + } + + println("findFirstVisibleItemPosition :::: $activePosition") + // find offset of active page (if the user is scrolling) + val activeChild = layoutManager.findViewByPosition(activePosition) + val left = activeChild!!.left + val width = activeChild.width + + // on swipe the active item will be positioned from [-width, 0] + // interpolate offset for smooth animation + val progress = mInterpolator.getInterpolation(left * -1 / width.toFloat()) + + drawHighlights(c, indicatorStartX, indicatorPosY, activePosition, progress, itemCount) + } + + private fun drawInactiveIndicators( + c: Canvas, + indicatorStartX: Float, + indicatorPosY: Float, + itemCount: Int + ) { + mPaint.color = colorInactive + + // width of item indicator including padding + val itemWidth = mIndicatorItemLength + mIndicatorItemPadding + + var start = indicatorStartX + for (i in 0 until itemCount) { + // draw the line for every item + c.drawLine(start, indicatorPosY, start + mIndicatorItemLength, indicatorPosY, mPaint) + start += itemWidth + } + } + + private fun drawHighlights( + c: Canvas, indicatorStartX: Float, indicatorPosY: Float, + highlightPosition: Int, progress: Float, itemCount: Int + ) { + mPaint.color = colorActive + + // width of item indicator including padding + val itemWidth = mIndicatorItemLength + mIndicatorItemPadding + + if (progress == 0f) { + // no swipe, draw a normal indicator + val highlightStart = indicatorStartX + itemWidth * highlightPosition + c.drawLine( + highlightStart, indicatorPosY, + highlightStart + mIndicatorItemLength, indicatorPosY, mPaint + ) + } else { + var highlightStart = indicatorStartX + itemWidth * highlightPosition + // calculate partial highlight + val partialLength = mIndicatorItemLength * progress + + // draw the cut off highlight + c.drawLine( + highlightStart + partialLength, indicatorPosY, + highlightStart + mIndicatorItemLength, indicatorPosY, mPaint + ) + + // draw the highlight overlapping to the next item as well + if (highlightPosition < itemCount - 1) { + highlightStart += itemWidth + c.drawLine( + highlightStart, indicatorPosY, + highlightStart + partialLength, indicatorPosY, mPaint + ) + } + } + } + + override fun getItemOffsets( + outRect: Rect, + view: View, + parent: RecyclerView, + state: RecyclerView.State + ) { + super.getItemOffsets(outRect, view, parent, state) + outRect.bottom = mIndicatorHeight + } + + companion object { + + private val DP = Resources.getSystem().displayMetrics.density + } +} \ No newline at end of file diff --git a/indicatordecorator/src/main/res/values/strings.xml b/indicatordecorator/src/main/res/values/strings.xml new file mode 100644 index 0000000..785935b --- /dev/null +++ b/indicatordecorator/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + IndicatorDecorator + diff --git a/indicatordecorator/src/test/java/xyz/sangcomz/indicatordecorator/ExampleUnitTest.kt b/indicatordecorator/src/test/java/xyz/sangcomz/indicatordecorator/ExampleUnitTest.kt new file mode 100644 index 0000000..22e2a5d --- /dev/null +++ b/indicatordecorator/src/test/java/xyz/sangcomz/indicatordecorator/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package xyz.sangcomz.indicatordecorator + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..32f0175 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ':app', ':indicatordecorator' +rootProject.name='IndicatorDecorator'