Merge branch 'modules' into dev

uhabits-android/build.gradle

@@ -0,0 +1,145 @@
+apply plugin: 'idea'
+apply plugin: 'com.android.application'
+apply plugin: 'jacoco'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        applicationId "org.isoron.uhabits"
+        minSdkVersion 19
+        targetSdkVersion 25
+
+        buildConfigField "Integer", "databaseVersion", "19"
+        buildConfigField "String", "databaseFilename", "\"uhabits.db\""
+        buildConfigField "int", "roboSdk", (System.getenv("ROBO_SDK") ?: "25")
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+        debug {
+            testCoverageEnabled true
+        }
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+    }
+
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
+
+    testOptions {
+        unitTests.all {
+            testLogging {
+                events "passed", "skipped", "failed", "standardOut", "standardError"
+                outputs.upToDateWhen { false }
+                showStandardStreams = true
+            }
+            jacoco {
+                includeNoLocationClasses = true
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation project(":uhabits-core")
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:design:25.3.1'
+    implementation 'com.android.support:preference-v14:25.3.1'
+    implementation 'com.android.support:support-v4:25.3.1'
+    implementation 'com.getpebble:pebblekit:3.0.0'
+    implementation 'com.github.paolorotolo:appintro:3.4.0'
+    implementation 'com.google.dagger:dagger:2.9'
+    implementation 'com.jakewharton:butterknife:8.6.1-SNAPSHOT'
+    implementation 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
+    implementation 'org.apmem.tools:layouts:1.10'
+    implementation 'org.jetbrains:annotations-java5:15.0'
+    implementation 'com.google.code.gson:gson:2.7'
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly 'javax.annotation:jsr250-api:1.0'
+    compileOnly 'com.google.auto.factory:auto-factory:1.0-beta3'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.9'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
+    annotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
+
+    androidTestImplementation project(":uhabits-core")
+    androidTestImplementation 'com.android.support:support-annotations:25.3.1'
+    androidTestImplementation 'com.android.support.test:rules:0.5'
+    androidTestImplementation 'com.android.support.test:runner:0.5'
+    androidTestImplementation 'com.google.guava:guava:20.0'
+    androidTestCompileOnly 'com.google.auto.factory:auto-factory:1.0-beta3'
+    androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.9'
+    androidTestAnnotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
+    androidTestAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
+
+    testAnnotationProcessor 'com.google.dagger:dagger-compiler:2.9'
+    testAnnotationProcessor 'com.google.auto.factory:auto-factory:1.0-beta3'
+    testAnnotationProcessor 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
+
+    testCompile 'com.google.dagger:dagger:2.9'
+    testCompile "org.mockito:mockito-core:2.8.9"
+    testCompile "org.mockito:mockito-inline:2.8.9"
+    androidTestCompile 'com.google.dagger:dagger:2.9'
+    androidTestCompile "org.mockito:mockito-android:2.8.9"
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:2.2.2'
+    androidTestCompile 'com.linkedin.testbutler:test-butler-library:1.3.1'
+
+    implementation('com.opencsv:opencsv:3.9') {
+        exclude group: 'commons-logging', module: 'commons-logging'
+    }
+    implementation('io.socket:socket.io-client:+') {
+        exclude group: 'org.json', module: 'json'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+task coverageReport(type: JacocoReport) {
+
+    jacocoClasspath = configurations['androidJacocoAnt']
+
+    reports {
+        html.enabled = true
+        xml.enabled = true
+    }
+
+    def excludes = [
+            '**/R.class',
+            '**/R$*.class',
+            '**/BuildConfig.*',
+            '**/Manifest*',
+            '**/*Test*.*',
+            '**/*$Lambda$*',
+            '**/*$ViewBinder*',
+            '**/*MembersInjector*',
+            '**/*_Provide*',
+            '**/*Module_*',
+            '**/com/android/**/*',
+            '**/*Dagger*',
+            '**/*_Factory*'
+    ]
+
+    def androidSrc = "${project.projectDir}/src/main/java"
+    def androidClasses = "${buildDir}/intermediates/classes/debug"
+    def jvmExecData = "${buildDir}/jacoco/testDebugUnitTest.exec"
+    def connectedExecData = "${buildDir}/outputs/code-coverage/connected/coverage.ec"
+
+    sourceDirectories = files(androidSrc)
+    classDirectories = files(fileTree(dir: androidClasses, excludes: excludes))
+    executionData = files(jvmExecData, connectedExecData)
+}

uhabits-android/lint.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+</lint>

uhabits-android/proguard-rules.txt

@@ -0,0 +1,43 @@
+-dontwarn java.**
+-dontwarn javax.**
+-dontwarn com.google.auto.**
+-dontwarn com.google.errorprone.annotations.**
+-dontwarn com.google.j2objc.annotations.**
+-dontwarn okio.**
+-dontwarn okhttp3.**
+-dontwarn sun.misc.**
+-dontwarn org.codehaus.mojo.**
+-dontwarn com.google.gson.internal.*
+-dontwarn com.google.common.util.concurrent.*
+-dontwarn com.google.auto.common.*
+-dontwarn org.apache.commons.beanutils.*
+-dontwarn org.isoron.uhabits.HabitsApplication
+
+-dontobfuscate
+
+-keep class sun.misc.Unsafe { *; }
+-keep class org.isoron.** { *; }
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-keepclassmembers class * extends android.content.Context {
+    public void *(android.view.View);
+    public void *(android.view.MenuItem);
+}
+-keep public class * extends android.app.Activity
+-dontskipnonpubliclibraryclassmembers

uhabits-android/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+-->
+<manifest
+    package="org.isoron.uhabits"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <instrumentation>
+        <meta-data android:name="notPackage" android:value="net.bytebuddy"/>
+    </instrumentation>
+</manifest>

uhabits-android/src/androidTest/assets/habitbull.csv

@@ -0,0 +1,19 @@
+HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
+Breed dragons,with love and fire,Diet & Food,2016-03-18,1,
+Breed dragons,with love and fire,Diet & Food,2016-03-19,1,
+Breed dragons,with love and fire,Diet & Food,2016-03-21,1,
+Reduce sleep,only 2 hours per day,Time Management,2016-03-15,1,
+Reduce sleep,only 2 hours per day,Time Management,2016-03-16,1,
+Reduce sleep,only 2 hours per day,Time Management,2016-03-17,1,
+Reduce sleep,only 2 hours per day,Time Management,2016-03-21,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-15,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-16,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-18,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-21,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-15,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-16,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-18,1,
+No-arms pushup,Become like water my friend!,Fitness,2016-03-21,1,
+Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-15,1,
+Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-17,1,
+Grow spiritually,"transcend ego, practice compassion, smile and breath",Meditation,2016-03-21,1,

uhabits-android/src/androidTest/assets/pull_failed

@@ -0,0 +1,5 @@
+#!/bin/bash
+P=/sdcard/Android/data/org.isoron.uhabits/cache/Failed/
+
+adb pull $P Failed/
+adb shell rm -r $P