From fd0341460777ee7221912c81992ed60df020e886 Mon Sep 17 00:00:00 2001 From: Thomas S Date: Sat, 27 Jun 2020 16:59:38 +0200 Subject: [PATCH] Fixed merge bugs --- .../uhabits/activities/habits/list/ListHabitsScreen.kt | 9 +++++++-- .../{WidgetReceiver.java => WidgetReceiver.java.bak} | 0 .../uhabits/core/ui/widgets/BaseWidgetBehavior.java | 2 +- .../ui/widgets/NumericalCheckmarkWidgetBehavior.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) rename android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/{WidgetReceiver.java => WidgetReceiver.java.bak} (100%) diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt index 2a8ed0b2a..d955640c1 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt @@ -136,12 +136,17 @@ class ListHabitsScreen } override fun showCreateBooleanHabitScreen() { - val dialog = editHabitDialogFactory.createBoolean() + val dialog = HabitTypeDialog() activity.showDialog(dialog, "editHabit") } + override fun showSelectHabitTypeDialog() { + val dialog = HabitTypeDialog() + activity.showDialog(dialog, "habitType") + } + override fun showCreateNumericalHabitScreen() { - val dialog = editHabitDialogFactory.createNumerical() + val dialog = HabitTypeDialog() activity.showDialog(dialog, "editHabit") } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java.bak similarity index 100% rename from android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java rename to android/uhabits-android/src/main/java/org/isoron/uhabits/receivers/WidgetReceiver.java.bak diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/BaseWidgetBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/BaseWidgetBehavior.java index 39b483c8e..2eff11836 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/BaseWidgetBehavior.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/BaseWidgetBehavior.java @@ -1,6 +1,6 @@ package org.isoron.uhabits.core.ui.widgets; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.isoron.uhabits.core.commands.CommandRunner; import org.isoron.uhabits.core.models.HabitList; diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/NumericalCheckmarkWidgetBehavior.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/NumericalCheckmarkWidgetBehavior.java index 1b9d70c69..95c5275ba 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/NumericalCheckmarkWidgetBehavior.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/NumericalCheckmarkWidgetBehavior.java @@ -1,6 +1,6 @@ package org.isoron.uhabits.core.ui.widgets; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.isoron.uhabits.core.commands.CommandRunner; import org.isoron.uhabits.core.commands.CreateRepetitionCommand;