Skip to content

Commit

Permalink
Merge branch 'release/v2.4-beta1' into develop
Browse files Browse the repository at this point in the history
* release/v2.4-beta1:
  Updates readme
  Bumps version
  Updates image action to show most recent photo date
  • Loading branch information
7LPdWcaW committed Jan 23, 2019
2 parents 26e4d69 + 553ba32 commit fc4864e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
20 changes: 16 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) a7ddb62f96c2e31a226e372563cc8552 v2.4-alpha2](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.4-alpha2/v2.4-alpha2-production.apk)
[Latest APK: (MD5) accc43f8dfff1fb51fc15c1ff54cfc6c v2.4-beta1](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.4-alpha2/v2.4-alpha2-production.apk)

[Latest APK (Discrete): (MD5) aab44d0a1b2dcf02740d1c893bf1f5b5 v2.4-alpha2](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.4-alpha2/v2.4-alpha2-discrete.apk)
[Latest APK (Discrete): (MD5) 03b931b602f1619e12021292a854342c v2.4-beta1](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.4-alpha2/v2.4-alpha2-discrete.apk)

# Installation

Expand Down Expand Up @@ -53,6 +53,8 @@ Lombok is required for this project before you are able to compile. You can inst

### Plant object

- Plant date in milliseconds

```
{
"id": <String>,
Expand Down Expand Up @@ -86,7 +88,9 @@ Temperature measured in ºC

### Action object (water)

Temperature measured in ºC
- Temperature measured in ºC
- Amount measured in ml
- Date is milliseconds

Water action for waterings

Expand All @@ -99,12 +103,14 @@ Water action for waterings
"amount": <Double>,
"date": 1431268453111,
"type": "Water",
"temp": <Integer>
"temp": <Double>
}
```

### Additive object - used for nutrients

- Amount is measured in ml

```
{
"description": <String>,
Expand All @@ -118,6 +124,8 @@ Action can be one of,

`FIM`, `FLUSH`, `FOLIAR_FEED`, `LST`, `LOLLIPOP`, `PESTICIDE_APPLICATION`, `TOP`, `TRANSPLANTED`, `TRIM`

- Date in milliseconds

```
{
"action": <Action>,
Expand All @@ -128,6 +136,8 @@ Action can be one of,

### Stage change

- Date in milliseconds

```
{
"newStage": <Plant Stage>,
Expand All @@ -138,6 +148,8 @@ Action can be one of,

### Note

- Date in milliseconds

```
{
"notes": <String>,
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId "me.anon.grow"
minSdkVersion 17
targetSdkVersion 28
versionCode 18
versionName "2.4-alpha2"
versionCode 19
versionName "2.4-beta1"

javaCompileOptions {
annotationProcessorOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ private static class ImageAction extends Action

@Override public long getDate()
{
return getImageDate(images.get(images.size() - 1));
return getImageDate(images.get(0));
}
}

Expand Down

0 comments on commit fc4864e

Please sign in to comment.