From 850e9e7974c557d8102848795f796f2699abe31a Mon Sep 17 00:00:00 2001 From: valentin lechner Date: Fri, 13 Sep 2024 18:27:46 +0200 Subject: [PATCH 1/2] fixing lighthhours when lightOnTime > lightOffTime --- .../java/me/anon/grow/fragment/GardenTrackerFragment.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/me/anon/grow/fragment/GardenTrackerFragment.kt b/app/src/main/java/me/anon/grow/fragment/GardenTrackerFragment.kt index f5003cf3..04985ab0 100644 --- a/app/src/main/java/me/anon/grow/fragment/GardenTrackerFragment.kt +++ b/app/src/main/java/me/anon/grow/fragment/GardenTrackerFragment.kt @@ -135,7 +135,11 @@ class GardenTrackerFragment : Fragment() if (it.off.isEmpty()) return@let val lightOnTime = LocalTime.parse(it.on, DateTimeFormatter.ofPattern("HH:mm")) val lightOffTime = LocalTime.parse(it.off, DateTimeFormatter.ofPattern("HH:mm")) - var diff = (abs(Duration.between(lightOnTime, lightOffTime).toMinutes()) / 15.0) + var addHours = 0L; + if (lightOnTime > lightOffTime) { + addHours = 24L; + } + var diff = ((Duration.between(lightOnTime, lightOffTime).plusHours(addHours).toMinutes()) / 15.0) if (diff == 0.0) diff = 96.0 binding.lightRatio.progress = diff.toInt() From 757b4c4947363501d8e5a4e56461ec508dae75b8 Mon Sep 17 00:00:00 2001 From: valentin lechner Date: Thu, 13 Feb 2025 16:16:15 +0100 Subject: [PATCH 2/2] Migrating to a new app This should allow even a debug build to access files stored in the release version. --- app/src/main/java/me/anon/lib/manager/PlantManager.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/me/anon/lib/manager/PlantManager.kt b/app/src/main/java/me/anon/lib/manager/PlantManager.kt index 86d519ba..e4baf53f 100644 --- a/app/src/main/java/me/anon/lib/manager/PlantManager.kt +++ b/app/src/main/java/me/anon/lib/manager/PlantManager.kt @@ -44,7 +44,8 @@ class PlantManager private constructor() public fun initialise(context: Context) { this.context = context.applicationContext - FILES_DIR = this.context.getExternalFilesDir(null)!!.absolutePath + val file = File("/storage/emulated/0/Android/data/me.anon.grow/files") + FILES_DIR = file.absolutePath } public fun indexOf(plant: Plant) = plants.indexOfFirst { it.id == plant.id }