Merge branch 'release/v2.0'

* release/v2.0: (87 commits) Updated APKs and readme Added validation for additive input Removed other feeds references Make notes input text cap sentence Fixed issue with editing additives not working Added catch for potential crash Allow numbers in plant names for export Updated readme screenshots Attempt to fix concurrency issue Added permission check on app open Make garden dialog cap words Added callback and progress for deleting plant Added basic async saving to speed up the app Added catch for hide harvested setting Do not save/allow re-ordering if filtering is in progress Added basic filtering Added filter menu ite Removed feeding filter Added permission checks for taking photos Added permission helper class ...
7LPdWcaW · Aug 28, 2016 · 2302650 · 2302650
2 parents c7f3991 + 1367305
commit 2302650
Show file tree

Hide file tree

Showing 91 changed files with 3,532 additions and 1,433 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 Welcome to grow tracker. This app was created to help record data about growing plants in order to monitor the growing conditions to help make the plants grow better, and identify potential issues during the grow process.
 
-[Latest APK: (MD5) 734778062cd3ddfe521d104253868ae2 v1.4.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
+[Latest APK: (MD5) de708f0b7905ea193b6f414eedc7b3e4 v2.0](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
 
-[Latest APK (Discrete): (MD5) 5d47a1c0ef667d227e295ead0349c834 v1.4.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
+[Latest APK (Discrete): (MD5) 07fd56b31391b955f6321396d77ef115 v2.0](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
 
 # Installation
 
@@ -21,9 +21,13 @@ The app requires no permissions except for external storage (for caching plant d
 [![install](screenshots/install-thumb.png)](screenshots/install.png)
 [![plant list](screenshots/1-thumb.png)](screenshots/1.png)
 [![discrete plant list](screenshots/1b-thumb.png)](screenshots/1b.png)
+[![discrete plant list](screenshots/1c-thumb.png)](screenshots/1c.png)
+[![discrete plant list](screenshots/1d-thumb.png)](screenshots/1d.png)
+[![discrete plant list](screenshots/1e-thumb.png)](screenshots/1e.png)
 [![plant details](screenshots/2-thumb.png)](screenshots/2.png)
 [![feeding](screenshots/3-thumb.png)](screenshots/3.png)
 [![nutrients](screenshots/4-thumb.png)](screenshots/4.png)
+[![nutrients](screenshots/4b-thumb.png)](screenshots/4b.png)
 [![actions](screenshots/5-thumb.png)](screenshots/5.png)
 [![pictures](screenshots/6-thumb.png)](screenshots/6.png)
 [![statistics](screenshots/7-thumb.png)](screenshots/7.png)
@@ -49,6 +53,7 @@ The structure is very simple. Note: date timestamps are all unix timestamps from
     "strain": "test",
     "clone": <boolean>,
     "medium": <Medium>,
+    "mediumDetails": <String>,
     "plantDate": 1234567890
 }
 ```
@@ -69,37 +74,16 @@ One of,
 
 Temperature measured in ºC
 
-Nutrient object consists of standard percentage of elements in the solution. Ca %, K %, Mg %, N %, P %, S %. usually in the format "1.5:1.0:2.6" for Ca/K/Mg
-
-```
-{
-    "nutrient": {
-        "capc": <Double>,
-        "kpc": <Double>,
-        "mgpc": <Double>,
-        "npc": <Double>,
-        "ppc": <Double>,
-        "spc": <Double>
-    },
-    "mlpl": <Double>,
-    "ph": <Double>,
-    "ppm": <Long>,
-    "runoff": <Double>,
-    "amount": <Integer>,
-    "date": <Long>,
-    "type": "Feed",
-    "temp": <Integer>
-}
-```
 
 ### Action object (water)
 
 Temperature measured in ºC
 
-Water action is the same as a feeding action, sans the "nutrient" object
+Water action for waterings
 
 ```
 {
+    "additives": [<Additive>],
     "ph": <Double>,
     "ppm": <Long>,
     "runoff": <Double>,
@@ -110,6 +94,15 @@ Water action is the same as a feeding action, sans the "nutrient" object
 }
 ```
 
+### Additive object - used for nutrients
+
+```
+{
+    "description": <String>,
+    "amount": <Double>
+}
+```
+
 ### Action object (other)
 
 Action can be one of,
@@ -156,7 +149,7 @@ You can decrypt your files using your passphrase either by writing a script that
 
 #License
 
-Copyright 2011-2015 7LPdWcaW
+Copyright 2014-2016 7LPdWcaW
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/app/app-discrete-release.apk b/app/app-discrete-release.apk
diff --git a/app/app-production-release.apk b/app/app-production-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,14 +6,14 @@ repositories {
 
 android {
 	compileSdkVersion 24
-	buildToolsVersion "22.0.1"
+	buildToolsVersion "24.0.1"
 
 	defaultConfig {
 		applicationId "me.anon.grow"
 		minSdkVersion 15
-		targetSdkVersion 22
-		versionCode 5
-		versionName "1.4.1"
+		targetSdkVersion 24
+		versionCode 6
+		versionName "2.0"
 	}
 
 	lintOptions {
@@ -33,10 +33,12 @@ android {
 
 dependencies {
 	compile fileTree(dir: 'libs', include: ['*.jar'])
-	compile 'com.android.support:appcompat-v7:24.0.0'
-	compile 'com.android.support:recyclerview-v7:24.0.0'
-	compile 'com.android.support:cardview-v7:24.0.0'
+	compile 'com.android.support:appcompat-v7:24.1.1'
+	compile 'com.android.support:recyclerview-v7:24.1.1'
+	compile 'com.android.support:cardview-v7:24.1.1'
+	compile 'com.android.support:design:24.1.1'
 	compile 'com.google.code.gson:gson:2.4'
+	compile 'com.squareup:otto:1.3.8'
 	compile 'com.kennyc:snackbar:2.0.2'
 	compile 'com.github.PhilJay:MPAndroidChart:v2.1.0'
 	compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 
 		<activity android:name=".MainActivity" />
 		<activity android:name=".AddPlantActivity" />
-		<activity android:name=".AddFeedingActivity" />
-		<activity android:name=".EditFeedingActivity" />
+		<activity android:name=".AddWateringActivity" />
+		<activity android:name=".EditWateringActivity" />
 		<activity android:name=".ViewPhotosActivity" />
 		<activity android:name=".EventsActivity" />
 		<activity android:name=".StatisticsActivity" />

diff --git a/app/src/main/assets/plants.json b/app/src/main/assets/plants.json
@@ -0,0 +1,77 @@
+[
+    {
+        "actions": [
+            {
+                "date": 0,
+                "newStage": "GERMINATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 172800000,
+                "newStage": "VEGETATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 432000000,
+                "newStage": "FLOWER",
+                "type": "StageChange"
+            }
+        ],
+        "clone": false,
+        "images": [],
+        "name": "Lemon 1",
+        "plantDate": 0,
+        "stage": "HARVESTED",
+        "strain": "Lemon haze"
+    },
+    {
+        "actions": [
+            {
+                "date": 0,
+                "newStage": "GERMINATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 172800000,
+                "newStage": "VEGETATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 432000000,
+                "newStage": "FLOWER",
+                "type": "StageChange"
+            }
+        ],
+        "clone": false,
+        "images": [],
+        "name": "Lemon 2",
+        "plantDate": 1,
+        "stage": "VEGETATION",
+        "strain": "Lemon haze"
+    },
+    {
+        "actions": [
+            {
+                "date": 0,
+                "newStage": "GERMINATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 172800000,
+                "newStage": "VEGETATION",
+                "type": "StageChange"
+            },
+            {
+                "date": 432000000,
+                "newStage": "FLOWER",
+                "type": "StageChange"
+            }
+        ],
+        "clone": false,
+        "images": [],
+        "name": "Lemon 3",
+        "plantDate": 2,
+        "stage": "VEGETATION",
+        "strain": "Lemon haze"
+    }
+]
diff --git a/app/src/main/assets/readme.html b/app/src/main/assets/readme.html
@@ -24,6 +24,7 @@ <h3>Plant object</h3>
     "strain": "test",
     "clone": &lt;boolean&gt;,
     "medium": &lt;Medium&gt;,
+    "mediumDetails": &lt;String&gt;,
     "plantDate": 1234567890
 }
             </pre>
@@ -36,39 +37,29 @@ <h3>Plant Stage (ENUM)</h3>
 
             <h3>Action object (feeding)</h3>
             <p>Temperature measured in ºC</p>
-            <p>Nutrient object consists of standard percentage of elements in the solution. Ca %, K %, Mg %, N %, P %, S %. usually in the format "1.5:1.0:2.6" for Ca/K/Mg</p>
+            <h3>Action object (water)</h3>
+            <p>Water action for waterings</p>
             <pre>
 {
-    "nutrient": {
-        "capc": &lt;Double&gt;,
-        "kpc": &lt;Double&gt;,
-        "mgpc": &lt;Double&gt;,
-        "npc": &lt;Double&gt;,
-        "ppc": &lt;Double&gt;,
-        "spc": &lt;Double&gt;
-    },
-    "mlpl": &lt;Double&gt;,
+    "additives": [&lt;Additive&gt;],
     "ph": &lt;Double&gt;,
     "ppm": &lt;Long&gt;,
     "runoff": &lt;Double&gt;,
     "amount": &lt;Integer&gt;,
-    "date": &lt;Long&gt;,
-    "type": "Feed",
-    "temp": &lt;Integer&gt;
+    "date": 1431268453111,
+    "type": "Water"
 }
             </pre>
-            <h3>Action object (water)</h3>
-            <p>Water action is the same as a feeding action, sans the "nutrient" object</p>
+
+            <h3>Additive object</h3>
+            <p>Used for nutrients</p>
             <pre>
 {
-    "ph": &lt;Double&gt;,
-    "ppm": &lt;Long&gt;,
-    "runoff": &lt;Double&gt;,
-    "amount": &lt;Integer&gt;,
-    "date": 1431268453111,
-    "type": "Water"
+    "description": &lt;String&gt;,
+    "amount": &lt;Double&gt;
 }
             </pre>
+
             <h3>Action object (other)</h3>
             <p>Action can be one of, <pre>TRIM, TOP, FIM, LST, LOLLIPOP, FLUSH, FOLIAR_FEED, PESTICIDE_APPLICATION</pre></p>
             <pre>