diff --git a/.gitignore b/.gitignore index 520a863..140c5ac 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,6 @@ google-services.json freeline.py freeline/ freeline_project_description.json + +\.idea/ +.gradle/ 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..91713f0 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 27 + defaultConfig { + applicationId "com.tsurkis.timdicatorsampleapp" + minSdkVersion 14 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + compile project(':timdicator') + implementation 'com.android.support:appcompat-v7:27.0.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' +} 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/com/tsurkis/timdicatorsampleapp/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/tsurkis/timdicatorsampleapp/ExampleInstrumentedTest.java new file mode 100644 index 0000000..999555a --- /dev/null +++ b/app/src/androidTest/java/com/tsurkis/timdicatorsampleapp/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.tsurkis.timdicatorsampleapp; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.tsurkis.timdicatorsampleapp", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8b4bf90 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/tsurkis/timdicatorsampleapp/MainActivity.java b/app/src/main/java/com/tsurkis/timdicatorsampleapp/MainActivity.java new file mode 100644 index 0000000..6ed936e --- /dev/null +++ b/app/src/main/java/com/tsurkis/timdicatorsampleapp/MainActivity.java @@ -0,0 +1,35 @@ +package com.tsurkis.timdicatorsampleapp; + +import android.os.Bundle; +import android.support.v4.view.ViewPager; +import android.support.v7.app.AppCompatActivity; + +import com.tsurkis.timdicator.Timdicator; + +import java.util.ArrayList; +import java.util.List; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + ViewPager viewPager = findViewById(R.id.view_pager); + viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), getDataCollectionOfColors())); + + Timdicator indicator = findViewById(R.id.indicatorNew); + indicator.attachDynamically(viewPager); + } + + + + private List getDataCollectionOfColors() { + List colors = new ArrayList<>(); + colors.add("#910505"); + colors.add("#74f441"); + colors.add("#f4bb41"); + return colors; + } +} diff --git a/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerAdapter.java b/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerAdapter.java new file mode 100644 index 0000000..8fce340 --- /dev/null +++ b/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerAdapter.java @@ -0,0 +1,38 @@ +package com.tsurkis.timdicatorsampleapp; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentStatePagerAdapter; + +import java.util.List; + +/** + * Created by T.Surkis on 12/24/17. + */ +public class PagerAdapter extends FragmentStatePagerAdapter { + private List fragmentColors; + + public PagerAdapter(FragmentManager fm, List colors) { + super(fm); + + this.fragmentColors = colors; + } + + @Override + public Fragment getItem(int position) { + PagerFragment pagerFragment = new PagerFragment(); + + Bundle bundle = new Bundle(); + bundle.putString(PagerFragment.KEY_COLOR, fragmentColors.get(position)); + + pagerFragment.setArguments(bundle); + + return pagerFragment; + } + + @Override + public int getCount() { + return fragmentColors.size(); + } +} diff --git a/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerFragment.java b/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerFragment.java new file mode 100644 index 0000000..3759c3c --- /dev/null +++ b/app/src/main/java/com/tsurkis/timdicatorsampleapp/PagerFragment.java @@ -0,0 +1,42 @@ +package com.tsurkis.timdicatorsampleapp; + +import android.graphics.Color; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +/** + * Created by T.Surkis on 12/24/17. + */ +public class PagerFragment extends Fragment { + public static final String KEY_COLOR = "com.tsurkis.indicatororiginal.PagerFragment.color_bundle_key"; + + @Nullable + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_page, container, false); + } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + + if (getArguments() != null && getArguments().containsKey(KEY_COLOR)) { + String color = getArguments().getString(KEY_COLOR); + + TextView colorTextView = view.findViewById(R.id.color_text_view); + if (colorTextView != null) { + colorTextView.setText(color); + } + + ViewGroup container = view.findViewById(R.id.container); + if (container != null) { + container.setBackgroundColor(Color.parseColor(color)); + } + } + } +} 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..c7bd21d --- /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..d5fccc5 --- /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..d86017e --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_page.xml b/app/src/main/res/layout/fragment_page.xml new file mode 100644 index 0000000..cca5c53 --- /dev/null +++ b/app/src/main/res/layout/fragment_page.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file 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..a2f5908 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..1b52399 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..ff10afd 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..115a4c7 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..dcd3cd8 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..459ca60 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..8ca12fe 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..8e19b41 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..b824ebd 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..4c19a13 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..309fac8 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,9 @@ + + + #3F51B5 + #303F9F + #FF4081 + + #ffffff + #1e7909 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..c62c132 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + TimdicatorSampleApp + 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/com/tsurkis/timdicatorsampleapp/ExampleUnitTest.java b/app/src/test/java/com/tsurkis/timdicatorsampleapp/ExampleUnitTest.java new file mode 100644 index 0000000..a49f93f --- /dev/null +++ b/app/src/test/java/com/tsurkis/timdicatorsampleapp/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.tsurkis.timdicatorsampleapp; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..920dc6f --- /dev/null +++ b/build.gradle @@ -0,0 +1,22 @@ +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0' + } +} + +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..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# 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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae 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..95b0e0e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jan 12 12:44:54 IST 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/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 + +# 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. +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"` + 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 + +# 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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..716928d --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app', ':timdicator' diff --git a/timdicator/.gitignore b/timdicator/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/timdicator/.gitignore @@ -0,0 +1 @@ +/build diff --git a/timdicator/build.gradle b/timdicator/build.gradle new file mode 100644 index 0000000..cd93208 --- /dev/null +++ b/timdicator/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' +group='com.github.TSurkis' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 27 + versionCode 1 + versionName "1.0.0" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + compileOnly 'com.android.support:appcompat-v7:27.0.2' +} diff --git a/timdicator/proguard-rules.pro b/timdicator/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/timdicator/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/timdicator/src/main/AndroidManifest.xml b/timdicator/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c251061 --- /dev/null +++ b/timdicator/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/timdicator/src/main/java/com/tsurkis/timdicator/Timdicator.java b/timdicator/src/main/java/com/tsurkis/timdicator/Timdicator.java new file mode 100644 index 0000000..54ec70b --- /dev/null +++ b/timdicator/src/main/java/com/tsurkis/timdicator/Timdicator.java @@ -0,0 +1,397 @@ +package com.tsurkis.timdicator; + +import android.annotation.TargetApi; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.support.v4.view.ViewPager; +import android.util.AttributeSet; +import android.view.View; + +import java.lang.ref.WeakReference; + +/** + * Lightweight indicator class for ViewPager. + * + * Created by T.Surkis. + */ +public class Timdicator extends View { + private static final int DEFAULT_CHOSEN_CIRCLE_COLOR = Color.parseColor("#ffffff"), DEFAULT_CIRCLE_COLOR = Color.parseColor("#000000"); + private static final int DEFAULT_DISTANCE_BETWEEN_CIRCLES_IN_DP = 5, DEFAULT_CIRCLE_RADIUS_IN_DP = 5, DEFAULT_NUMBER_OF_CIRCLES = 0; + + private Paint defaultCirclePaint, chosenCirclePaint; + + private float circleRadiusInPX, distanceBetweenCircleInPX; + + private int numberOfCircles; + + private float[] circleLocations; + private float yLocation; + + private int currentIndex = 0; + + public Timdicator(Context context) { + super(context); + + initializeParameters(context, null); + } + + public Timdicator(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + + initializeParameters(context, attrs); + } + + public Timdicator(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + + initializeParameters(context, attrs); + } + + @TargetApi(21) + public Timdicator(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + + initializeParameters(context, attrs); + } + + /** + * All the constructor parameters are routed to this method for a unified initialization. + * + * @param context + * @param attributes + */ + private void initializeParameters(Context context, AttributeSet attributes) { + int chosenCircleColor; + int circleColor; + + if (attributes != null) { + /* + custom attribute extraction + */ + TypedArray attributeArray = context.obtainStyledAttributes(attributes, R.styleable.Timdicator); + + circleRadiusInPX = + attributeArray.getDimension( + R.styleable.Timdicator_circle_radius, + dpToPx(context, DEFAULT_CIRCLE_RADIUS_IN_DP)); + + distanceBetweenCircleInPX = + attributeArray.getDimension( + R.styleable.Timdicator_distance_between_circles, + dpToPx(context, DEFAULT_DISTANCE_BETWEEN_CIRCLES_IN_DP)); + + numberOfCircles = + attributeArray.getInt( + R.styleable.Timdicator_number_of_circles, + DEFAULT_NUMBER_OF_CIRCLES); + + chosenCircleColor = + attributeArray.getColor( + R.styleable.Timdicator_chosen_circle_color, + DEFAULT_CHOSEN_CIRCLE_COLOR); + + circleColor = + attributeArray.getColor( + R.styleable.Timdicator_default_circle_color, + DEFAULT_CIRCLE_COLOR); + + attributeArray.recycle(); + } else { + /* + default value initialization + */ + circleRadiusInPX = dpToPx(context, DEFAULT_CIRCLE_RADIUS_IN_DP); + distanceBetweenCircleInPX = dpToPx(context, DEFAULT_DISTANCE_BETWEEN_CIRCLES_IN_DP); + numberOfCircles = DEFAULT_NUMBER_OF_CIRCLES; + chosenCircleColor = DEFAULT_CHOSEN_CIRCLE_COLOR; + circleColor = DEFAULT_CIRCLE_COLOR; + } + + /* + paint objects initialization + */ + + if (defaultCirclePaint == null) { + defaultCirclePaint = new Paint(Paint.ANTI_ALIAS_FLAG); + defaultCirclePaint.setColor(circleColor); + defaultCirclePaint.setStyle(Paint.Style.FILL); + } + + if (chosenCirclePaint == null) { + chosenCirclePaint = new Paint(Paint.ANTI_ALIAS_FLAG); + chosenCirclePaint.setColor(chosenCircleColor); + chosenCirclePaint.setStyle(Paint.Style.FILL); + } + } + + /* + ****************************************************************************************** + + Drawing + + ****************************************************************************************** + */ + + /** + * Through iteration on our x coordinate array {X1, X2, ... ,Xn} the method draws + * the circle - one that represents the current page and a default circle. + * + * @param canvas + */ + @Override + protected void onDraw(Canvas canvas) { + if (circleLocations != null && circleLocations.length != 0) { + for (int i = 0; i < numberOfCircles; ++i) { + if (i == currentIndex) { + canvas.drawCircle(circleLocations[i], yLocation, circleRadiusInPX, chosenCirclePaint); + } else { + canvas.drawCircle(circleLocations[i], yLocation, circleRadiusInPX, defaultCirclePaint); + } + } + } + } + + /* + ****************************************************************************************** + + Measurements + + ****************************************************************************************** + */ + + /** + * Measurements. + * + * The y coordinate will always be in the middle of the view height. + * + * @param widthMeasureSpec + * @param heightMeasureSpec + */ + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + boolean isMatchParentFlagOn = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY; + measureIndicesOfIndicatorStations(isMatchParentFlagOn); + + int measuredWidth = numberOfCircles > 0 ? measureWidth(widthMeasureSpec) : 0; + int measuredHeight = numberOfCircles > 0 ? measureHeight(heightMeasureSpec) : 0; + + yLocation = measuredHeight / 2; + + setMeasuredDimension(measuredWidth, measuredHeight); + } + + /** + * Retrieves the desired height by the view. + * + * @param measureSpec + * @return + */ + private int measureHeight(int measureSpec) { + + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + int result; + if (specMode == MeasureSpec.EXACTLY) { + result = specSize; + } else { + result = (int) (circleRadiusInPX * 2 + getPaddingTop() + getPaddingBottom()); + } + + return result; + } + + /** + * Retrieves the desired width by the view. + * + * @param measureSpec + * @return + */ + private int measureWidth(int measureSpec) { + + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + int result; + if (specMode == MeasureSpec.EXACTLY) { + result = specSize; + } else { + result = (int) (circleLocations[numberOfCircles-1] + circleRadiusInPX + getPaddingRight()); + } + + return result; + } + + /** + * Measures and saves the X coordinates for each given circle. + * + * @param shouldAddScreenOffset - a special parameter in case the view needs to + * be at the width of the entire container. + * + * shouldAddScreenOffset = false + * ******************************************************************************* + * + * padding radius space radius padding + * |-------||------*------||-----|...|------*------||-------| + * X1 Xn + * + * + * + * shouldAddScreenOffset = true + * ******************************************************************************* + * + * padding radius space radius padding + * |-------||------*------||-----|...|------*------||-------| + * X1 Xn + * |----------------------------------------------------------------------------| + * container width + * remaining space + * |-------------------| + * + * + * As a choice of aesthetics, if the view needs to match the container width, + * it would be centered. + * This is done by taking the remaining piece of the width and dividing it by half. + * Each half is added to each side of the view. + * + * + * + * piece1 padding radius space radius padding piece2 + * |--------||-------||------*------||-----|...|------*------||-------||--------| + * X1 Xn + * |----------------------------------------------------------------------------| + * container width + * + * ******************************************************************************* + * + * n = number of circles + * + * {X1, X2, ..., Xn} = array representing the X coordinate of each circle center + * + */ + private void measureIndicesOfIndicatorStations(boolean shouldAddScreenOffset) { + if (numberOfCircles > 0) { + circleLocations = new float[numberOfCircles]; + + float xCounter = getPaddingLeft() + circleRadiusInPX; + float spaceBetweenCircles = circleRadiusInPX * 2 + distanceBetweenCircleInPX; + + for (int index = 0; index < numberOfCircles; index++) { + circleLocations[index] = xCounter; + + xCounter += spaceBetweenCircles; + } + + if (shouldAddScreenOffset) { + int screenWidth = getContext().getResources().getDisplayMetrics().widthPixels; + int widthOfView = (int) (circleLocations[numberOfCircles-1] + circleRadiusInPX + getPaddingRight()); + int spaceToAddFromEachSide = (screenWidth - widthOfView) / 2; + + for (int index = 0; index < circleLocations.length; index++) { + circleLocations[index] += spaceToAddFromEachSide; + } + } + } + } + + /* + ****************************************************************************************** + + Binding + + ****************************************************************************************** + */ + + /** + * Reference to the corresponding ViewPager is saved to effectively remove the observer + * when the view dies. + */ + private WeakReference boundViewPager; + + /** + * Observer for the page change events of the ViewPager. + * When a page changes, the index will be replaced and the entire view will be redrawn by + * calling invalidate(). + */ + private final ViewPager.OnPageChangeListener pageChangeObserver = new ViewPager.OnPageChangeListener() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + + } + + @Override + public void onPageSelected(int position) { + Timdicator.this.currentIndex = position; + invalidate(); + } + + @Override + public void onPageScrollStateChanged(int state) { + + } + }; + + /** + * Attaches the view to the ViewPager page observing events. + * + * @param viewPager + */ + public void attach(@NonNull ViewPager viewPager) { + + if (numberOfCircles != 0) { + boundViewPager = new WeakReference<>(viewPager); + viewPager.addOnPageChangeListener(pageChangeObserver); + } + } + /** + * Attaches the view to the ViewPager page observing events. + * + * A dynamic method that allows the ViewPager dictate the number of circles instead of an + * attribute. Consequently, If the number of circles does not match the number of pages, the view + * will adjust itself accordingly. + * + * @param viewPager + */ + public void attachDynamically(@NonNull ViewPager viewPager) { + if (viewPager.getAdapter() != null && viewPager.getAdapter().getCount() != numberOfCircles) { + numberOfCircles = viewPager.getAdapter().getCount(); + requestLayout(); + } + + attach(viewPager); + } + + /** + * On detachment the view will remove its listener from the ViewPager. + */ + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + + if (boundViewPager != null && boundViewPager.get() != null) { + boundViewPager.get().removeOnPageChangeListener(pageChangeObserver); + } + } + + /* + ****************************************************************************************** + + Helper Methods + + ****************************************************************************************** + */ + + /** + * Helper method to convert dp values to pixel values. + * + * @param context + * @param value + * @return + */ + private static float dpToPx(final Context context, final float value) { + return value * context.getResources().getDisplayMetrics().density; + } +} diff --git a/timdicator/src/main/res/values/attr.xml b/timdicator/src/main/res/values/attr.xml new file mode 100644 index 0000000..ef8d332 --- /dev/null +++ b/timdicator/src/main/res/values/attr.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/timdicator/src/main/res/values/strings.xml b/timdicator/src/main/res/values/strings.xml new file mode 100644 index 0000000..a6f1f81 --- /dev/null +++ b/timdicator/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Timdicator +