From f7bebf0b3a5990499e8b5c3c198e2671ba0afb14 Mon Sep 17 00:00:00 2001
From: Jake Powell <jakedp7@gmail.com>
Date: Wed, 16 May 2018 00:06:50 -0400
Subject: [PATCH] Removes intermediate "Habit type" dialog upon creation

Defaults to a Yes/No habit for now.
---
 .../habits/edit/EditHabitDialog.java          |  2 +-
 .../habits/edit/EditHabitDialogFactory.java   |  9 +++----
 .../habits/list/ListHabitsScreen.kt           | 26 ++-----------------
 3 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
index 6ff2bfa6b..f4639e3a3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
@@ -140,7 +140,7 @@ public class EditHabitDialog extends AppCompatDialogFragment
 
     private int getTypeFromArguments()
     {
-        return getArguments().getInt(BUNDLE_HABIT_TYPE);
+        return Habit.YES_NO_HABIT;
     }
 
     private void initDependencies()
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
index a91c3b14a..5c83a941f 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
@@ -35,21 +35,18 @@ public class EditHabitDialogFactory
     {
     }
 
-    public EditHabitDialog createBoolean()
+    public EditHabitDialog createNumerical()
     {
         EditHabitDialog dialog = new EditHabitDialog();
         Bundle args = new Bundle();
-        args.putInt(BUNDLE_HABIT_TYPE, Habit.YES_NO_HABIT);
+        args.putInt(BUNDLE_HABIT_TYPE, Habit.NUMBER_HABIT);
         dialog.setArguments(args);
         return dialog;
     }
 
-    public EditHabitDialog createNumerical()
+    public EditHabitDialog create()
     {
         EditHabitDialog dialog = new EditHabitDialog();
-        Bundle args = new Bundle();
-        args.putInt(BUNDLE_HABIT_TYPE, Habit.NUMBER_HABIT);
-        dialog.setArguments(args);
         return dialog;
     }
 
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
index bda22a46e..b821625a2 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -137,26 +137,9 @@ class ListHabitsScreen
         activity.startActivity(intent)
     }
 
-    fun showCreateBooleanHabitScreen() {
-        val dialog = editHabitDialogFactory.createBoolean()
-        activity.showDialog(dialog, "editHabit")
-    }
-
     override fun showCreateHabitScreen() {
-        if (!preferences.isNumericalHabitsFeatureEnabled) {
-            showCreateBooleanHabitScreen()
-            return
-        }
-
-        val dialog = AlertDialog.Builder(activity)
-                .setTitle("Type of habit")
-                .setItems(R.array.habitTypes) { _, which ->
-                    if (which == 0) showCreateBooleanHabitScreen()
-                    else showCreateNumericalHabitScreen()
-                }
-                .create()
-
-        dialog.show()
+        val dialog = editHabitDialogFactory.create()
+        activity.showDialog(dialog, "editHabit")
     }
 
     override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) {
@@ -236,11 +219,6 @@ class ListHabitsScreen
         }
     }
 
-    private fun showCreateNumericalHabitScreen() {
-        val dialog = editHabitDialogFactory.createNumerical()
-        activity.showDialog(dialog, "editHabit")
-    }
-
     private fun onImportData(file: File, onFinished: () -> Unit) {
         taskRunner.execute(importTaskFactory.create(file) { result ->
             if (result == ImportDataTask.SUCCESS) {