From 090216ccb7795060038e2bfb2f27c426334ab914 Mon Sep 17 00:00:00 2001 From: Jakub Kalinowski Date: Sat, 5 Mar 2022 19:54:48 +0100 Subject: [PATCH 1/6] Fixed edit history calendar bug --- .../java/org/isoron/uhabits/core/ui/views/HistoryChart.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt index 699cc2ee6..daf4219ee 100644 --- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt +++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/HistoryChart.kt @@ -75,7 +75,7 @@ class HistoryChart( val col = ((x - padding) / squareSize).toInt() val row = ((y - padding) / squareSize).toInt() val offset = col * 7 + (row - 1) - if (row == 0 || col == nColumns) return + if (x - padding < 0 || row == 0 || row > 7 || col == nColumns) return val clickedDate = topLeftDate.plus(offset) if (clickedDate.isNewerThan(today)) return onDateClickedListener.onDateClicked(clickedDate) From 609886fd097f06c311033cd81715d3c616ed3986 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 20 Mar 2022 11:14:53 -0500 Subject: [PATCH 2/6] Fix iOS build scripts --- uhabits-core-legacy/settings.gradle | 2 -- uhabits-ios/uhabits.xcodeproj/project.pbxproj | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/uhabits-core-legacy/settings.gradle b/uhabits-core-legacy/settings.gradle index 80e2d76a1..20ee303a3 100644 --- a/uhabits-core-legacy/settings.gradle +++ b/uhabits-core-legacy/settings.gradle @@ -7,5 +7,3 @@ pluginManagement { } } } - -enableFeaturePreview("GRADLE_METADATA") \ No newline at end of file diff --git a/uhabits-ios/uhabits.xcodeproj/project.pbxproj b/uhabits-ios/uhabits.xcodeproj/project.pbxproj index a475d6f0c..75fc10fc7 100644 --- a/uhabits-ios/uhabits.xcodeproj/project.pbxproj +++ b/uhabits-ios/uhabits.xcodeproj/project.pbxproj @@ -61,7 +61,7 @@ 00C0C6BA22465F65003D8AF0 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = ""; }; 00C0C6BB22465F65003D8AF0 /* databases */ = {isa = PBXFileReference; lastKnownFileType = folder; path = databases; sourceTree = ""; }; 00C0C6BC22465F65003D8AF0 /* migrations */ = {isa = PBXFileReference; lastKnownFileType = folder; path = migrations; sourceTree = ""; }; - 00C0C6C92246E543003D8AF0 /* LoopHabitTracker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopHabitTracker.framework; path = ../core/build/bin/ios/debugFramework/LoopHabitTracker.framework; sourceTree = ""; }; + 00C0C6C92246E543003D8AF0 /* LoopHabitTracker.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopHabitTracker.framework; path = "../uhabits-core-legacy/build/bin/ios/debugFramework/LoopHabitTracker.framework"; sourceTree = ""; }; 00C0C6D022470705003D8AF0 /* ComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComponentView.swift; sourceTree = ""; }; 00C0C6DE224A35FC003D8AF0 /* DetailScreenController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailScreenController.swift; sourceTree = ""; }; 00D48BD02200A31300CC4527 /* Launch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Launch.storyboard; sourceTree = ""; }; @@ -157,7 +157,7 @@ 00C0C6BC22465F65003D8AF0 /* migrations */, ); name = Assets; - path = ../core/assets/main; + path = "../uhabits-core-legacy/assets/main"; sourceTree = ""; }; 00C0C6D622471BA3003D8AF0 /* Platform */ = { @@ -285,7 +285,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd ../core\n./gradlew linkDebugFrameworkIos\n"; + shellScript = "cd ../uhabits-core-legacy\n../gradlew linkDebugFrameworkIos\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -451,10 +451,10 @@ DEVELOPMENT_TEAM = R5YTHGE3PS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../core/build/bin/ios/debugFramework/", + "$(PROJECT_DIR)/../uhabits-core-legacy/build/bin/ios/debugFramework/", "$(PROJECT_DIR)", ); - HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/debugFramework/LoopHabitTracker.framework/Headers/"; + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../uhabits-core-legacy/build/bin/ios/debugFramework/LoopHabitTracker.framework/Headers/"; INFOPLIST_FILE = Application/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -479,10 +479,10 @@ DEVELOPMENT_TEAM = R5YTHGE3PS; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( - "$(PROJECT_DIR)/../core/build/bin/ios/debugFramework/", + "$(PROJECT_DIR)/../uhabits-core-legacy/build/bin/ios/debugFramework/", "$(PROJECT_DIR)", ); - HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../core/build/bin/ios/debugFramework/LoopHabitTracker.framework/Headers/"; + HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../uhabits-core-legacy/build/bin/ios/debugFramework/LoopHabitTracker.framework/Headers/"; INFOPLIST_FILE = Application/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", From 88b86634841e074a195bbf92134a9f66df5454ef Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 2 Jan 2022 11:28:27 -0600 Subject: [PATCH 3/6] Remove pref_led_notifications --- .../uhabits/notifications/AndroidNotificationTray.kt | 4 ---- .../uhabits/preferences/SharedPreferencesStorage.kt | 2 -- uhabits-android/src/main/res/xml/preferences.xml | 7 ------- .../org/isoron/uhabits/core/preferences/Preferences.kt | 9 --------- .../isoron/uhabits/core/preferences/PreferencesTest.kt | 3 --- 5 files changed, 25 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt index 3721f04d5..07b215440 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt @@ -25,7 +25,6 @@ import android.app.NotificationChannel import android.app.NotificationManager import android.content.Context import android.graphics.BitmapFactory.decodeResource -import android.graphics.Color import android.os.Build import android.os.Build.VERSION.SDK_INT import android.util.Log @@ -150,9 +149,6 @@ class AndroidNotificationTray if (!disableSound) builder.setSound(ringtoneManager.getURI()) - if (preferences.shouldMakeNotificationsLed()) - builder.setLights(Color.RED, 1000, 1000) - if (SDK_INT < Build.VERSION_CODES.S) { val snoozeAction = Action( R.drawable.ic_action_snooze, diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt index ec78e5d6b..0e019be0c 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/preferences/SharedPreferencesStorage.kt @@ -90,8 +90,6 @@ class SharedPreferencesStorage preferences.isMidnightDelayEnabled = getBoolean(key, false) "pref_sticky_notifications" -> preferences.setNotificationsSticky(getBoolean(key, false)) - "pref_led_notifications" -> - preferences.setNotificationsLed(getBoolean(key, false)) "pref_unknown_enabled" -> { preferences.areQuestionMarksEnabled = getBoolean(key, false) } diff --git a/uhabits-android/src/main/res/xml/preferences.xml b/uhabits-android/src/main/res/xml/preferences.xml index 89ab445f9..5da126053 100644 --- a/uhabits-android/src/main/res/xml/preferences.xml +++ b/uhabits-android/src/main/res/xml/preferences.xml @@ -99,13 +99,6 @@ android:title="@string/sticky_notifications" app:iconSpaceReserved="false" /> - - Date: Sun, 2 Jan 2022 11:37:06 -0600 Subject: [PATCH 4/6] Remove leading/trailing whitespace from notes --- .../uhabits/activities/common/dialogs/NumberPickerFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt index 0845999c2..de2401c46 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt @@ -99,7 +99,7 @@ class NumberPickerFactory picker.clearFocus() picker2.clearFocus() val v = picker.value + 0.01 * picker2.value - val note = etNotes.text.toString() + val note = etNotes.text.toString().trim() callback.onNumberPicked(v, note) } .setNegativeButton(android.R.string.cancel) { _, _ -> From 2f13aba22c2f81caf7ca19eaae6773450822f9ed Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 2 Jan 2022 11:52:51 -0600 Subject: [PATCH 5/6] CheckmarkButtonView: Make focusable --- .../uhabits/activities/habits/list/views/CheckmarkButtonView.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt index 9108e5123..a142e3044 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt @@ -83,7 +83,6 @@ class CheckmarkButtonView( private var drawer = Drawer() init { - isFocusable = false setOnClickListener(this) setOnLongClickListener(this) } From ca4618579e3912f0d8d0a162f23866882dafc705 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Sun, 2 Jan 2022 11:53:04 -0600 Subject: [PATCH 6/6] Reduce toggle delay --- .../uhabits/activities/habits/list/views/HabitCardView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt index 551cb73c3..4024fbfe0 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.kt @@ -306,7 +306,7 @@ class HabitCardView( } companion object { - const val TOGGLE_DELAY_MILLIS = 2000L + const val TOGGLE_DELAY_MILLIS = 1000L fun (() -> Unit).delay(delayInMillis: Long) { Handler(Looper.getMainLooper()).postDelayed(this, delayInMillis)