diff --git a/Sources/.gitignore b/Sources/.gitignore new file mode 100644 index 0000000..afbdab3 --- /dev/null +++ b/Sources/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/Sources/.idea/.name b/Sources/.idea/.name new file mode 100644 index 0000000..4c191e7 --- /dev/null +++ b/Sources/.idea/.name @@ -0,0 +1 @@ +EndranLog \ No newline at end of file diff --git a/Sources/.idea/compiler.xml b/Sources/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/Sources/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/Sources/.idea/copyright/profiles_settings.xml b/Sources/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/Sources/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Sources/.idea/encodings.xml b/Sources/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/Sources/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Sources/.idea/gradle.xml b/Sources/.idea/gradle.xml new file mode 100644 index 0000000..ded2f3f --- /dev/null +++ b/Sources/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/Sources/.idea/misc.xml b/Sources/.idea/misc.xml new file mode 100644 index 0000000..9076de5 --- /dev/null +++ b/Sources/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Sources/.idea/modules.xml b/Sources/.idea/modules.xml new file mode 100644 index 0000000..443b603 --- /dev/null +++ b/Sources/.idea/modules.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Sources/.idea/scopes/scope_settings.xml b/Sources/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/Sources/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/Sources/.idea/vcs.xml b/Sources/.idea/vcs.xml new file mode 100644 index 0000000..def6a6a --- /dev/null +++ b/Sources/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Sources/Sources.iml b/Sources/Sources.iml new file mode 100644 index 0000000..2a02201 --- /dev/null +++ b/Sources/Sources.iml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/app/.gitignore b/Sources/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Sources/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Sources/app/app.iml b/Sources/app/app.iml new file mode 100644 index 0000000..c048001 --- /dev/null +++ b/Sources/app/app.iml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/app/build.gradle b/Sources/app/build.gradle new file mode 100644 index 0000000..694d8c6 --- /dev/null +++ b/Sources/app/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "nl.endran.endranlog" + minSdkVersion 4 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/Sources/app/proguard-rules.pro b/Sources/app/proguard-rules.pro new file mode 100644 index 0000000..f3d362f --- /dev/null +++ b/Sources/app/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 /Users/code1_310170244/Library/Android/sdk/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/Sources/app/src/main/AndroidManifest.xml b/Sources/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..a0db674 --- /dev/null +++ b/Sources/app/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/Sources/app/src/main/res/drawable-hdpi/ic_launcher.png b/Sources/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/Sources/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/Sources/app/src/main/res/drawable-mdpi/ic_launcher.png b/Sources/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/Sources/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/Sources/app/src/main/res/drawable-xhdpi/ic_launcher.png b/Sources/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/Sources/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/Sources/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/Sources/app/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/Sources/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/Sources/app/src/main/res/values-v21/styles.xml b/Sources/app/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..dba3c41 --- /dev/null +++ b/Sources/app/src/main/res/values-v21/styles.xml @@ -0,0 +1,5 @@ + + + + diff --git a/Sources/app/src/main/res/values/strings.xml b/Sources/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..f1ec0f1 --- /dev/null +++ b/Sources/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + EndranLog + diff --git a/Sources/app/src/main/res/values/styles.xml b/Sources/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..ff6c9d2 --- /dev/null +++ b/Sources/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/Sources/build.gradle b/Sources/build.gradle new file mode 100644 index 0000000..6356aab --- /dev/null +++ b/Sources/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.0.0' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/Sources/gradle.properties b/Sources/gradle.properties new file mode 100644 index 0000000..1d3591c --- /dev/null +++ b/Sources/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/Sources/gradle/wrapper/gradle-wrapper.jar b/Sources/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8c0fb64 Binary files /dev/null and b/Sources/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Sources/gradle/wrapper/gradle-wrapper.properties b/Sources/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..0c71e76 --- /dev/null +++ b/Sources/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/Sources/gradlew b/Sources/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/Sources/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/Sources/gradlew.bat b/Sources/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/Sources/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/Sources/logger/.gitignore b/Sources/logger/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Sources/logger/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Sources/logger/build.gradle b/Sources/logger/build.gradle new file mode 100644 index 0000000..fa5d9c1 --- /dev/null +++ b/Sources/logger/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + minSdkVersion 4 + targetSdkVersion 21 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/Sources/logger/logger.iml b/Sources/logger/logger.iml new file mode 100644 index 0000000..1cc042f --- /dev/null +++ b/Sources/logger/logger.iml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/logger/proguard-rules.pro b/Sources/logger/proguard-rules.pro new file mode 100644 index 0000000..f3d362f --- /dev/null +++ b/Sources/logger/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 /Users/code1_310170244/Library/Android/sdk/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/Sources/logger/src/androidTest/java/nl/endran/logger/ApplicationTest.java b/Sources/logger/src/androidTest/java/nl/endran/logger/ApplicationTest.java new file mode 100644 index 0000000..7fac2ad --- /dev/null +++ b/Sources/logger/src/androidTest/java/nl/endran/logger/ApplicationTest.java @@ -0,0 +1,13 @@ +package nl.endran.logger; + +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/Sources/logger/src/main/AndroidManifest.xml b/Sources/logger/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c5aa21f --- /dev/null +++ b/Sources/logger/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/Sources/logger/src/main/java/nl/endran/logger/LogLevel.java b/Sources/logger/src/main/java/nl/endran/logger/LogLevel.java new file mode 100644 index 0000000..7cf983f --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LogLevel.java @@ -0,0 +1,5 @@ +package nl.endran.logger; + +public enum LogLevel { + VERBOSE, DEBUG, INFO, WARN, ERROR, SILENT; +} \ No newline at end of file diff --git a/Sources/logger/src/main/java/nl/endran/logger/Logger.java b/Sources/logger/src/main/java/nl/endran/logger/Logger.java new file mode 100644 index 0000000..bbcba1b --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/Logger.java @@ -0,0 +1,25 @@ +package nl.endran.logger; + +public interface Logger { + + public abstract void verbose(String message); + + public abstract void verbose(String message, Throwable throwable); + + public abstract void debug(String message); + + public abstract void debug(String message, Throwable throwable); + + public abstract void info(String message); + + public abstract void info(String message, Throwable throwable); + + public abstract void warn(String message); + + public abstract void warn(String message, Throwable throwable); + + public abstract void error(String message); + + public abstract void error(String message, Throwable throwable); + +} \ No newline at end of file diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerDebug.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerDebug.java new file mode 100644 index 0000000..536ca5d --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerDebug.java @@ -0,0 +1,51 @@ +package nl.endran.logger; + +import android.util.Log; + +public class LoggerDebug implements Logger { + String tag; + String name; + + public LoggerDebug(String tag, String name) { + this.tag = tag; + this.name = name; + } + + public void verbose(String message) { + } + + public void verbose(String message, Throwable throwable) { + } + + public void debug(String message) { + Log.d(tag, name + " :: " + message); + } + + public void debug(String message, Throwable throwable) { + Log.d(tag, name + " :: " + message, throwable); + } + + public void info(String message) { + Log.i(tag, name + " :: " + message); + } + + public void info(String message, Throwable throwable) { + Log.i(tag, name + " :: " + message, throwable); + } + + public void warn(String message) { + Log.w(tag, name + " :: " + message); + } + + public void warn(String message, Throwable throwable) { + Log.w(tag, name + " :: " + message, throwable); + } + + public void error(String message) { + Log.e(tag, name + " :: " + message); + } + + public void error(String message, Throwable throwable) { + Log.e(tag, name + " :: " + message, throwable); + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerError.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerError.java new file mode 100644 index 0000000..3b82424 --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerError.java @@ -0,0 +1,45 @@ +package nl.endran.logger; + +import android.util.Log; + +public class LoggerError implements Logger { + String tag; + String name; + + public LoggerError(String tag, String name) { + this.tag = tag; + this.name = name; + } + + public void verbose(String message) { + } + + public void verbose(String message, Throwable throwable) { + } + + public void debug(String message) { + } + + public void debug(String message, Throwable throwable) { + } + + public void info(String message) { + } + + public void info(String message, Throwable throwable) { + } + + public void warn(String message) { + } + + public void warn(String message, Throwable throwable) { + } + + public void error(String message) { + Log.e(tag, name + " :: " + message); + } + + public void error(String message, Throwable throwable) { + Log.e(tag, name + " :: " + message, throwable); + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerFactory.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerFactory.java new file mode 100644 index 0000000..eccf35e --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerFactory.java @@ -0,0 +1,86 @@ +package nl.endran.logger; + +import java.util.HashMap; + +public class LoggerFactory { + private static LogLevel _logLevel = LogLevel.VERBOSE; + private static String _tag = "UninitializedLogTag"; + private static final HashMap logLevelMap = new HashMap(); + + public static void setLogLevel(final LogLevel logLevel) { + _logLevel = logLevel; + } + + public static void setSpecificLogLevel(final Object object, final LogLevel logLevel) { + setSpecificLogLevel(object.getClass(), logLevel); + } + + public static void setSpecificLogLevel(final Class clazz, final LogLevel logLevel) { + setSpecificLogLevel(clazz.getSimpleName(), logLevel); + } + + public static void setSpecificLogLevel(final String classSimpleName, final LogLevel logLevel) { + logLevelMap.put(classSimpleName, logLevel); + } + + public static void setLogTag(final String tag) { + _tag = tag; + } + + public static String getLogTag() { + return _tag; + } + + /** + * Create a ILogger instance for a class. Usually object is a callers + * this. Will call #GetLoggerWithString(object.getClass().getSimpleName()) + * + * @param object A callers this + * @return ILogger instance + */ + public static Logger getLogger(final Object object) { + return getLogger(object.getClass()); + } + + public static Logger getLogger(final Class clazz) { + return getLogger(clazz.getSimpleName()); + } + + /** + * Create a ILogger instance for a class. Usually object is a callers + * simpleName + * + * @param string A name, to prefix each log message + * @return ILogger instance + */ + public static Logger getLogger(final String string) { + LogLevel logLevel = getLogLevel(string); + return getLogger(string, logLevel); + } + + private static Logger getLogger(final String string, final LogLevel logLevel) { + switch (logLevel) { + case VERBOSE: + return new LoggerVerbose(_tag, string); + case DEBUG: + return new LoggerDebug(_tag, string); + case INFO: + return new LoggerInfo(_tag, string); + case WARN: + return new LoggerWarn(_tag, string); + case ERROR: + return new LoggerError(_tag, string); + case SILENT: + default: + return new LoggerSilent(); + } + } + + private static LogLevel getLogLevel(final String string) { + LogLevel logLevel = logLevelMap.get(string); + if (logLevel == null) { + logLevel = _logLevel; + } + return logLevel; + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerInfo.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerInfo.java new file mode 100644 index 0000000..b9a119c --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerInfo.java @@ -0,0 +1,49 @@ +package nl.endran.logger; + +import android.util.Log; + +public class LoggerInfo implements Logger { + String tag; + String name; + + public LoggerInfo(String tag, String name) { + this.tag = tag; + this.name = name; + } + + public void verbose(String message) { + } + + public void verbose(String message, Throwable throwable) { + } + + public void debug(String message) { + } + + public void debug(String message, Throwable throwable) { + } + + public void info(String message) { + Log.i(tag, name + " :: " + message); + } + + public void info(String message, Throwable throwable) { + Log.i(tag, name + " :: " + message, throwable); + } + + public void warn(String message) { + Log.w(tag, name + " :: " + message); + } + + public void warn(String message, Throwable throwable) { + Log.w(tag, name + " :: " + message, throwable); + } + + public void error(String message) { + Log.e(tag, name + " :: " + message); + } + + public void error(String message, Throwable throwable) { + Log.e(tag, name + " :: " + message, throwable); + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerSilent.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerSilent.java new file mode 100644 index 0000000..a03b2e4 --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerSilent.java @@ -0,0 +1,36 @@ +package nl.endran.logger; + +public class LoggerSilent implements Logger { + public LoggerSilent() { + } + + public void verbose(String message) { + } + + public void verbose(String message, Throwable throwable) { + } + + public void debug(String message) { + } + + public void debug(String message, Throwable throwable) { + } + + public void info(String message) { + } + + public void info(String message, Throwable throwable) { + } + + public void warn(String message) { + } + + public void warn(String message, Throwable throwable) { + } + + public void error(String message) { + } + + public void error(String message, Throwable throwable) { + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerVerbose.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerVerbose.java new file mode 100644 index 0000000..405abc6 --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerVerbose.java @@ -0,0 +1,53 @@ +package nl.endran.logger; + +import android.util.Log; + +public class LoggerVerbose implements Logger { + private final String tag; + private final String name; + + public LoggerVerbose(String tag, String name) { + this.tag = tag; + this.name = name + " :: "; + } + + public void verbose(String message) { + Log.v(tag, name + message); + } + + public void verbose(String message, Throwable throwable) { + Log.v(tag, name + message, throwable); + } + + public void debug(String message) { + Log.d(tag, name + message); + } + + public void debug(String message, Throwable throwable) { + Log.d(tag, name + message, throwable); + } + + public void info(String message) { + Log.i(tag, name + message); + } + + public void info(String message, Throwable throwable) { + Log.i(tag, name + message, throwable); + } + + public void warn(String message) { + Log.w(tag, name + message); + } + + public void warn(String message, Throwable throwable) { + Log.w(tag, name + message, throwable); + } + + public void error(String message) { + Log.e(tag, name + message); + } + + public void error(String message, Throwable throwable) { + Log.e(tag, name + message, throwable); + } +} diff --git a/Sources/logger/src/main/java/nl/endran/logger/LoggerWarn.java b/Sources/logger/src/main/java/nl/endran/logger/LoggerWarn.java new file mode 100644 index 0000000..73dc5bb --- /dev/null +++ b/Sources/logger/src/main/java/nl/endran/logger/LoggerWarn.java @@ -0,0 +1,47 @@ +package nl.endran.logger; + +import android.util.Log; + +public class LoggerWarn implements Logger { + String tag; + String name; + + public LoggerWarn(String tag, String name) { + this.tag = tag; + this.name = name; + } + + public void verbose(String message) { + } + + public void verbose(String message, Throwable throwable) { + } + + public void debug(String message) { + } + + public void debug(String message, Throwable throwable) { + } + + public void info(String message) { + } + + public void info(String message, Throwable throwable) { + } + + public void warn(String message) { + Log.w(tag, name + " :: " + message); + } + + public void warn(String message, Throwable throwable) { + Log.w(tag, name + " :: " + message, throwable); + } + + public void error(String message) { + Log.e(tag, name + " :: " + message); + } + + public void error(String message, Throwable throwable) { + Log.e(tag, name + " :: " + message, throwable); + } +} diff --git a/Sources/logger/src/main/res/drawable-hdpi/ic_launcher.png b/Sources/logger/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/Sources/logger/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/Sources/logger/src/main/res/drawable-mdpi/ic_launcher.png b/Sources/logger/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/Sources/logger/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/Sources/logger/src/main/res/drawable-xhdpi/ic_launcher.png b/Sources/logger/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/Sources/logger/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/Sources/logger/src/main/res/drawable-xxhdpi/ic_launcher.png b/Sources/logger/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/Sources/logger/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/Sources/logger/src/main/res/values/strings.xml b/Sources/logger/src/main/res/values/strings.xml new file mode 100644 index 0000000..106ea0d --- /dev/null +++ b/Sources/logger/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + Logger + diff --git a/Sources/loggerexample/.gitignore b/Sources/loggerexample/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Sources/loggerexample/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Sources/loggerexample/build.gradle b/Sources/loggerexample/build.gradle new file mode 100644 index 0000000..91779d7 --- /dev/null +++ b/Sources/loggerexample/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "nl.endran.loggerexample" + minSdkVersion 4 + targetSdkVersion 21 + 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 project(':logger') +} diff --git a/Sources/loggerexample/loggerexample.iml b/Sources/loggerexample/loggerexample.iml new file mode 100644 index 0000000..e7d907e --- /dev/null +++ b/Sources/loggerexample/loggerexample.iml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sources/loggerexample/proguard-rules.pro b/Sources/loggerexample/proguard-rules.pro new file mode 100644 index 0000000..f3d362f --- /dev/null +++ b/Sources/loggerexample/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 /Users/code1_310170244/Library/Android/sdk/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/Sources/loggerexample/src/androidTest/java/nl/endran/loggerexample/ApplicationTest.java b/Sources/loggerexample/src/androidTest/java/nl/endran/loggerexample/ApplicationTest.java new file mode 100644 index 0000000..29e174c --- /dev/null +++ b/Sources/loggerexample/src/androidTest/java/nl/endran/loggerexample/ApplicationTest.java @@ -0,0 +1,13 @@ +package nl.endran.loggerexample; + +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/Sources/loggerexample/src/main/AndroidManifest.xml b/Sources/loggerexample/src/main/AndroidManifest.xml new file mode 100644 index 0000000..d8e24d5 --- /dev/null +++ b/Sources/loggerexample/src/main/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/Sources/loggerexample/src/main/java/nl/endran/loggerexample/MainActivity.java b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/MainActivity.java new file mode 100644 index 0000000..a768c38 --- /dev/null +++ b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/MainActivity.java @@ -0,0 +1,35 @@ +package nl.endran.loggerexample; + +import android.app.Activity; +import android.os.Bundle; + +import nl.endran.logger.LogLevel; +import nl.endran.logger.Logger; +import nl.endran.logger.LoggerFactory; + +public class MainActivity extends Activity { + + { + LoggerFactory.setLogTag("EverythingIsAwesome"); + LoggerFactory.setLogLevel(LogLevel.INFO); + LoggerFactory.setSpecificLogLevel(WillAlsoLogDebug.class, LogLevel.DEBUG); + } + + Logger logger = LoggerFactory.getLogger(this); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + logger.debug("Won't get logged"); + logger.info("But this will"); + + WillAlsoLogDebug willAlsoLogDebug = new WillAlsoLogDebug(); + willAlsoLogDebug.doStuff(); + + + WillOnlyLogErrors willOnlyLogErrors = new WillOnlyLogErrors(); + willOnlyLogErrors.doStuff(); + } +} diff --git a/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillAlsoLogDebug.java b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillAlsoLogDebug.java new file mode 100644 index 0000000..cd9c286 --- /dev/null +++ b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillAlsoLogDebug.java @@ -0,0 +1,18 @@ +package nl.endran.loggerexample; + +import nl.endran.logger.Logger; +import nl.endran.logger.LoggerFactory; + +/** + * (C) Koninklijke Philips N.V., 2014. + * All rights reserved. + */ +public class WillAlsoLogDebug { + + Logger logger = LoggerFactory.getLogger(this); + + public void doStuff() { + logger.debug("Eventhough the global settings say that only INFO and higher get logged " + + "this will also get logged, because of the setSpecificLogLevel call"); + } +} diff --git a/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillOnlyLogErrors.java b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillOnlyLogErrors.java new file mode 100644 index 0000000..4bd2866 --- /dev/null +++ b/Sources/loggerexample/src/main/java/nl/endran/loggerexample/WillOnlyLogErrors.java @@ -0,0 +1,23 @@ +package nl.endran.loggerexample; + +import nl.endran.logger.LogLevel; +import nl.endran.logger.Logger; +import nl.endran.logger.LoggerFactory; + +/** + * (C) Koninklijke Philips N.V., 2014. + * All rights reserved. + */ +public class WillOnlyLogErrors { + + { + LoggerFactory.setSpecificLogLevel(this, LogLevel.ERROR); + } + + Logger logger = LoggerFactory.getLogger(this); + + public void doStuff() { + logger.info("This will not be logged, since we called setSpecificLogLevel with logLevel error"); + logger.error("This will be logged"); + } +} diff --git a/Sources/loggerexample/src/main/res/drawable-hdpi/ic_launcher.png b/Sources/loggerexample/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/Sources/loggerexample/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/Sources/loggerexample/src/main/res/drawable-mdpi/ic_launcher.png b/Sources/loggerexample/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/Sources/loggerexample/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/Sources/loggerexample/src/main/res/drawable-xhdpi/ic_launcher.png b/Sources/loggerexample/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/Sources/loggerexample/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/Sources/loggerexample/src/main/res/drawable-xxhdpi/ic_launcher.png b/Sources/loggerexample/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/Sources/loggerexample/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/Sources/loggerexample/src/main/res/layout/activity_main.xml b/Sources/loggerexample/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..53ce557 --- /dev/null +++ b/Sources/loggerexample/src/main/res/layout/activity_main.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/Sources/loggerexample/src/main/res/menu/menu_main.xml b/Sources/loggerexample/src/main/res/menu/menu_main.xml new file mode 100644 index 0000000..38ae07f --- /dev/null +++ b/Sources/loggerexample/src/main/res/menu/menu_main.xml @@ -0,0 +1,8 @@ + + + diff --git a/Sources/loggerexample/src/main/res/values-v21/styles.xml b/Sources/loggerexample/src/main/res/values-v21/styles.xml new file mode 100644 index 0000000..dba3c41 --- /dev/null +++ b/Sources/loggerexample/src/main/res/values-v21/styles.xml @@ -0,0 +1,5 @@ + + + + diff --git a/Sources/loggerexample/src/main/res/values-w820dp/dimens.xml b/Sources/loggerexample/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/Sources/loggerexample/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/Sources/loggerexample/src/main/res/values/dimens.xml b/Sources/loggerexample/src/main/res/values/dimens.xml new file mode 100644 index 0000000..47c8224 --- /dev/null +++ b/Sources/loggerexample/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ + + + 16dp + 16dp + diff --git a/Sources/loggerexample/src/main/res/values/strings.xml b/Sources/loggerexample/src/main/res/values/strings.xml new file mode 100644 index 0000000..fc4c8e7 --- /dev/null +++ b/Sources/loggerexample/src/main/res/values/strings.xml @@ -0,0 +1,8 @@ + + + + LoggerExample + Hello world! + Settings + + diff --git a/Sources/loggerexample/src/main/res/values/styles.xml b/Sources/loggerexample/src/main/res/values/styles.xml new file mode 100644 index 0000000..ff6c9d2 --- /dev/null +++ b/Sources/loggerexample/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/Sources/settings.gradle b/Sources/settings.gradle new file mode 100644 index 0000000..56d1909 --- /dev/null +++ b/Sources/settings.gradle @@ -0,0 +1 @@ +include ':app', ':logger', ':loggerexample'