From 133c98da374a1e01ed0b24f6b57d52229d63c339 Mon Sep 17 00:00:00 2001 From: rivago Date: Thu, 4 Apr 2024 14:37:30 +0200 Subject: [PATCH] fix ktlint --- .../activities/habits/edit/EditHabitActivity.kt | 10 +++++----- .../org/isoron/uhabits/receivers/WidgetReceiver.kt | 2 +- .../java/org/isoron/uhabits/widgets/CheckmarkWidget.kt | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt index 6b9a0421d..88d456125 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt @@ -117,7 +117,6 @@ class EditHabitActivity : AppCompatActivity() { binding.notesInput.setText(habit.description) binding.unitInput.setText(habit.unit) binding.targetInput.setText(habit.targetValue.toString()) - } else { habitType = HabitType.fromInt(intent.getIntExtra("habitType", HabitType.YES_NO.value)) } @@ -366,15 +365,16 @@ class EditHabitActivity : AppCompatActivity() { @SuppressLint("StringFormatMatches") private fun populateWidgetAction() { - binding.widgetActionPicker.text = when (increment){ + binding.widgetActionPicker.text = when (increment) { 0.0 -> getString(R.string.widget_action_dialog) else -> getString(R.string.widget_action_increment) } binding.incrementInput.setText(increment.toString()) - if (increment != 0.0) + if (increment != 0.0) { binding.incrementRightBox.visibility = View.VISIBLE - else + } else { binding.incrementRightBox.visibility = View.GONE + } } private fun populateTargetType() { @@ -411,7 +411,7 @@ class EditHabitActivity : AppCompatActivity() { putInt("reminderHour", reminderHour) putInt("reminderMin", reminderMin) putInt("reminderDays", reminderDays.toInteger()) - putDouble("increment",increment) + putDouble("increment", increment) } } } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt index a4ff36eee..680374e29 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt @@ -108,7 +108,7 @@ class WidgetReceiver : BroadcastReceiver() { data.timestamp.unixTime ) ) - controller.onIncrement(data.habit,data.timestamp,(data.habit.increment * 1000).toInt()) + controller.onIncrement(data.habit, data.timestamp, (data.habit.increment * 1000).toInt()) } } } catch (e: RuntimeException) { diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt index 6471ea9c1..08b2c8301 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt @@ -41,10 +41,11 @@ open class CheckmarkWidget( override fun getOnClickPendingIntent(context: Context): PendingIntent? { return if (habit.isNumerical) { - if (habit.increment == 0.0) + if (habit.increment == 0.0) { pendingIntentFactory.showNumberPicker(habit, DateUtils.getTodayWithOffset()) - else + } else { pendingIntentFactory.incrementNumerical(habit, null) + } } else { pendingIntentFactory.toggleCheckmark(habit, null) }