commit f414239a71179fb180996f70895b40c4b490fcd8 Author: Alinson Xavier Date: Sat Jun 20 13:59:54 2015 -0400 Initial version diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e491bde --- /dev/null +++ b/.gitignore @@ -0,0 +1,32 @@ +#built application files +*.apk +*.ap_ + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ + +# Local configuration file (sdk path, etc) +local.properties + +# Windows thumbnail db +Thumbs.db + +# OSX files +.DS_Store + +# Eclipse project files +.classpath +.project + +# Android Studio +.idea +#.idea/workspace.xml - remove # and delete .idea if it better suit your needs. +.gradle +build/ diff --git a/SimpleTimer.iml b/SimpleTimer.iml new file mode 100644 index 0000000..d557092 --- /dev/null +++ b/SimpleTimer.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/art/hourglass.png b/art/hourglass.png new file mode 100644 index 0000000..661a604 Binary files /dev/null and b/art/hourglass.png differ diff --git a/art/hourglass.svg b/art/hourglass.svg new file mode 100644 index 0000000..120dea4 --- /dev/null +++ b/art/hourglass.svg @@ -0,0 +1,243 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9405f3f --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +// 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:1.2.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1d3591c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,18 @@ +# 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. +# Default value: -Xmx10248m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 + +# 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 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8c0fb64 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c71e76 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..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/mobile/.gitignore b/mobile/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/mobile/.gitignore @@ -0,0 +1 @@ +/build diff --git a/mobile/build.gradle b/mobile/build.gradle new file mode 100644 index 0000000..cd4cdb0 --- /dev/null +++ b/mobile/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + + defaultConfig { + applicationId "org.isoron.simpletimer" + minSdkVersion 22 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + wearApp project(':wear') + compile 'com.google.android.gms:play-services:+' +} diff --git a/mobile/mobile.iml b/mobile/mobile.iml new file mode 100644 index 0000000..df29754 --- /dev/null +++ b/mobile/mobile.iml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mobile/proguard-rules.pro b/mobile/proguard-rules.pro new file mode 100644 index 0000000..bf7ada2 --- /dev/null +++ b/mobile/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /opt/android-sdk-update-manager/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 *; +#} diff --git a/mobile/src/androidTest/java/org/isoron/simpletimer/ApplicationTest.java b/mobile/src/androidTest/java/org/isoron/simpletimer/ApplicationTest.java new file mode 100644 index 0000000..03fd870 --- /dev/null +++ b/mobile/src/androidTest/java/org/isoron/simpletimer/ApplicationTest.java @@ -0,0 +1,15 @@ +package org.isoron.simpletimer; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase +{ + public ApplicationTest() + { + super(Application.class); + } +} \ No newline at end of file diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml new file mode 100644 index 0000000..8d144c0 --- /dev/null +++ b/mobile/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/mobile/src/main/java/org/isoron/simpletimer/MainActivity.java b/mobile/src/main/java/org/isoron/simpletimer/MainActivity.java new file mode 100644 index 0000000..47d4e0e --- /dev/null +++ b/mobile/src/main/java/org/isoron/simpletimer/MainActivity.java @@ -0,0 +1,43 @@ +package org.isoron.simpletimer; + +import android.app.Activity; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + + +public class MainActivity extends Activity +{ + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) + { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) + { + return true; + } + + return super.onOptionsItemSelected(item); + } +} diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..53ce557 --- /dev/null +++ b/mobile/src/main/res/layout/activity_main.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/mobile/src/main/res/menu/menu_main.xml b/mobile/src/main/res/menu/menu_main.xml new file mode 100644 index 0000000..38ae07f --- /dev/null +++ b/mobile/src/main/res/menu/menu_main.xml @@ -0,0 +1,8 @@ + + + diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/mobile/src/main/res/values-v21/styles.xml b/mobile/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..dba3c41 --- /dev/null +++ b/mobile/src/main/res/values-v21/styles.xml @@ -0,0 +1,5 @@ + + + + diff --git a/mobile/src/main/res/values-w820dp/dimens.xml b/mobile/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/mobile/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/mobile/src/main/res/values/dimens.xml b/mobile/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/mobile/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml new file mode 100644 index 0000000..9c982b3 --- /dev/null +++ b/mobile/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + Simple Timer + + Hello world! + Settings + diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml new file mode 100644 index 0000000..ff6c9d2 --- /dev/null +++ b/mobile/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..6a4e79f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':mobile', ':wear' diff --git a/wear/.gitignore b/wear/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/wear/.gitignore @@ -0,0 +1 @@ +/build diff --git a/wear/build.gradle b/wear/build.gradle new file mode 100644 index 0000000..49fc958 --- /dev/null +++ b/wear/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'com.android.application' + + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.1" + + defaultConfig { + applicationId "org.isoron.simpletimer" + minSdkVersion 21 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.google.android.support:wearable:1.2.0' + compile 'com.google.android.gms:play-services-wearable:7.5.0' + provided 'com.google.android.wearable:wearable:1.0.0' +} diff --git a/wear/proguard-rules.pro b/wear/proguard-rules.pro new file mode 100644 index 0000000..bf7ada2 --- /dev/null +++ b/wear/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /opt/android-sdk-update-manager/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 *; +#} diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml new file mode 100644 index 0000000..136ce76 --- /dev/null +++ b/wear/src/main/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/wear/src/main/ic_launcher-web.png b/wear/src/main/ic_launcher-web.png new file mode 100644 index 0000000..f68d4fb Binary files /dev/null and b/wear/src/main/ic_launcher-web.png differ diff --git a/wear/src/main/java/org/isoron/base/AmbientModeListener.java b/wear/src/main/java/org/isoron/base/AmbientModeListener.java new file mode 100644 index 0000000..030f9c8 --- /dev/null +++ b/wear/src/main/java/org/isoron/base/AmbientModeListener.java @@ -0,0 +1,12 @@ +package org.isoron.base; + +import android.os.Bundle; + +public interface AmbientModeListener +{ + public void onEnterAmbient(Bundle ambientDetails); + + public void onExitAmbient(); + + public void onUpdateAmbient(); +} diff --git a/wear/src/main/java/org/isoron/simpletimer/MainActivity.java b/wear/src/main/java/org/isoron/simpletimer/MainActivity.java new file mode 100644 index 0000000..6f40689 --- /dev/null +++ b/wear/src/main/java/org/isoron/simpletimer/MainActivity.java @@ -0,0 +1,191 @@ +package org.isoron.simpletimer; + +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.support.wearable.activity.WearableActivity; +import android.support.wearable.view.WatchViewStub; +import android.util.Log; + +import org.isoron.base.AmbientModeListener; + +import java.util.Timer; +import java.util.TimerTask; + +public class MainActivity extends WearableActivity +{ + + private static final String TAG = "MainActivity"; + AmbientModeListener ambientModeListener = null; + TimerView timerView; + + private AlarmManager ambientModeAlarmManager; + private PendingIntent ambientModePendingIntent; + private Timer timer; + private boolean isActive = false; + + @Override + protected void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + setAmbientEnabled(); + + ambientModeAlarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE); + + Intent ambientModeIntent = new Intent(getApplicationContext(), MainActivity.class); + ambientModeIntent.setAction("REFRESH"); + + ambientModePendingIntent = + PendingIntent.getActivity(getApplicationContext(), 0, ambientModeIntent, + PendingIntent.FLAG_UPDATE_CURRENT); + + final WatchViewStub stub = (WatchViewStub) findViewById(R.id.watch_view_stub); + stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() + { + @Override + public void onLayoutInflated(WatchViewStub stub) + { + timerView = (TimerView) findViewById(R.id.timerview); + setAmbientModeListener(timerView); + + startTimer(); + refresh(); + } + }); + } + + private void startTimer() + { + if (timer != null) timer.cancel(); + timer = new Timer(); + timer.scheduleAtFixedRate(new TimerTask() + { + @Override + public void run() + { + runOnUiThread(new Runnable() + { + @Override + public void run() + { + refresh(); + } + }); + } + }, 0, 1000); + } + + private void stopTimer() + { + if (timer != null) timer.cancel(); + } + + private void refresh() + { + Log.d(TAG, "refresh() ambient? " + isAmbient() + " active? " + isActive); + + if (timerView != null) + { + timerView.tick(); + timerView.invalidate(); + } + + if (isAmbient() || !isActive) + { + long delay = -1; + if (timerView != null) + { + if (isAmbient()) delay = timerView.getMillisecondsUntilNextMinute(); + else delay = timerView.getRemainingTime(); + } + + if (delay > 0) + { + Log.d(TAG, "sleeping for " + delay + " milliseconds (" + delay / 1000 / 60.0 + " minutes)"); + ambientModeAlarmManager.setExact(AlarmManager.RTC_WAKEUP, + System.currentTimeMillis() + delay + 100, ambientModePendingIntent); + } + } + } + + @Override + public void onEnterAmbient(Bundle ambientDetails) + { + super.onEnterAmbient(ambientDetails); + if (ambientModeListener != null) ambientModeListener.onEnterAmbient(ambientDetails); + stopTimer(); + refresh(); + } + + @Override + public void onExitAmbient() + { + super.onExitAmbient(); + if (ambientModeListener != null) ambientModeListener.onExitAmbient(); + startTimer(); + refresh(); + } + + @Override + public void onUpdateAmbient() + { + Log.d(TAG, "onUpdateAmbient()"); + super.onUpdateAmbient(); + if (ambientModeListener != null) ambientModeListener.onUpdateAmbient(); + } + + public void setAmbientModeListener(AmbientModeListener ambientModeListener) + { + this.ambientModeListener = ambientModeListener; + } + + @Override + protected void onNewIntent(Intent intent) + { + super.onNewIntent(intent); + setIntent(intent); + + Log.d(TAG, "onNewIntent: " + intent.getAction()); + + refresh(); + } + + @Override + protected void onPause() + { + super.onPause(); + Log.d(TAG, "onPause()"); + isActive = false; + stopTimer(); + refresh(); + } + + @Override + protected void onStop() + { + super.onStop(); + Log.d(TAG, "onStop()"); + } + + @Override + protected void onResume() + { + super.onResume(); + Log.d(TAG, "onResume()"); + + isActive = true; + if(!isAmbient()) startTimer(); + refresh(); + } + + @Override + protected void onRestart() + { + super.onRestart(); + Log.d(TAG, "onRestart()"); + } +} diff --git a/wear/src/main/java/org/isoron/simpletimer/TimerView.java b/wear/src/main/java/org/isoron/simpletimer/TimerView.java new file mode 100644 index 0000000..96aaf0e --- /dev/null +++ b/wear/src/main/java/org/isoron/simpletimer/TimerView.java @@ -0,0 +1,435 @@ +package org.isoron.simpletimer; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Rect; +import android.graphics.RectF; +import android.os.Bundle; +import android.os.PowerManager; +import android.os.Vibrator; +import android.util.AttributeSet; +import android.util.Log; +import android.view.MotionEvent; +import android.view.View; +import android.view.WindowManager; + +import org.isoron.base.AmbientModeListener; + +import java.util.Timer; + +public class TimerView extends View implements AmbientModeListener +{ + private static final String TAG = "TimerView"; + + private final int primaryColor; + private final int secondaryColor; + private final int tertiaryColor; + + private final int backgroundColor; + + private Paint paint; + private Paint paintInteractive; + private Paint paintAmbient; + private Paint pClockInteractive; + + private int width; + private int height; + private int fontHeight; + private int size; + private Timer timer; + private final Activity activity; + private Vibrator vibrator; + + private int step; + private boolean isRunning; + private long totalTime; + private long remainingTime; + private long lastTick; + + private int brightnessCountdown; + private boolean isBright = false; + + private boolean hasLongPressed; + private boolean hasMoved = false; + private boolean ambientMode = false; + + private final int DEFAULT_TIME = 5 * 60 * 1000; + private final int GRANULARITY = 60 * 1000; + private final int BRIGHTNESS_LENGTH = 5; + private final long VIBRATION_FINISH[] = {0, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250}; + + private RectF screenRect; + + public TimerView(Context ctx, AttributeSet attrs) + { + super(ctx, attrs); + this.activity = (Activity) ctx; + + step = 0; + isRunning = false; + totalTime = DEFAULT_TIME; + remainingTime = totalTime; + + hasMoved = false; + hasLongPressed = false; + + paintInteractive = new Paint(); + paintInteractive.setColor(Color.parseColor("#B2FF59")); + paintInteractive.setStyle(Paint.Style.FILL); + paintInteractive.setAntiAlias(true); + paintInteractive.setTextAlign(Paint.Align.CENTER); + + pClockInteractive = new Paint(); + pClockInteractive.setColor(Color.parseColor("#9E9E9E")); + pClockInteractive.setStyle(Paint.Style.FILL); + pClockInteractive.setAntiAlias(true); + pClockInteractive.setTextAlign(Paint.Align.CENTER); + + paintAmbient = new Paint(); + paintAmbient.setColor(Color.WHITE); + paintAmbient.setStyle(Paint.Style.FILL_AND_STROKE); + paintAmbient.setAntiAlias(false); + paintAmbient.setTextAlign(Paint.Align.CENTER); + + primaryColor = Color.parseColor("#0288d1"); + secondaryColor = Color.WHITE; + tertiaryColor = mixColors(primaryColor, Color.BLACK, 0.37f); + backgroundColor = Color.BLACK; + + vibrator = (Vibrator) activity.getSystemService(Activity.VIBRATOR_SERVICE); + + setLongClickable(true); + setOnLongClickListener(new View.OnLongClickListener() + { + @Override + public boolean onLongClick(View v) + { + if (hasMoved) return false; + highBrightness(); + + remainingTime = totalTime; + vibrator.vibrate(250); + hasLongPressed = true; + isRunning = false; + invalidate(); + + return true; + } + }); + + setOnTouchListener(new View.OnTouchListener() + { + private float prevY; + private long prevTime; + + @Override + public boolean onTouch(View v, MotionEvent event) + { + int box = 20; + highBrightness(); + + switch (event.getAction() & MotionEvent.ACTION_MASK) + { + case MotionEvent.ACTION_DOWN: + prevY = event.getY(); + prevTime = remainingTime; + hasMoved = false; + hasLongPressed = false; + break; + + case MotionEvent.ACTION_MOVE: + float dy = (event.getY() - prevY) / box; + if (Math.abs(dy) < 1) break; + hasMoved = true; + + if (isRunning) break; + totalTime = Math.max(GRANULARITY, prevTime - (long) dy * GRANULARITY); + totalTime = (totalTime / GRANULARITY) * GRANULARITY; + remainingTime = totalTime; + + step = 1; + invalidate(); + break; + + case MotionEvent.ACTION_UP: + if (hasMoved) break; + if (hasLongPressed) break; + + isRunning = !isRunning; + + vibrator.vibrate(80); + invalidate(); + break; + } + + return false; + } + }); + + highBrightness(); + } + + public void tick() + { + Log.d(TAG, "tick()"); + long currentTime = System.currentTimeMillis(); + + step = (step + 1) % 2; + + if (brightnessCountdown-- == 0) lowBrightness(); + + if (remainingTime <= 0) + { + isRunning = false; + } + + if (isRunning) + { + remainingTime -= (currentTime - lastTick); + + if (remainingTime <= 0) + { + step = 1; + isRunning = false; + remainingTime = totalTime; + vibrator.vibrate(VIBRATION_FINISH, -1); + + PowerManager powerManager = + (PowerManager) activity.getSystemService(Activity.POWER_SERVICE); + PowerManager.WakeLock mWakeLock = powerManager.newWakeLock( + (PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.FULL_WAKE_LOCK | + PowerManager.ACQUIRE_CAUSES_WAKEUP), "MyWakelockTag"); + mWakeLock.acquire(); + + highBrightness(); + } + } + + lastTick = currentTime; + } + + public long getMillisecondsUntilNextMinute() + { + if (!isRunning) return -1; + return remainingTime % 60000; + } + + public long getRemainingTime() + { + if(!isRunning) return -1; + return remainingTime; + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) + { + width = w; + height = h; + size = Math.min(width, height); + paintInteractive.setTextSize(size * 0.2f); + paintAmbient.setTextSize(size * 0.15f); + pClockInteractive.setTextSize(size * 0.08f); + + Rect bounds = new Rect(); + paintInteractive.getTextBounds("00:00", 0, 1, bounds); + fontHeight = bounds.height(); + + screenRect = new RectF(0, 0, width, height); + } + + @Override + protected void onDraw(Canvas canvas) + { +// Log.d(TAG, "onDraw()"); + paint = paintInteractive; + + if (ambientMode) paint = paintAmbient; + + clearBackground(canvas); + drawOuterRing(canvas); + drawInnerRing(canvas); + drawTimer(canvas); + drawCurrentTime(canvas); + } + + private void drawCurrentTime(Canvas canvas) + { + } + + private void drawTimer(Canvas canvas) + { + if (ambientMode) paint.setColor(Color.WHITE); + else paint.setColor(primaryColor); + long minutes; + + if (ambientMode) + { + minutes = (long) (60 * Math.ceil(remainingTime / 1000 / 60.0)); + paint.setTextSize(size * 0.25f); + canvas.drawText(String.format("%d", minutes / 60), screenRect.centerX(), + screenRect.centerY() + (int) (fontHeight * 0.3), paint); + } + else + { + minutes = (long) (60 * Math.floor(remainingTime / 1000 / 60.0)); + long seconds = remainingTime / 1000 % 60; + + if (isRunning || step == 1) + { + paint.setTextSize(size * 0.25f); + float minutesWidth = paint.measureText(String.format("%d", minutes / 60)); + + paint.setTextSize(size * 0.15f); + float secondsWidth = paint.measureText(String.format("%02d", minutes / 60)); + float totalWidth = minutesWidth + secondsWidth; + + paint.setTextSize(size * 0.25f); + canvas.drawText(String.format("%d", minutes / 60), + screenRect.centerX() + minutesWidth / 2 - totalWidth / 2, + screenRect.centerY() + (int) (fontHeight * 0.3), paint); + + paint.setTextSize(size * 0.15f); + paint.setColor(secondaryColor); + canvas.drawText(String.format("%02d", seconds), + screenRect.centerX() + minutesWidth + secondsWidth / 2 + size * 0.025f - + totalWidth / 2, screenRect.centerY() + (int) (fontHeight * 0.3), + paint); + } + } + + paint.setTextSize(size * 0.08f); + if (!ambientMode) paint.setColor(secondaryColor); + + String text = "minutes"; + if (minutes / 60 == 1) text = "minute"; + + canvas.drawText(text, screenRect.centerX(), screenRect.centerY() + (int) (fontHeight * 1.0), + paint); + } + + private void drawInnerRing(Canvas canvas) + { + int totalPieces = (int) Math.min(16, totalTime / 60000); + int remainingPieces = (int) Math.ceil(remainingTime / 60000.0); + + float pieceAngle = 360.0f / totalPieces; + float gap = 1.0f; + + RectF r = new RectF(screenRect); + r.inset(size * 0.1f, size * 0.1f); + + if (ambientMode) paint.setColor(Color.WHITE); + else paint.setColor(primaryColor); + + for (int i = 0; i < remainingPieces; i++) + canvas.drawArc(r, -90 - (i + 1) * pieceAngle, pieceAngle - gap, true, paint); + +// canvas.drawArc(r, -90.0f, -360.0f * (remainingTime / 1000) / (totalTime / 1000), true, paint); + + r.inset(size * 0.015f, size * 0.015f); + paint.setColor(backgroundColor); + canvas.drawArc(r, 0, 360, true, paint); + } + + private void drawOuterRing(Canvas canvas) + { + if (ambientMode) return; + + int totalPieces = 60 / 5; + float remainingPercentage = (remainingTime / 1000 % 60) / 60.0f; + int remainingPieces = (int) Math.ceil(remainingPercentage * totalPieces); + + if (remainingPieces == 0) remainingPieces = totalPieces; + + float pieceAngle = 360.0f / totalPieces; + float gap = 0.5f; + + RectF r = new RectF(screenRect); + r.inset(size * 0.075f, size * 0.075f); + + paint.setColor(tertiaryColor); + for (int i = 0; i < remainingPieces; i++) + canvas.drawArc(r, -90 - (i + 1) * pieceAngle, pieceAngle - gap, true, paint); + + r.inset(size * 0.015f, size * 0.015f); + paint.setColor(backgroundColor); + canvas.drawArc(r, 0, 360, true, paint); + } + + private void clearBackground(Canvas canvas) + { + paint.setColor(backgroundColor); + canvas.drawRect(screenRect, paint); + } + + @Override + public void onEnterAmbient(Bundle ambientDetails) + { + ambientMode = true; + Log.d(TAG, "onEnterAmbient()"); + } + + @Override + public void onExitAmbient() + { + ambientMode = false; + highBrightness(); + Log.d(TAG, "onExitAmbient()"); + } + + @Override + public void onUpdateAmbient() + { + Log.d(TAG, "onUpdateAmbient()"); + } + + public static int mixColors(int color1, int color2, float amount) + { + final byte ALPHA_CHANNEL = 24; + final byte RED_CHANNEL = 16; + final byte GREEN_CHANNEL = 8; + final byte BLUE_CHANNEL = 0; + + final float inverseAmount = 1.0f - amount; + + int a = ((int) (((float) (color1 >> ALPHA_CHANNEL & 0xff) * amount) + + ((float) (color2 >> ALPHA_CHANNEL & 0xff) * inverseAmount))) & 0xff; + int r = ((int) (((float) (color1 >> RED_CHANNEL & 0xff) * amount) + + ((float) (color2 >> RED_CHANNEL & 0xff) * inverseAmount))) & 0xff; + int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) + + ((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff; + int b = ((int) (((float) (color1 & 0xff) * amount) + + ((float) (color2 & 0xff) * inverseAmount))) & 0xff; + + return a << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL; + } + + public void changeBrightness(float brightness) + { + WindowManager.LayoutParams layout = activity.getWindow().getAttributes(); + layout.screenBrightness = brightness; + activity.getWindow().setAttributes(layout); + } + + public void lowBrightness() + { + if (!isBright) return; + + Log.d(TAG, "lowBrightness()"); + changeBrightness(0F); + isBright = false; + } + + public void highBrightness() + { + brightnessCountdown = BRIGHTNESS_LENGTH; + if (isBright) return; + + Log.d(TAG, "highBrightness()"); + changeBrightness(0.8F); + isBright = true; + } +} diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..0093473 --- /dev/null +++ b/wear/src/main/res/layout/activity_main.xml @@ -0,0 +1,13 @@ + + + diff --git a/wear/src/main/res/layout/rect_activity_main.xml b/wear/src/main/res/layout/rect_activity_main.xml new file mode 100644 index 0000000..c6822b7 --- /dev/null +++ b/wear/src/main/res/layout/rect_activity_main.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/wear/src/main/res/layout/round_activity_main.xml b/wear/src/main/res/layout/round_activity_main.xml new file mode 100644 index 0000000..6793fce --- /dev/null +++ b/wear/src/main/res/layout/round_activity_main.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..9877d26 Binary files /dev/null and b/wear/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..ac4e9f2 Binary files /dev/null and b/wear/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..f4f980b Binary files /dev/null and b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..cedb096 Binary files /dev/null and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..519ff54 Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml new file mode 100644 index 0000000..40cfb02 --- /dev/null +++ b/wear/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + Simple Timer + Timer + Hello Round World! + Hello Square World! + diff --git a/wear/wear.iml b/wear/wear.iml new file mode 100644 index 0000000..ea4785c --- /dev/null +++ b/wear/wear.iml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file