From e4bc865ba0abb79295e904504b73ebfb133e2d49 Mon Sep 17 00:00:00 2001 From: Thomas Saedt Date: Thu, 15 Aug 2019 12:15:49 +0200 Subject: [PATCH] cleaned up code a bit --- .../common/dialogs/NumberPickerFactory.kt | 1 - .../isoron/uhabits/intents/PendingIntentFactory.kt | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt index 4eea0699c..cfbacaca5 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt @@ -29,7 +29,6 @@ import org.isoron.androidbase.activities.* import org.isoron.androidbase.utils.* import org.isoron.uhabits.* import org.isoron.uhabits.core.ui.screens.habits.list.* -import javax.annotation.Nullable import javax.inject.* class NumberPickerFactory diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt index 76fe1c8e9..16d1ac5b1 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt @@ -36,7 +36,7 @@ class PendingIntentFactory private val intentFactory: IntentFactory) { fun addCheckmark(habit: Habit, timestamp: Timestamp?): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, 1, Intent(context, WidgetReceiver::class.java).apply { data = Uri.parse(habit.uriString) @@ -46,7 +46,7 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT) fun dismissNotification(habit: Habit): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, 0, Intent(context, ReminderReceiver::class.java).apply { action = WidgetReceiver.ACTION_DISMISS_REMINDER @@ -55,7 +55,7 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT) fun removeRepetition(habit: Habit): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, 3, Intent(context, WidgetReceiver::class.java).apply { action = WidgetReceiver.ACTION_REMOVE_REPETITION @@ -74,7 +74,7 @@ class PendingIntentFactory fun showReminder(habit: Habit, reminderTime: Long?, timestamp: Long): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, (habit.getId()!! % Integer.MAX_VALUE).toInt() + 1, Intent(context, ReminderReceiver::class.java).apply { @@ -86,7 +86,7 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT) fun snoozeNotification(habit: Habit): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, 0, Intent(context, ReminderReceiver::class.java).apply { data = Uri.parse(habit.uriString) @@ -95,7 +95,7 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT) fun toggleCheckmark(habit: Habit, timestamp: Long?): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( context, 2, Intent(context, WidgetReceiver::class.java).apply { data = Uri.parse(habit.uriString) @@ -105,7 +105,7 @@ class PendingIntentFactory FLAG_UPDATE_CURRENT) fun setNumericalValue(widgetContext: Context, habit: Habit, numericalValue: Int, timestamp: Long?): PendingIntent = - PendingIntent.getBroadcast( + getBroadcast( widgetContext, 2, Intent(widgetContext, WidgetReceiver::class.java).apply { data = Uri.parse(habit.uriString)