From 645a74a8a3641c6757ed6a4d5060908350133ec9 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 31 Jul 2019 14:05:09 +0200 Subject: [PATCH] more code cleanup --- android/uhabits-android/src/main/AndroidManifest.xml | 2 -- .../uhabits/activities/common/dialogs/NumberPickerFactory.kt | 2 -- .../isoron/uhabits/activities/habits/list/ListHabitsMenu.kt | 1 - .../main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt | 3 --- .../main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt | 4 ---- .../widgets/activities/NumericalCheckmarkWidgetActivity.kt | 3 --- .../isoron/uhabits/core/commands/CreateRepetitionCommand.java | 1 - .../java/org/isoron/uhabits/core/preferences/Preferences.java | 2 +- 8 files changed, 1 insertion(+), 17 deletions(-) diff --git a/android/uhabits-android/src/main/AndroidManifest.xml b/android/uhabits-android/src/main/AndroidManifest.xml index 9ed25f6cd..c26e8f5aa 100644 --- a/android/uhabits-android/src/main/AndroidManifest.xml +++ b/android/uhabits-android/src/main/AndroidManifest.xml @@ -175,9 +175,7 @@ - - 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 419efd380..4eea0699c 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 @@ -36,8 +36,6 @@ class NumberPickerFactory @Inject constructor( @ActivityContext private val context: Context ) { - - fun create(value: Double, unit: String, callback: ListHabitsBehavior.NumberPickerCallback): AlertDialog { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt index bc29429f4..348dd4ee7 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.kt @@ -46,7 +46,6 @@ class ListHabitsMenu @Inject constructor( hideArchivedItem.isChecked = !preferences.showArchived hideCompletedItem.isChecked = !preferences.showCompleted - topBarMenu = menu //the habit creation menu should be disabled when numeric habits are also disabled if (!preferences.isNumericalHabitsFeatureEnabled) { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt index 9721f2af1..92d95b1ba 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.kt @@ -83,9 +83,6 @@ class WidgetReceiver : BroadcastReceiver() { } - - - @ReceiverScope @Component(dependencies = [HabitsApplicationComponent::class]) internal interface WidgetComponent { diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt index a2fa3e881..d3cf86ccc 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidget.kt @@ -36,7 +36,6 @@ open class CheckmarkWidget( return pendingIntentFactory.toggleCheckmark(habit, null) } - override fun refreshData(v: View) { (v as CheckmarkWidgetView).apply { setPercentage(habit.scores.todayValue.toFloat()) @@ -45,11 +44,8 @@ open class CheckmarkWidget( setCheckmarkValue(habit.checkmarks.todayValue) refresh() } - - } - override fun buildView(): View = CheckmarkWidgetView(context) override fun getDefaultHeight() = 125 override fun getDefaultWidth() = 125 diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt index 84604dd4f..9bba182a5 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/NumericalCheckmarkWidgetActivity.kt @@ -16,7 +16,6 @@ import org.isoron.uhabits.intents.IntentParser import org.isoron.uhabits.intents.PendingIntentFactory import org.isoron.uhabits.widgets.WidgetUpdater - class NumericalCheckmarkWidgetActivity : Activity() { private lateinit var behavior : NumericalCheckmarkWidgetBehavior @@ -36,7 +35,6 @@ class NumericalCheckmarkWidgetActivity : Activity() { showNumberSelector(this) } - class CallBackReceiver : ListHabitsBehavior.NumberPickerCallback{ private val activity : NumericalCheckmarkWidgetActivity @@ -68,5 +66,4 @@ class NumericalCheckmarkWidgetActivity : Activity() { companion object{ const val ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY = "org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" } - } \ No newline at end of file diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java index 417a4127b..1857304a5 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/commands/CreateRepetitionCommand.java @@ -62,7 +62,6 @@ public class CreateRepetitionCommand extends Command reps.add(newRep); habit.invalidateNewerThan(timestamp); - } @NonNull diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java index 20ab46d2d..7cb013a4d 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java @@ -206,7 +206,7 @@ public class Preferences public boolean isDeveloper() { - return true;//return storage.getBoolean("pref_developer", false); + return storage.getBoolean("pref_developer", false); } public void setDeveloper(boolean isDeveloper)