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..6689a9f --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,31 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + defaultConfig { + applicationId "com.github.glomadrian.gravball" + minSdkVersion 16 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile project (':grav') + testCompile 'junit:junit:4.12' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..a7b806b --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /media/Almacen/SDK/Android/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# 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/github/glomadrian/gravball/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/github/glomadrian/gravball/ExampleInstrumentedTest.java new file mode 100644 index 0000000..a8f3cc9 --- /dev/null +++ b/app/src/androidTest/java/com/github/glomadrian/gravball/ExampleInstrumentedTest.java @@ -0,0 +1,24 @@ +package com.github.glomadrian.gravball; + +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.*; + +/** + * Instrumentation 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.github.glomadrian.gravball", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..2884465 --- /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/com/github/glomadrian/gravball/MainActivity.java b/app/src/main/java/com/github/glomadrian/gravball/MainActivity.java new file mode 100644 index 0000000..aadee46 --- /dev/null +++ b/app/src/main/java/com/github/glomadrian/gravball/MainActivity.java @@ -0,0 +1,22 @@ +package com.github.glomadrian.gravball; + +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.view.ViewTreeObserver; +import com.github.glomadrian.grav.GravView; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + final GravView gravView = (GravView) findViewById(R.id.grav); + gravView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + gravView.start(); + } + }); + } +} 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..f081a0f --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,17 @@ + + + + + + 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..cde69bc 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..9a078e3 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..c133a0c 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..efc028a 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..bfa42f0 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..3af2608 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..324e72c 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..9bec2e6 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..aee44e1 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..34947cd 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..4f91069 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #05a2e6 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..a9dd88e --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Gravball + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..705be27 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/com/github/glomadrian/gravball/ExampleUnitTest.java b/app/src/test/java/com/github/glomadrian/gravball/ExampleUnitTest.java new file mode 100644 index 0000000..b4102fc --- /dev/null +++ b/app/src/test/java/com/github/glomadrian/gravball/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.github.glomadrian.gravball; + +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..704618a --- /dev/null +++ b/build.gradle @@ -0,0 +1,23 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + 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.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ba27676 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Mar 23 21:47:25 CET 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 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/grav/.gitignore b/grav/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/grav/.gitignore @@ -0,0 +1 @@ +/build diff --git a/grav/build.gradle b/grav/build.gradle new file mode 100644 index 0000000..02f05b2 --- /dev/null +++ b/grav/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 25 + buildToolsVersion "25.0.2" + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 25 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:25.3.0' + testCompile 'junit:junit:4.12' +} diff --git a/grav/proguard-rules.pro b/grav/proguard-rules.pro new file mode 100644 index 0000000..a7b806b --- /dev/null +++ b/grav/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /media/Almacen/SDK/Android/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# 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/grav/src/androidTest/java/com/github/glomadrian/grav/ExampleInstrumentedTest.java b/grav/src/androidTest/java/com/github/glomadrian/grav/ExampleInstrumentedTest.java new file mode 100644 index 0000000..7b91b21 --- /dev/null +++ b/grav/src/androidTest/java/com/github/glomadrian/grav/ExampleInstrumentedTest.java @@ -0,0 +1,24 @@ +package com.github.glomadrian.grav; + +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.*; + +/** + * Instrumentation 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.github.glomadrian.grav.test", appContext.getPackageName()); + } +} diff --git a/grav/src/main/AndroidManifest.xml b/grav/src/main/AndroidManifest.xml new file mode 100644 index 0000000..297684c --- /dev/null +++ b/grav/src/main/AndroidManifest.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/grav/src/main/java/com/github/glomadrian/grav/GravView.java b/grav/src/main/java/com/github/glomadrian/grav/GravView.java new file mode 100644 index 0000000..8f6ba2d --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/GravView.java @@ -0,0 +1,113 @@ +package com.github.glomadrian.grav; + +import android.animation.ValueAnimator; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PointF; +import android.support.annotation.Nullable; +import android.util.AttributeSet; +import android.view.View; +import com.github.glomadrian.grav.figures.Grav; +import com.github.glomadrian.grav.generator.GeneratorFactory; +import com.github.glomadrian.grav.generator.animator.GravAnimatorGenerator; +import com.github.glomadrian.grav.generator.animator.PathMoveAnimator; +import com.github.glomadrian.grav.generator.grav.BallGravGenerator; +import com.github.glomadrian.grav.generator.grav.GravGenerator; +import com.github.glomadrian.grav.generator.paint.OneColorGenerator; +import com.github.glomadrian.grav.generator.paint.PaintGenerator; +import com.github.glomadrian.grav.generator.paint.RandomColorGenerator; +import com.github.glomadrian.grav.generator.point.PointGenerator; +import com.github.glomadrian.grav.generator.point.RegularPointGenerator; +import java.util.Vector; + +public class GravView extends View { + private PointGenerator pointGenerator; + private PaintGenerator paintGenerator; + private GravAnimatorGenerator gravAnimatorGenerator; + private GravGenerator gravGenerator; + private Vector gravVector; + private Vector gravAnimators; + private ValueAnimator viewRefreshAnimator; + + public GravView(Context context) { + super(context); + initialize(null); + } + + public GravView(Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + initialize(attrs); + } + + public GravView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + initialize(attrs); + } + + private void initialize(AttributeSet attrs) { + GeneratorFactory generatorFactory = new GeneratorFactory(); + initializeRefreshAnimator(); + if (attrs != null) { + TypedArray attributes = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.GravView, 0, 0); + paintGenerator = generatorFactory.create(attributes.getString(R.styleable.GravView_colorGenerator), attributes); + } + pointGenerator = new RegularPointGenerator(); + gravGenerator = new BallGravGenerator(); + gravAnimatorGenerator = new PathMoveAnimator(); + } + + private void initializeRefreshAnimator() { + viewRefreshAnimator = ValueAnimator.ofInt(0, 100); + viewRefreshAnimator.setRepeatCount(ValueAnimator.INFINITE); + viewRefreshAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { + @Override + public void onAnimationUpdate(ValueAnimator animation) { + invalidate(); + } + }); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + Vector points = pointGenerator.generatePoints(w, h, 300, 10); + gravVector = generateBallFrom(points); + gravAnimators = generateGravAnimatorsFrom(gravVector); + } + + private Vector generateBallFrom(Vector points) { + Vector vector = new Vector<>(points.size()); + for (PointF point : points) { + Paint paint = paintGenerator.generate(); + Grav grav = gravGenerator.generate(point, paint); + vector.add(grav); + } + return vector; + } + + private Vector generateGravAnimatorsFrom(Vector gravVector) { + Vector valueAnimators = new Vector<>(gravVector.size()); + for (Grav grav : gravVector) { + ValueAnimator valueAnimator = gravAnimatorGenerator.generateGravAnimator(grav); + valueAnimators.add(valueAnimator); + } + return valueAnimators; + } + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + for (Grav grav : gravVector) { + grav.draw(canvas); + } + } + + public void start() { + viewRefreshAnimator.start(); + for (ValueAnimator valueAnimator : gravAnimators) { + valueAnimator.start(); + } + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/figures/Ball.java b/grav/src/main/java/com/github/glomadrian/grav/figures/Ball.java new file mode 100644 index 0000000..8d46523 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/figures/Ball.java @@ -0,0 +1,18 @@ +package com.github.glomadrian.grav.figures; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PointF; + +public class Ball extends Grav{ + private final int radius; + + public Ball(PointF startPoint, Paint paint, int radius) { + super(startPoint, paint); + this.radius = radius; + } + + public void draw(Canvas canvas, PointF drawPoint){ + canvas.drawCircle(drawPoint.x, drawPoint.y, radius, paint); + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/figures/Grav.java b/grav/src/main/java/com/github/glomadrian/grav/figures/Grav.java new file mode 100644 index 0000000..c8ac736 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/figures/Grav.java @@ -0,0 +1,39 @@ +package com.github.glomadrian.grav.figures; + +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PointF; + +public abstract class Grav { + protected final Paint paint; + protected final PointF startPoint; + protected PointF drawPoint; + + public Grav(PointF startPoint, Paint paint) { + this.startPoint = startPoint; + this.paint = paint; + drawPoint = new PointF(startPoint.x, startPoint.y); + } + + public void draw(Canvas canvas) { + draw(canvas, drawPoint); + } + + protected abstract void draw(Canvas canvas, PointF drawPoint); + + public void animate(){ + + } + + public void setDrawPoint(PointF point){ + this.drawPoint = point; + } + + public PointF getDrawPoint() { + return drawPoint; + } + + public PointF getStartPoint() { + return startPoint; + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/GeneratorFactory.java b/grav/src/main/java/com/github/glomadrian/grav/generator/GeneratorFactory.java new file mode 100644 index 0000000..ae6eaa9 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/GeneratorFactory.java @@ -0,0 +1,17 @@ +package com.github.glomadrian.grav.generator; + +import android.content.res.TypedArray; +import com.github.glomadrian.grav.generator.paint.PaintGenerator; +import com.github.glomadrian.grav.generator.paint.RandomColorGenerator; +import com.github.glomadrian.grav.util.ClassUtil; + +public class GeneratorFactory { + public PaintGenerator create(String className, TypedArray attributeSet) { + if (className == null || className.isEmpty()) { + return new RandomColorGenerator(); + } + PaintGenerator paintGenerator = ClassUtil.getClassByName(className, PaintGenerator.class); + paintGenerator.configure(attributeSet); + return paintGenerator; + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/animator/GravAnimatorGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/animator/GravAnimatorGenerator.java new file mode 100644 index 0000000..4865b21 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/animator/GravAnimatorGenerator.java @@ -0,0 +1,36 @@ +package com.github.glomadrian.grav.generator.animator; + +import android.animation.ValueAnimator; +import com.github.glomadrian.grav.figures.Grav; + +public abstract class GravAnimatorGenerator { + + public ValueAnimator generateGravAnimator(T grav){ + ValueAnimator valueAnimator = createValueAnimator(grav); + UpdageGravListener updageGravListenerListener = createUpdateListener(); + valueAnimator.addUpdateListener(new AnimatorUpdateListener(grav, updageGravListenerListener)); + return valueAnimator; + } + + protected abstract ValueAnimator createValueAnimator(T grav); + protected abstract UpdageGravListener createUpdateListener(); + + private class AnimatorUpdateListener implements ValueAnimator.AnimatorUpdateListener { + private final T grav; + private final UpdageGravListener UpdageGravListener; + + private AnimatorUpdateListener(T grav, UpdageGravListener UpdageGravListener) { + this.grav = grav; + this.UpdageGravListener = UpdageGravListener; + } + + @Override + public void onAnimationUpdate(ValueAnimator animation) { + UpdageGravListener.onUpdate(grav, animation); + } + } + + public interface UpdageGravListener { + void onUpdate(T grav, ValueAnimator animator); + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/animator/PathMoveAnimator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/animator/PathMoveAnimator.java new file mode 100644 index 0000000..f22da96 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/animator/PathMoveAnimator.java @@ -0,0 +1,36 @@ +package com.github.glomadrian.grav.generator.animator; + +import android.animation.ValueAnimator; +import android.graphics.PointF; +import com.github.glomadrian.grav.figures.Grav; + +public class PathMoveAnimator extends GravAnimatorGenerator { + + @Override + protected ValueAnimator createValueAnimator(Grav grav) { + PointF startPoint = grav.getStartPoint(); + ValueAnimator valueAnimator = ValueAnimator.ofFloat(startPoint.x - 50, startPoint.x + 50); + valueAnimator.setDuration(getRandomDuration(2000, 3000)); + valueAnimator.setRepeatCount(ValueAnimator.INFINITE); + valueAnimator.setRepeatMode(ValueAnimator.REVERSE); + return valueAnimator; + } + + private long getRandomDuration(long min, long max){ + return min + (int)(Math.random() * max); + } + + @Override + protected UpdageGravListener createUpdateListener() { + return new UpdageGravListener() { + @Override + public void onUpdate(Grav grav, ValueAnimator animator) { + float value = (float) animator.getAnimatedValue(); + PointF drawPoint = new PointF(); + drawPoint.x = value; + drawPoint.y = grav.getStartPoint().y; + grav.setDrawPoint(drawPoint); + } + }; + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/grav/BallGravGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/grav/BallGravGenerator.java new file mode 100644 index 0000000..1f330a0 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/grav/BallGravGenerator.java @@ -0,0 +1,15 @@ +package com.github.glomadrian.grav.generator.grav; + +import android.graphics.Paint; +import android.graphics.PointF; +import com.github.glomadrian.grav.figures.Ball; +import com.github.glomadrian.grav.figures.Grav; + +public class BallGravGenerator implements GravGenerator { + private final int DEFAULT_RADIUS = 90; + + @Override + public Grav generate(PointF startPoint, Paint paint) { + return new Ball(startPoint, paint, DEFAULT_RADIUS); + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/grav/GravGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/grav/GravGenerator.java new file mode 100644 index 0000000..b35329a --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/grav/GravGenerator.java @@ -0,0 +1,9 @@ +package com.github.glomadrian.grav.generator.grav; + +import android.graphics.Paint; +import android.graphics.PointF; +import com.github.glomadrian.grav.figures.Grav; + +public interface GravGenerator { + Grav generate(PointF startPoint, Paint paint); +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/paint/BreweColorGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/BreweColorGenerator.java new file mode 100644 index 0000000..380ee28 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/BreweColorGenerator.java @@ -0,0 +1,33 @@ +package com.github.glomadrian.grav.generator.paint; + +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.Paint; + +public class BreweColorGenerator implements PaintGenerator { + private OneColorGenerator oneColorGenerator; + private int counter = 0; + private String[] colors = + {"543005", "8C510A", "BF812D", "DFC27D", "F6E8C3", "F5F5F5", "C7EAE5", "80CDC1", "35978F", "01665E", "003C30" }; + + public BreweColorGenerator() { + oneColorGenerator = new OneColorGenerator(); + } + + @Override + public Paint generate() { + if (counter >= colors.length) { + counter = 0; + } + String color = colors[counter]; + counter++; + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setColor(Color.parseColor("#"+color)); + return paint; + } + + @Override + public void configure(TypedArray attributeSet) { + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/paint/OneColorGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/OneColorGenerator.java new file mode 100644 index 0000000..6e92c8d --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/OneColorGenerator.java @@ -0,0 +1,19 @@ +package com.github.glomadrian.grav.generator.paint; + +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.Paint; + +public class OneColorGenerator implements PaintGenerator { + @Override + public Paint generate() { + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setColor(Color.parseColor("#85FFFFFF")); + return paint; + } + + @Override + public void configure(TypedArray attributeSet) { + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/paint/PaintGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/PaintGenerator.java new file mode 100644 index 0000000..44cd41a --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/PaintGenerator.java @@ -0,0 +1,9 @@ +package com.github.glomadrian.grav.generator.paint; + +import android.content.res.TypedArray; +import android.graphics.Paint; + +public interface PaintGenerator { + Paint generate(); + void configure(TypedArray attributeSet); +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/paint/RandomColorGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/RandomColorGenerator.java new file mode 100644 index 0000000..485730c --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/paint/RandomColorGenerator.java @@ -0,0 +1,21 @@ +package com.github.glomadrian.grav.generator.paint; + +import android.content.res.TypedArray; +import android.graphics.Paint; +import java.util.Random; + +public class RandomColorGenerator implements PaintGenerator { + private Random random = new Random(); + + @Override + public Paint generate() { + Paint paint = new Paint(); + paint.setAntiAlias(true); + paint.setARGB(255, random.nextInt(256), random.nextInt(256), random.nextInt(256)); + return paint; + } + + @Override + public void configure(TypedArray attributeSet) { + } +} diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/point/CircularPointGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/point/CircularPointGenerator.java new file mode 100644 index 0000000..e2fc81b --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/point/CircularPointGenerator.java @@ -0,0 +1,45 @@ +package com.github.glomadrian.grav.generator.point; + +import android.graphics.PointF; +import java.util.Random; +import java.util.Vector; + +/** + * Circular point generator + * + * @author manolovn + */ +public class CircularPointGenerator implements PointGenerator { + private final static int POINTS_PER_CIRCLE = 8; + private final Random random = new Random(); + private int bleedX = 0; + private int bleedY = 0; + + @Override + public Vector generatePoints(int width, int height, int cellSize, int variance) { + Vector points = new Vector<>(); + PointF center = new PointF(width / 2, height / 2); + points.add(new PointF(center.x, center.y)); + int limit = Math.max(width + bleedX, height + bleedY); + for (int radius = cellSize; radius < limit; radius += cellSize) { + double slice = 2 * Math.PI / POINTS_PER_CIRCLE; + for (int i = 0; i < POINTS_PER_CIRCLE; i++) { + double angle = slice * i; + int x = (int) (center.x + radius * Math.cos(angle)) + random.nextInt(variance); + int y = (int) (center.y + radius * Math.sin(angle)) + random.nextInt(variance); + points.add(new PointF(x, y)); + } + } + return points; + } + + @Override + public void setBleedX(int bleedX) { + this.bleedX = bleedX; + } + + @Override + public void setBleedY(int bleedY) { + this.bleedY = bleedY; + } +} \ No newline at end of file diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/point/PointGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/point/PointGenerator.java new file mode 100644 index 0000000..91ecd87 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/point/PointGenerator.java @@ -0,0 +1,15 @@ +package com.github.glomadrian.grav.generator.point; + +import android.graphics.PointF; +import java.util.Vector; + +/** + * Point generator + * + * @author manolovn + */ +public interface PointGenerator { + Vector generatePoints(int width, int height, int cellSize, int variance); + void setBleedX(int bleedX); + void setBleedY(int bleedY); +} \ No newline at end of file diff --git a/grav/src/main/java/com/github/glomadrian/grav/generator/point/RegularPointGenerator.java b/grav/src/main/java/com/github/glomadrian/grav/generator/point/RegularPointGenerator.java new file mode 100644 index 0000000..74b7503 --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/generator/point/RegularPointGenerator.java @@ -0,0 +1,39 @@ +package com.github.glomadrian.grav.generator.point; + +import android.graphics.PointF; +import java.util.Random; +import java.util.Vector; + +/** + * Regular point generator + * + * @author manolovn + */ +public class RegularPointGenerator implements PointGenerator { + private final Random random = new Random(); + private int bleedX = 0; + private int bleedY = 0; + + @Override + public void setBleedX(int bleedX) { + this.bleedX = bleedX; + } + + @Override + public void setBleedY(int bleedY) { + this.bleedY = bleedY; + } + + @Override + public Vector generatePoints(int width, int height, int cellSize, int variance) { + Vector points = new Vector<>(); + for (int j = -bleedY; j < height + bleedY; j += cellSize) { + for (int i = -bleedX; i < width + bleedX; i += cellSize) { + int x = i + random.nextInt(variance); + int y = j + random.nextInt(variance); + points.add(new PointF(x, y)); + } + } + return points; + } +} \ No newline at end of file diff --git a/grav/src/main/java/com/github/glomadrian/grav/util/ClassUtil.java b/grav/src/main/java/com/github/glomadrian/grav/util/ClassUtil.java new file mode 100644 index 0000000..c312b9e --- /dev/null +++ b/grav/src/main/java/com/github/glomadrian/grav/util/ClassUtil.java @@ -0,0 +1,22 @@ +package com.github.glomadrian.grav.util; + +/** + * Utility methods + * + * @author manolovn + */ +public class ClassUtil { + + public static T getClassByName(String className, Class classOfT) { + try { + Class clazz = Class.forName(className); + Object instance = clazz.newInstance(); + if (classOfT.isInstance(instance)) { + return classOfT.cast(instance); + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } +} \ No newline at end of file diff --git a/grav/src/main/res/values/attrs.xml b/grav/src/main/res/values/attrs.xml new file mode 100644 index 0000000..188ef61 --- /dev/null +++ b/grav/src/main/res/values/attrs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/grav/src/main/res/values/strings.xml b/grav/src/main/res/values/strings.xml new file mode 100644 index 0000000..7de9d80 --- /dev/null +++ b/grav/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Grav + diff --git a/grav/src/test/java/com/github/glomadrian/grav/ExampleUnitTest.java b/grav/src/test/java/com/github/glomadrian/grav/ExampleUnitTest.java new file mode 100644 index 0000000..fbc03f9 --- /dev/null +++ b/grav/src/test/java/com/github/glomadrian/grav/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.github.glomadrian.grav; + +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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..61e88bb --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app', ':grav'