Fixed merge bugs

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")
     }
 

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;

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;