From 97d4cff2cb5af621205e15c1f3cb8b82828fd12f Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Wed, 26 Jun 2019 13:20:26 +0100 Subject: [PATCH 1/3] Fixes issue with empty backups directory causing crash in settings --- .../anon/grow/fragment/SettingsFragment.java | 30 ++++++++++--------- .../java/me/anon/lib/helper/BackupHelper.kt | 30 ++++++++++--------- 2 files changed, 32 insertions(+), 28 deletions(-) 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 ffd339ec..938f5d1f 100644 --- a/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java +++ b/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java @@ -616,7 +616,9 @@ else if ("export".equals(preference.getKey())) } else if ("backup_now".equals(preference.getKey())) { + String currentBackup = findPreference("backup_size").getSharedPreferences().getString("backup_size", "20"); Toast.makeText(getActivity(), "Backed up to " + BackupHelper.backupJson().getPath(), Toast.LENGTH_SHORT).show(); + findPreference("backup_size").setSummary("Currently " + currentBackup + "mb / Using " + lengthToString(BackupHelper.backupSize(), false)); } else if ("restore".equals(preference.getKey())) { @@ -650,15 +652,10 @@ class BackupData Arrays.sort(backupFiles); final ArrayList backups = new ArrayList(); - BackupData current = null; - Date lastDate = new Date(); + BackupData current = new BackupData(); + Date lastDate = null; for (String backup : backupFiles) { - if (current == null) - { - current = new BackupData(); - } - File backupFile = new File(backup); String[] parts = backupFile.getName().split("\\."); Date date = new Date(); @@ -682,9 +679,13 @@ class BackupData backups.add(backupData); continue; } - else + + if (lastDate == null || !date.equals(lastDate)) { + lastDate = date; + current = new BackupData(); current.date = date; + backups.add(current); } } else @@ -692,12 +693,11 @@ class BackupData continue; } - if (!current.date.equals(lastDate)) - { - lastDate = current.date; - backups.add(current); - current = new BackupData(); - } +// if (!date.equals(lastDate)) +// { +// lastDate = date; +// backups.add(current); +// } File file = new File(backupPath.getPath() + "/" + backup); if (backup.contains("plants")) @@ -747,6 +747,8 @@ class BackupData MainApplication.setFailsafe(false); } + if (selectedBackup.plantsPath == null) return; + if (selectedBackup.plantsPath.endsWith("dat") && !MainApplication.isEncrypted()) { SnackBar.show(getActivity(), "You must have encrpted mode enabled with the same password to restore this backup", "Enable", new SnackBarListener() diff --git a/app/src/main/java/me/anon/lib/helper/BackupHelper.kt b/app/src/main/java/me/anon/lib/helper/BackupHelper.kt index 28babaff..faf15498 100644 --- a/app/src/main/java/me/anon/lib/helper/BackupHelper.kt +++ b/app/src/main/java/me/anon/lib/helper/BackupHelper.kt @@ -21,12 +21,13 @@ object BackupHelper { if (MainApplication.isFailsafe()) return null - limitBackups() val isEncrypted = MainApplication.isEncrypted() val time = System.currentTimeMillis() - val backupPath = File(FILES_PATH) val ext = isEncrypted T "dat" ?: "bak" + val backupPath = File(FILES_PATH) backupPath.mkdirs() + limitBackups() + FileManager.getInstance().copyFile("${PlantManager.FILES_DIR}/plants.json", "$FILES_PATH/$time.plants.json.$ext") FileManager.getInstance().copyFile("${PlantManager.FILES_DIR}/schedules.json", "$FILES_PATH/$time.schedules.json.$ext") FileManager.getInstance().copyFile("${PlantManager.FILES_DIR}/gardens.json", "$FILES_PATH/$time.gardens.json.$ext") @@ -38,24 +39,25 @@ object BackupHelper public fun backupSize(): Long { val path = File(BackupHelper.FILES_PATH) - return path.listFiles().fold(0L, { acc, file -> acc + file.length() }) + return path.listFiles()?.fold(0L, { acc, file -> acc + file.length() }) ?: 0L } @JvmStatic public fun limitBackups(size: String = MainApplication.getDefaultPreferences().getString("backup_size", "20")!!) { - val files = File(BackupHelper.FILES_PATH).listFiles() - val sorted = ArrayList(files.sortedBy { it.lastModified() }) - val limit = size.toInt() * 1_048_576 - - var currentSize = backupSize() - while (currentSize > limit) - { - val remove = sorted.removeAt(0) - val len = remove.length() - if (remove.delete()) + File(BackupHelper.FILES_PATH).listFiles()?.let { + val sorted = ArrayList(it.sortedBy { it.lastModified() }) + val limit = size.toInt() * 1_048_576 + + var currentSize = backupSize() + while (currentSize > limit) { - currentSize -= len + val remove = sorted.removeAt(0) + val len = remove.length() + if (remove.delete()) + { + currentSize -= len + } } } } From 6376a062d6a4a86a95e3f31a58814284c32c9863 Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Wed, 26 Jun 2019 13:28:26 +0100 Subject: [PATCH 2/3] Updates screenshot paths and bumps version code --- README.md | 42 +++++++++--------- app/build.gradle | 4 +- .../anon/grow/fragment/SettingsFragment.java | 6 --- .../metadata/android/en-GB/changelogs/21.txt | 11 +++++ .../metadata/android/en-GB/changelogs/22.txt | 2 + .../en-GB}/images/phoneScreenshots/1.png | Bin .../en-GB}/images/phoneScreenshots/10.png | Bin .../en-GB}/images/phoneScreenshots/11.png | Bin .../en-GB}/images/phoneScreenshots/12.png | Bin .../en-GB}/images/phoneScreenshots/13.png | Bin .../en-GB}/images/phoneScreenshots/14.png | Bin .../en-GB}/images/phoneScreenshots/15.png | Bin .../en-GB}/images/phoneScreenshots/1b.png | Bin .../en-GB}/images/phoneScreenshots/1c.png | Bin .../en-GB}/images/phoneScreenshots/1d.png | Bin .../en-GB}/images/phoneScreenshots/1e.png | Bin .../en-GB}/images/phoneScreenshots/2.png | Bin .../en-GB}/images/phoneScreenshots/3.png | Bin .../en-GB}/images/phoneScreenshots/4.png | Bin .../en-GB}/images/phoneScreenshots/4b.png | Bin .../en-GB}/images/phoneScreenshots/5.png | Bin .../en-GB}/images/phoneScreenshots/6.png | Bin .../en-GB}/images/phoneScreenshots/7.png | Bin .../en-GB}/images/phoneScreenshots/8.png | Bin .../en-GB}/images/phoneScreenshots/9.png | Bin .../images/phoneScreenshots/install.png | Bin .../images/phoneScreenshotsThumbs/1-thumb.png | Bin .../phoneScreenshotsThumbs/10-thumb.png | Bin .../phoneScreenshotsThumbs/11-thumb.png | Bin .../phoneScreenshotsThumbs/12-thumb.png | Bin .../phoneScreenshotsThumbs/13-thumb.png | Bin .../phoneScreenshotsThumbs/14-thumb.png | Bin .../phoneScreenshotsThumbs/15-thumb.png | Bin .../phoneScreenshotsThumbs/1b-thumb.png | Bin .../phoneScreenshotsThumbs/1c-thumb.png | Bin .../phoneScreenshotsThumbs/1d-thumb.png | Bin .../phoneScreenshotsThumbs/1e-thumb.png | Bin .../images/phoneScreenshotsThumbs/2-thumb.png | Bin .../images/phoneScreenshotsThumbs/3-thumb.png | Bin .../images/phoneScreenshotsThumbs/4-thumb.png | Bin .../phoneScreenshotsThumbs/4b-thumb.png | Bin .../images/phoneScreenshotsThumbs/5-thumb.png | Bin .../images/phoneScreenshotsThumbs/6-thumb.png | Bin .../images/phoneScreenshotsThumbs/7-thumb.png | Bin .../images/phoneScreenshotsThumbs/8-thumb.png | Bin .../images/phoneScreenshotsThumbs/9-thumb.png | Bin .../phoneScreenshotsThumbs/install-thumb.png | Bin 47 files changed, 36 insertions(+), 29 deletions(-) create mode 100644 fastlane/metadata/android/en-GB/changelogs/21.txt create mode 100644 fastlane/metadata/android/en-GB/changelogs/22.txt rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/1.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/10.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/11.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/12.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/13.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/14.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/15.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/1b.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/1c.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/1d.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/1e.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/2.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/3.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/4.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/4b.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/5.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/6.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/7.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/8.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/9.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshots/install.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/1-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/10-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/11-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/12-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/13-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/14-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/15-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/1b-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/1c-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/1d-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/1e-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/2-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/3-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/4-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/4b-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/5-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/6-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/7-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/8-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/9-thumb.png (100%) rename {metadata => fastlane/metadata/android/en-GB}/images/phoneScreenshotsThumbs/install-thumb.png (100%) diff --git a/README.md b/README.md index 6d08fc50..e55797e3 100644 --- a/README.md +++ b/README.md @@ -32,27 +32,27 @@ You can either elect to update manually, or get notified on releases by installi # Screenshots -[![install](metadata/images/phoneScreenshotsThumbs/install-thumb.png)](metadata/images/phoneScreenshots/install.png) -[![plant list](metadata/images/phoneScreenshotsThumbs/1-thumb.png)](metadata/images/phoneScreenshots/1.png) -[![discrete plant list](metadata/images/phoneScreenshotsThumbs/1b-thumb.png)](metadata/images/phoneScreenshots/1b.png) -[![discrete plant list](metadata/images/phoneScreenshotsThumbs/1c-thumb.png)](metadata/images/phoneScreenshots/1c.png) -[![discrete plant list](metadata/images/phoneScreenshotsThumbs/1d-thumb.png)](metadata/images/phoneScreenshots/1d.png) -[![discrete plant list](metadata/images/phoneScreenshotsThumbs/1e-thumb.png)](metadata/images/phoneScreenshots/1e.png) -[![plant details](metadata/images/phoneScreenshotsThumbs/2-thumb.png)](metadata/images/phoneScreenshots/2.png) -[![feeding](metadata/images/phoneScreenshotsThumbs/3-thumb.png)](metadata/images/phoneScreenshots/3.png) -[![nutrients](metadata/images/phoneScreenshotsThumbs/4-thumb.png)](metadata/images/phoneScreenshots/4.png) -[![nutrients](metadata/images/phoneScreenshotsThumbs/4b-thumb.png)](metadata/images/phoneScreenshots/4b.png) -[![actions](metadata/images/phoneScreenshotsThumbs/5-thumb.png)](metadata/images/phoneScreenshots/5.png) -[![pictures](metadata/images/phoneScreenshotsThumbs/6-thumb.png)](metadata/images/phoneScreenshots/6.png) -[![statistics](metadata/images/phoneScreenshotsThumbs/7-thumb.png)](metadata/images/phoneScreenshots/7.png) -[![past actions](metadata/images/phoneScreenshotsThumbs/8-thumb.png)](metadata/images/phoneScreenshots/8.png) -[![action filters](metadata/images/phoneScreenshotsThumbs/9-thumb.png)](metadata/images/phoneScreenshots/9.png) -[![action options](metadata/images/phoneScreenshotsThumbs/10-thumb.png)](metadata/images/phoneScreenshots/10.png) -[![settings](metadata/images/phoneScreenshotsThumbs/11-thumb.png)](metadata/images/phoneScreenshots/11.png) -[![measurements](metadata/images/phoneScreenshotsThumbs/12-thumb.png)](metadata/images/phoneScreenshots/12.png) -[![schedules](metadata/images/phoneScreenshotsThumbs/13-thumb.png)](metadata/images/phoneScreenshots/13.png) -[![schedule details](metadata/images/phoneScreenshotsThumbs/14-thumb.png)](metadata/images/phoneScreenshots/14.png) -[![schedule date](metadata/images/phoneScreenshotsThumbs/15-thumb.png)](metadata/images/phoneScreenshots/15.png) +[![install](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/install-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/install.png) +[![plant list](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/1.png) +[![discrete plant list](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1b-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/1b.png) +[![discrete plant list](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1c-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/1c.png) +[![discrete plant list](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1d-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/1d.png) +[![discrete plant list](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1e-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/1e.png) +[![plant details](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/2-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/2.png) +[![feeding](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/3-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/3.png) +[![nutrients](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/4.png) +[![nutrients](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4b-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/4b.png) +[![actions](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/5-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/5.png) +[![pictures](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/6-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/6.png) +[![statistics](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/7-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/7.png) +[![past actions](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/8-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/8.png) +[![action filters](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/9-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/9.png) +[![action options](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/10-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/10.png) +[![settings](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/11-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/11.png) +[![measurements](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/12-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/12.png) +[![schedules](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/13-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/13.png) +[![schedule details](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/14-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/14.png) +[![schedule date](fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/15-thumb.png)](fastlane/metadata/android/en-GB/images/phoneScreenshots/15.png) # About the app diff --git a/app/build.gradle b/app/build.gradle index 063d010a..67a738a2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { applicationId "me.anon.grow" minSdkVersion 17 targetSdkVersion 28 - versionCode 21 - versionName "2.5" + versionCode 22 + versionName "2.5.1" javaCompileOptions { annotationProcessorOptions { 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 938f5d1f..79cad648 100644 --- a/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java +++ b/app/src/main/java/me/anon/grow/fragment/SettingsFragment.java @@ -693,12 +693,6 @@ class BackupData continue; } -// if (!date.equals(lastDate)) -// { -// lastDate = date; -// backups.add(current); -// } - File file = new File(backupPath.getPath() + "/" + backup); if (backup.contains("plants")) { diff --git a/fastlane/metadata/android/en-GB/changelogs/21.txt b/fastlane/metadata/android/en-GB/changelogs/21.txt new file mode 100644 index 00000000..bc736e50 --- /dev/null +++ b/fastlane/metadata/android/en-GB/changelogs/21.txt @@ -0,0 +1,11 @@ +- New reverse order setting. Requires app restart. Data is still stored as per the readme, this is purely cosmetic. +- Fixes issue with crash when going landscape is statistics view +- Adds seedling stage +- Adds approximate plant stage into photos view and lightbox view - approximate due to the nature of calculating the photo's date, but should always be correct +- Plant date will now always be the same as the planted stage. If either of these are changed, they are both changed. +- Fixes issue with restoring from encrypted backups. This will now warn you of potential encrypted backups you're restoring from. This may not work with files encrypted before this update but will still warn you if it fails to restore that it may be because of the file being encrypted. Restoring from encrypted files requires the app to also be in encrypted mode with *the same password* as the encrypted files. +- Fixes text overlay issues with actions on small screens +- Refactors export functionality so it should work better and have better notifications around it and fixes crash with export +- Adds garden export functionality +- Strain is now an optional field +- Fixes issue with feeding from previous dialog diff --git a/fastlane/metadata/android/en-GB/changelogs/22.txt b/fastlane/metadata/android/en-GB/changelogs/22.txt new file mode 100644 index 00000000..5182a329 --- /dev/null +++ b/fastlane/metadata/android/en-GB/changelogs/22.txt @@ -0,0 +1,2 @@ +- Fixes crash when going into settings for fresh installs +- Fixes issue with restore from backup not showing backups correctly diff --git a/metadata/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1.png similarity index 100% rename from metadata/images/phoneScreenshots/1.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/1.png diff --git a/metadata/images/phoneScreenshots/10.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/10.png similarity index 100% rename from metadata/images/phoneScreenshots/10.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/10.png diff --git a/metadata/images/phoneScreenshots/11.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/11.png similarity index 100% rename from metadata/images/phoneScreenshots/11.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/11.png diff --git a/metadata/images/phoneScreenshots/12.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/12.png similarity index 100% rename from metadata/images/phoneScreenshots/12.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/12.png diff --git a/metadata/images/phoneScreenshots/13.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/13.png similarity index 100% rename from metadata/images/phoneScreenshots/13.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/13.png diff --git a/metadata/images/phoneScreenshots/14.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/14.png similarity index 100% rename from metadata/images/phoneScreenshots/14.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/14.png diff --git a/metadata/images/phoneScreenshots/15.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/15.png similarity index 100% rename from metadata/images/phoneScreenshots/15.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/15.png diff --git a/metadata/images/phoneScreenshots/1b.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1b.png similarity index 100% rename from metadata/images/phoneScreenshots/1b.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/1b.png diff --git a/metadata/images/phoneScreenshots/1c.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1c.png similarity index 100% rename from metadata/images/phoneScreenshots/1c.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/1c.png diff --git a/metadata/images/phoneScreenshots/1d.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1d.png similarity index 100% rename from metadata/images/phoneScreenshots/1d.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/1d.png diff --git a/metadata/images/phoneScreenshots/1e.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/1e.png similarity index 100% rename from metadata/images/phoneScreenshots/1e.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/1e.png diff --git a/metadata/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/2.png similarity index 100% rename from metadata/images/phoneScreenshots/2.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/2.png diff --git a/metadata/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/3.png similarity index 100% rename from metadata/images/phoneScreenshots/3.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/3.png diff --git a/metadata/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/4.png similarity index 100% rename from metadata/images/phoneScreenshots/4.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/4.png diff --git a/metadata/images/phoneScreenshots/4b.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/4b.png similarity index 100% rename from metadata/images/phoneScreenshots/4b.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/4b.png diff --git a/metadata/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/5.png similarity index 100% rename from metadata/images/phoneScreenshots/5.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/5.png diff --git a/metadata/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/6.png similarity index 100% rename from metadata/images/phoneScreenshots/6.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/6.png diff --git a/metadata/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/7.png similarity index 100% rename from metadata/images/phoneScreenshots/7.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/7.png diff --git a/metadata/images/phoneScreenshots/8.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/8.png similarity index 100% rename from metadata/images/phoneScreenshots/8.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/8.png diff --git a/metadata/images/phoneScreenshots/9.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/9.png similarity index 100% rename from metadata/images/phoneScreenshots/9.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/9.png diff --git a/metadata/images/phoneScreenshots/install.png b/fastlane/metadata/android/en-GB/images/phoneScreenshots/install.png similarity index 100% rename from metadata/images/phoneScreenshots/install.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshots/install.png diff --git a/metadata/images/phoneScreenshotsThumbs/1-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/1-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/10-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/10-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/10-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/10-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/11-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/11-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/11-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/11-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/12-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/12-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/12-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/12-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/13-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/13-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/13-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/13-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/14-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/14-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/14-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/14-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/15-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/15-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/15-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/15-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/1b-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1b-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/1b-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1b-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/1c-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1c-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/1c-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1c-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/1d-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1d-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/1d-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1d-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/1e-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1e-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/1e-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/1e-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/2-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/2-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/2-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/2-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/3-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/3-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/3-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/3-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/4-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/4-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/4b-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4b-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/4b-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/4b-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/5-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/5-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/5-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/5-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/6-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/6-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/6-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/6-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/7-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/7-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/7-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/7-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/8-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/8-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/8-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/8-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/9-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/9-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/9-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/9-thumb.png diff --git a/metadata/images/phoneScreenshotsThumbs/install-thumb.png b/fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/install-thumb.png similarity index 100% rename from metadata/images/phoneScreenshotsThumbs/install-thumb.png rename to fastlane/metadata/android/en-GB/images/phoneScreenshotsThumbs/install-thumb.png From 946c0a3d07bc38bed42552abf68b1641dc490241 Mon Sep 17 00:00:00 2001 From: 7LPdWcaW <7LPdWcaW@gmail.com> Date: Wed, 26 Jun 2019 13:31:35 +0100 Subject: [PATCH 3/3] Updates readme for release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e55797e3..edf6fd24 100644 --- 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) aa3496894c364a766145a576122e3ee6 v2.5](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.5/v2.5-production.apk) +[Latest APK: (MD5) 2be1b62b6e31193f7036b8e41d9a12db v2.5.1](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.5.1/v2.5.1-production.apk) -[Latest APK (Discrete): (MD5) 0f68525415eb2fc3c77184cdb3c51443 v2.5](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.5/v2.5-discrete.apk) +[Latest APK (Discrete): (MD5) 97eb68a4a733b4a59a007ef48609e81c v2.5.1](https://github.com/7LPdWcaW/GrowTracker-Android/releases/download/v2.5.1/v2.5.1-discrete.apk) [Get it on F-Droid with automatic updates](https://f-droid.org/packages/me.anon.grow/)