Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit 2302650

Browse files
7LPdWcaW7LPdWcaW
committed
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 ...
2 parents c7f3991 + 1367305 commit 2302650

File tree

91 files changed

+3532
-1433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3532
-1433
lines changed

‎README.md

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
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.
44

5-
[Latest APK: (MD5) 734778062cd3ddfe521d104253868ae2 v1.4.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
5+
[Latest APK: (MD5) de708f0b7905ea193b6f414eedc7b3e4 v2.0](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-production-release.apk)
66

7-
[Latest APK (Discrete): (MD5) 5d47a1c0ef667d227e295ead0349c834 v1.4.1](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
7+
[Latest APK (Discrete): (MD5) 07fd56b31391b955f6321396d77ef115 v2.0](https://github.com/7LPdWcaW/GrowTracker-Android/raw/master/app/app-discrete-release.apk)
88

99
# Installation
1010

@@ -21,9 +21,13 @@ The app requires no permissions except for external storage (for caching plant d
2121
[![install](screenshots/install-thumb.png)](screenshots/install.png)
2222
[![plant list](screenshots/1-thumb.png)](screenshots/1.png)
2323
[![discrete plant list](screenshots/1b-thumb.png)](screenshots/1b.png)
24+
[![discrete plant list](screenshots/1c-thumb.png)](screenshots/1c.png)
25+
[![discrete plant list](screenshots/1d-thumb.png)](screenshots/1d.png)
26+
[![discrete plant list](screenshots/1e-thumb.png)](screenshots/1e.png)
2427
[![plant details](screenshots/2-thumb.png)](screenshots/2.png)
2528
[![feeding](screenshots/3-thumb.png)](screenshots/3.png)
2629
[![nutrients](screenshots/4-thumb.png)](screenshots/4.png)
30+
[![nutrients](screenshots/4b-thumb.png)](screenshots/4b.png)
2731
[![actions](screenshots/5-thumb.png)](screenshots/5.png)
2832
[![pictures](screenshots/6-thumb.png)](screenshots/6.png)
2933
[![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
4953
"strain": "test",
5054
"clone": <boolean>,
5155
"medium": <Medium>,
56+
"mediumDetails": <String>,
5257
"plantDate": 1234567890
5358
}
5459
```
@@ -69,37 +74,16 @@ One of,
6974

7075
Temperature measured in ºC
7176

72-
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
73-
74-
```
75-
{
76-
"nutrient": {
77-
"capc": <Double>,
78-
"kpc": <Double>,
79-
"mgpc": <Double>,
80-
"npc": <Double>,
81-
"ppc": <Double>,
82-
"spc": <Double>
83-
},
84-
"mlpl": <Double>,
85-
"ph": <Double>,
86-
"ppm": <Long>,
87-
"runoff": <Double>,
88-
"amount": <Integer>,
89-
"date": <Long>,
90-
"type": "Feed",
91-
"temp": <Integer>
92-
}
93-
```
9477

9578
### Action object (water)
9679

9780
Temperature measured in ºC
9881

99-
Water action is the same as a feeding action, sans the "nutrient" object
82+
Water action for waterings
10083

10184
```
10285
{
86+
"additives": [<Additive>],
10387
"ph": <Double>,
10488
"ppm": <Long>,
10589
"runoff": <Double>,
@@ -110,6 +94,15 @@ Water action is the same as a feeding action, sans the "nutrient" object
11094
}
11195
```
11296

97+
### Additive object - used for nutrients
98+
99+
```
100+
{
101+
"description": <String>,
102+
"amount": <Double>
103+
}
104+
```
105+
113106
### Action object (other)
114107

115108
Action can be one of,
@@ -156,7 +149,7 @@ You can decrypt your files using your passphrase either by writing a script that
156149

157150
#License
158151

159-
Copyright 2011-2015 7LPdWcaW
152+
Copyright 2014-2016 7LPdWcaW
160153

161154
Licensed under the Apache License, Version 2.0 (the "License");
162155
you may not use this file except in compliance with the License.

‎app/app-discrete-release.apk

165 KB
Binary file not shown.

‎app/app-production-release.apk

166 KB
Binary file not shown.

‎app/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ repositories {
66

77
android {
88
compileSdkVersion 24
9-
buildToolsVersion "22.0.1"
9+
buildToolsVersion "24.0.1"
1010

1111
defaultConfig {
1212
applicationId "me.anon.grow"
1313
minSdkVersion 15
14-
targetSdkVersion 22
15-
versionCode 5
16-
versionName "1.4.1"
14+
targetSdkVersion 24
15+
versionCode 6
16+
versionName "2.0"
1717
}
1818

1919
lintOptions {
@@ -33,10 +33,12 @@ android {
3333

3434
dependencies {
3535
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile 'com.android.support:appcompat-v7:24.0.0'
37-
compile 'com.android.support:recyclerview-v7:24.0.0'
38-
compile 'com.android.support:cardview-v7:24.0.0'
36+
compile 'com.android.support:appcompat-v7:24.1.1'
37+
compile 'com.android.support:recyclerview-v7:24.1.1'
38+
compile 'com.android.support:cardview-v7:24.1.1'
39+
compile 'com.android.support:design:24.1.1'
3940
compile 'com.google.code.gson:gson:2.4'
41+
compile 'com.squareup:otto:1.3.8'
4042
compile 'com.kennyc:snackbar:2.0.2'
4143
compile 'com.github.PhilJay:MPAndroidChart:v2.1.0'
4244
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
<activity android:name=".MainActivity" />
2323
<activity android:name=".AddPlantActivity" />
24-
<activity android:name=".AddFeedingActivity" />
25-
<activity android:name=".EditFeedingActivity" />
24+
<activity android:name=".AddWateringActivity" />
25+
<activity android:name=".EditWateringActivity" />
2626
<activity android:name=".ViewPhotosActivity" />
2727
<activity android:name=".EventsActivity" />
2828
<activity android:name=".StatisticsActivity" />

‎app/src/main/assets/plants.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
[
2+
{
3+
"actions": [
4+
{
5+
"date": 0,
6+
"newStage": "GERMINATION",
7+
"type": "StageChange"
8+
},
9+
{
10+
"date": 172800000,
11+
"newStage": "VEGETATION",
12+
"type": "StageChange"
13+
},
14+
{
15+
"date": 432000000,
16+
"newStage": "FLOWER",
17+
"type": "StageChange"
18+
}
19+
],
20+
"clone": false,
21+
"images": [],
22+
"name": "Lemon 1",
23+
"plantDate": 0,
24+
"stage": "HARVESTED",
25+
"strain": "Lemon haze"
26+
},
27+
{
28+
"actions": [
29+
{
30+
"date": 0,
31+
"newStage": "GERMINATION",
32+
"type": "StageChange"
33+
},
34+
{
35+
"date": 172800000,
36+
"newStage": "VEGETATION",
37+
"type": "StageChange"
38+
},
39+
{
40+
"date": 432000000,
41+
"newStage": "FLOWER",
42+
"type": "StageChange"
43+
}
44+
],
45+
"clone": false,
46+
"images": [],
47+
"name": "Lemon 2",
48+
"plantDate": 1,
49+
"stage": "VEGETATION",
50+
"strain": "Lemon haze"
51+
},
52+
{
53+
"actions": [
54+
{
55+
"date": 0,
56+
"newStage": "GERMINATION",
57+
"type": "StageChange"
58+
},
59+
{
60+
"date": 172800000,
61+
"newStage": "VEGETATION",
62+
"type": "StageChange"
63+
},
64+
{
65+
"date": 432000000,
66+
"newStage": "FLOWER",
67+
"type": "StageChange"
68+
}
69+
],
70+
"clone": false,
71+
"images": [],
72+
"name": "Lemon 3",
73+
"plantDate": 2,
74+
"stage": "VEGETATION",
75+
"strain": "Lemon haze"
76+
}
77+
]

‎app/src/main/assets/readme.html

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ <h3>Plant object</h3>
2424
"strain": "test",
2525
"clone": &lt;boolean&gt;,
2626
"medium": &lt;Medium&gt;,
27+
"mediumDetails": &lt;String&gt;,
2728
"plantDate": 1234567890
2829
}
2930
</pre>
@@ -36,39 +37,29 @@ <h3>Plant Stage (ENUM)</h3>
3637

3738
<h3>Action object (feeding)</h3>
3839
<p>Temperature measured in ºC</p>
39-
<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>
40+
<h3>Action object (water)</h3>
41+
<p>Water action for waterings</p>
4042
<pre>
4143
{
42-
"nutrient": {
43-
"capc": &lt;Double&gt;,
44-
"kpc": &lt;Double&gt;,
45-
"mgpc": &lt;Double&gt;,
46-
"npc": &lt;Double&gt;,
47-
"ppc": &lt;Double&gt;,
48-
"spc": &lt;Double&gt;
49-
},
50-
"mlpl": &lt;Double&gt;,
44+
"additives": [&lt;Additive&gt;],
5145
"ph": &lt;Double&gt;,
5246
"ppm": &lt;Long&gt;,
5347
"runoff": &lt;Double&gt;,
5448
"amount": &lt;Integer&gt;,
55-
"date": &lt;Long&gt;,
56-
"type": "Feed",
57-
"temp": &lt;Integer&gt;
49+
"date": 1431268453111,
50+
"type": "Water"
5851
}
5952
</pre>
60-
<h3>Action object (water)</h3>
61-
<p>Water action is the same as a feeding action, sans the "nutrient" object</p>
53+
54+
<h3>Additive object</h3>
55+
<p>Used for nutrients</p>
6256
<pre>
6357
{
64-
"ph": &lt;Double&gt;,
65-
"ppm": &lt;Long&gt;,
66-
"runoff": &lt;Double&gt;,
67-
"amount": &lt;Integer&gt;,
68-
"date": 1431268453111,
69-
"type": "Water"
58+
"description": &lt;String&gt;,
59+
"amount": &lt;Double&gt;
7060
}
7161
</pre>
62+
7263
<h3>Action object (other)</h3>
7364
<p>Action can be one of, <pre>TRIM, TOP, FIM, LST, LOLLIPOP, FLUSH, FOLIAR_FEED, PESTICIDE_APPLICATION</pre></p>
7465
<pre>

0 commit comments

Comments
 (0)