From 54bcfe539c85673e06a2eb13ed3c894c7e4e9b8e Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Sat, 18 Aug 2018 12:07:07 +0100 Subject: [PATCH 1/6] Fixes kryo error for duplicating plants --- app/src/main/java/me/anon/model/Additive.java | 2 ++ app/src/main/java/me/anon/model/EmptyAction.java | 2 ++ app/src/main/java/me/anon/model/Garden.java | 2 ++ app/src/main/java/me/anon/model/NoteAction.java | 2 ++ app/src/main/java/me/anon/model/Nutrient.java | 2 ++ app/src/main/java/me/anon/model/Plant.java | 2 ++ app/src/main/java/me/anon/model/StageChange.java | 2 ++ app/src/main/java/me/anon/model/Water.java | 2 ++ 8 files changed, 16 insertions(+) diff --git a/app/src/main/java/me/anon/model/Additive.java b/app/src/main/java/me/anon/model/Additive.java index 6114f5a7..9db0909a 100644 --- a/app/src/main/java/me/anon/model/Additive.java +++ b/app/src/main/java/me/anon/model/Additive.java @@ -1,6 +1,7 @@ package me.anon.model; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ */ @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class Additive { private Double amount; diff --git a/app/src/main/java/me/anon/model/EmptyAction.java b/app/src/main/java/me/anon/model/EmptyAction.java index ce134a0a..724cc75f 100644 --- a/app/src/main/java/me/anon/model/EmptyAction.java +++ b/app/src/main/java/me/anon/model/EmptyAction.java @@ -3,6 +3,7 @@ import android.support.annotation.Nullable; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; /** @@ -13,6 +14,7 @@ * @project GrowTracker */ @Getter @Setter +@NoArgsConstructor public class EmptyAction extends Action { @Nullable private ActionName action; diff --git a/app/src/main/java/me/anon/model/Garden.java b/app/src/main/java/me/anon/model/Garden.java index ee3650d1..8d33b394 100644 --- a/app/src/main/java/me/anon/model/Garden.java +++ b/app/src/main/java/me/anon/model/Garden.java @@ -3,11 +3,13 @@ import java.util.ArrayList; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class Garden { protected String name; diff --git a/app/src/main/java/me/anon/model/NoteAction.java b/app/src/main/java/me/anon/model/NoteAction.java index fa2e7386..e91c13be 100644 --- a/app/src/main/java/me/anon/model/NoteAction.java +++ b/app/src/main/java/me/anon/model/NoteAction.java @@ -1,6 +1,7 @@ package me.anon.model; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; /** @@ -11,6 +12,7 @@ * @project GrowTracker */ @Getter @Setter +@NoArgsConstructor public class NoteAction extends Action { public NoteAction(String note) diff --git a/app/src/main/java/me/anon/model/Nutrient.java b/app/src/main/java/me/anon/model/Nutrient.java index aa343ab3..f3f7ff49 100644 --- a/app/src/main/java/me/anon/model/Nutrient.java +++ b/app/src/main/java/me/anon/model/Nutrient.java @@ -1,6 +1,7 @@ package me.anon.model; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ @Deprecated @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class Nutrient { private Double npc; // nitrogen diff --git a/app/src/main/java/me/anon/model/Plant.java b/app/src/main/java/me/anon/model/Plant.java index 4342bf90..d209fca9 100644 --- a/app/src/main/java/me/anon/model/Plant.java +++ b/app/src/main/java/me/anon/model/Plant.java @@ -13,6 +13,7 @@ import java.util.UUID; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; import me.anon.lib.DateRenderer; @@ -30,6 +31,7 @@ */ @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class Plant { private String id = UUID.randomUUID().toString(); diff --git a/app/src/main/java/me/anon/model/StageChange.java b/app/src/main/java/me/anon/model/StageChange.java index 7f819e2d..fe27b872 100644 --- a/app/src/main/java/me/anon/model/StageChange.java +++ b/app/src/main/java/me/anon/model/StageChange.java @@ -1,6 +1,7 @@ package me.anon.model; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; @@ -13,6 +14,7 @@ */ @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class StageChange extends Action { private PlantStage newStage; diff --git a/app/src/main/java/me/anon/model/Water.java b/app/src/main/java/me/anon/model/Water.java index bc1fee4b..4231c3cf 100644 --- a/app/src/main/java/me/anon/model/Water.java +++ b/app/src/main/java/me/anon/model/Water.java @@ -4,6 +4,7 @@ import java.util.List; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; @@ -16,6 +17,7 @@ */ @Getter @Setter @Accessors(prefix = {"m", ""}, chain = true) +@NoArgsConstructor public class Water extends Action { private Double ppm; From 52ea36f7e0116eed2deb048cd0b6cc453fda910c Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Sat, 18 Aug 2018 12:17:39 +0100 Subject: [PATCH 2/6] Added null check for pin dialog --- app/src/main/java/me/anon/grow/fragment/PinDialogFragment.java | 3 ++- app/src/main/java/me/anon/grow/fragment/SettingsFragment.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/anon/grow/fragment/PinDialogFragment.java b/app/src/main/java/me/anon/grow/fragment/PinDialogFragment.java index f9e547cc..a4b99f49 100644 --- a/app/src/main/java/me/anon/grow/fragment/PinDialogFragment.java +++ b/app/src/main/java/me/anon/grow/fragment/PinDialogFragment.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -22,7 +23,7 @@ public class PinDialogFragment extends DialogFragment { public static interface OnDialogConfirmed { - public void onDialogConfirmed(String input); + public void onDialogConfirmed(@Nullable String input); } public static interface OnDialogCancelled diff --git a/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java b/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java index d25af8ac..b79892e0 100644 --- a/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java +++ b/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java @@ -244,7 +244,7 @@ private void populateAddons() { @Override public void onDialogConfirmed(String input) { - if (input.equals(pin.toString())) + if (pin.toString().equals(String.valueOf(input))) { // Encrypt plant data PreferenceManager.getDefaultSharedPreferences(getActivity()).edit() From 67392e83785f7da2310eb94df7f0ad87b0eb0c11 Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Fri, 24 Aug 2018 14:35:21 +0100 Subject: [PATCH 3/6] Updates versions and adds dev app name --- app/build.gradle | 29 +++++++++++++++---------- app/src/discrete/res/values/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 772aead7..00e23c10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,13 +5,13 @@ repositories { } android { - compileSdkVersion 25 - buildToolsVersion "26.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "me.anon.grow" minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 27 versionCode 15 versionName "2.3.1" } @@ -29,6 +29,8 @@ android { "appType": "original" ] + resValue "string", "app_name", "GrowTracker" + dimension "type" } @@ -39,27 +41,30 @@ android { "appType": "discrete" ] + resValue "string", "app_name", "Tracker" + dimension "type" } } buildTypes { debug { + resValue "string", "app_name", "Dev GrowTracker" applicationIdSuffix = ".debug" } } } dependencies { - annotationProcessor 'org.projectlombok:lombok:1.16.14' - provided 'org.projectlombok:lombok:1.16.14' - provided 'org.glassfish:javax.annotation:10.0-b28' - - implementation 'com.android.support:appcompat-v7:25.4.0' - implementation 'com.android.support:recyclerview-v7:25.4.0' - implementation 'com.android.support:cardview-v7:25.4.0' - implementation 'com.android.support:design:25.4.0' - implementation "com.android.support:exifinterface:25.4.0" + annotationProcessor 'org.projectlombok:lombok:1.16.20' + compileOnly 'org.projectlombok:lombok:1.16.20' + compileOnly 'org.glassfish:javax.annotation:10.0-b28' + + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:recyclerview-v7:27.1.1' + implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation "com.android.support:exifinterface:27.1.1" implementation 'com.esotericsoftware:kryo:3.0.3' implementation 'com.google.code.gson:gson:2.8.1' diff --git a/app/src/discrete/res/values/strings.xml b/app/src/discrete/res/values/strings.xml index e40fa9e9..f11f7450 100644 --- a/app/src/discrete/res/values/strings.xml +++ b/app/src/discrete/res/values/strings.xml @@ -1,3 +1,3 @@ - Tracker + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 84dc813d..f11f7450 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - GrowTracker + diff --git a/build.gradle b/build.gradle index 796410d7..fc490ba1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 6e2de3df6010f05b6609b8fc9e42b03e9e6ee0de Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Sun, 26 Aug 2018 14:42:18 +0100 Subject: [PATCH 4/6] Adds quick "now" button for watering --- .../me/anon/grow/fragment/WateringFragment.java | 13 +++++++++++++ app/src/main/res/layout/add_watering_view.xml | 17 +++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/anon/grow/fragment/WateringFragment.java b/app/src/main/java/me/anon/grow/fragment/WateringFragment.java index a7fa6e0d..33fb8f10 100644 --- a/app/src/main/java/me/anon/grow/fragment/WateringFragment.java +++ b/app/src/main/java/me/anon/grow/fragment/WateringFragment.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import me.anon.controller.provider.PlantWidgetProvider; import me.anon.grow.R; @@ -468,4 +469,16 @@ private void setUi() getActivity().setResult(Activity.RESULT_OK); getActivity().finish(); } + + @Views.OnClick(R.id.date_now) public void onDateNowClick(View view) + { + final DateFormat dateFormat = android.text.format.DateFormat.getDateFormat(getActivity()); + final DateFormat timeFormat = android.text.format.DateFormat.getTimeFormat(getActivity()); + + Calendar date = GregorianCalendar.getInstance(); + String dateStr = dateFormat.format(date.getTime()) + " " + timeFormat.format(date.getTime()); + WateringFragment.this.date.setText(dateStr); + + water.setDate(date.getTimeInMillis()); + } } diff --git a/app/src/main/res/layout/add_watering_view.xml b/app/src/main/res/layout/add_watering_view.xml index 05da15eb..3866efe4 100644 --- a/app/src/main/res/layout/add_watering_view.xml +++ b/app/src/main/res/layout/add_watering_view.xml @@ -218,7 +218,7 @@ android:showDividers="middle" android:layout_marginTop="16dp" > - +