From f7bebf0b3a5990499e8b5c3c198e2671ba0afb14 Mon Sep 17 00:00:00 2001 From: Jake Powell Date: Wed, 16 May 2018 00:06:50 -0400 Subject: [PATCH 1/5] 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) { From 98d09e6d554d67b6122df48a404a7465575534ea Mon Sep 17 00:00:00 2001 From: Jake Powell Date: Wed, 16 May 2018 16:41:30 -0400 Subject: [PATCH 2/5] Added TypePanel ui elements to EditDialog --- .../habits/edit/views/TypePanel.java | 88 +++++++++++++++++++ .../src/main/res/layout/edit_habit.xml | 5 ++ .../src/main/res/layout/edit_habit_type.xml | 40 +++++++++ .../src/main/res/values/constants.xml | 2 +- .../src/main/res/values/strings.xml | 1 + 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java create mode 100644 uhabits-android/src/main/res/layout/edit_habit_type.xml diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java new file mode 100644 index 000000000..cdcd18661 --- /dev/null +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2016 Álinson Santos Xavier + * + * This file is part of Loop Habit Tracker. + * + * Loop Habit Tracker is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * Loop Habit Tracker is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +package org.isoron.uhabits.activities.habits.edit.views; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.res.Resources; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; +import android.widget.FrameLayout; +import android.widget.Spinner; +import android.widget.TextView; + +import org.isoron.uhabits.R; +import org.isoron.uhabits.core.models.Frequency; +import org.isoron.uhabits.core.models.Habit; + +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnItemSelected; + +import static org.isoron.uhabits.R.id.numerator; + + +public class TypePanel extends FrameLayout +{ + @BindView(R.id.spinner) + Spinner spinner; + + public TypePanel(@NonNull Context context, + @Nullable AttributeSet attrs) + { + super(context, attrs); + + View view = inflate(context, R.layout.edit_habit_type, null); + ButterKnife.bind(this, view); + addView(view); + } + + @NonNull + public Integer getType() + { + Integer type = spinner.getSelectedItemPosition(); + if (type.equals(0)) return Habit.YES_NO_HABIT; + if (type.equals(0)) return Habit.NUMBER_HABIT; + return -1; + } + + public void setType(@NonNull Integer type) + { + int position = getQuickSelectPosition(type); + spinner.setSelection(position); + } + + @OnItemSelected(R.id.spinner) + public void onTypeSelected(int position) + { + if (position < 0 || position > 1) throw new IllegalArgumentException(); + // TODO: A callback? + } + + private int getQuickSelectPosition(@NonNull Integer type) + { + if (type.equals(Habit.YES_NO_HABIT)) return 0; + if (type.equals(Habit.NUMBER_HABIT)) return 1; + return -1; + } +} diff --git a/uhabits-android/src/main/res/layout/edit_habit.xml b/uhabits-android/src/main/res/layout/edit_habit.xml index da5357c7b..15fd1a4f7 100644 --- a/uhabits-android/src/main/res/layout/edit_habit.xml +++ b/uhabits-android/src/main/res/layout/edit_habit.xml @@ -34,6 +34,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> + + + + + + + + + + \ No newline at end of file diff --git a/uhabits-android/src/main/res/values/constants.xml b/uhabits-android/src/main/res/values/constants.xml index 34e8136a5..07282b4ef 100644 --- a/uhabits-android/src/main/res/values/constants.xml +++ b/uhabits-android/src/main/res/values/constants.xml @@ -80,7 +80,7 @@ - Yes or No + Checked/Unchecked Number diff --git a/uhabits-android/src/main/res/values/strings.xml b/uhabits-android/src/main/res/values/strings.xml index 5c043b111..78a132290 100644 --- a/uhabits-android/src/main/res/values/strings.xml +++ b/uhabits-android/src/main/res/values/strings.xml @@ -45,6 +45,7 @@ History Clear Question (Did you … today?) + Type Repeat times in days From 6f6a386954640f50f10792c999d4c1fbdbc66542 Mon Sep 17 00:00:00 2001 From: Jake Powell Date: Wed, 16 May 2018 18:49:54 -0400 Subject: [PATCH 3/5] EditHabitDialog adjustments Modified edithabitdialog to populate from Habit object and added Controller to TypePanel --- .../habits/edit/EditHabitDialog.java | 42 ++++++++++++++----- .../habits/edit/views/TypePanel.java | 37 +++++++++++++--- 2 files changed, 63 insertions(+), 16 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 f4639e3a3..f4d8a8149 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 @@ -24,6 +24,7 @@ import android.os.*; import android.support.annotation.*; import android.support.v7.app.*; import android.text.format.*; +import android.util.Log; import android.view.*; import com.android.datetimepicker.time.*; @@ -63,6 +64,9 @@ public class EditHabitDialog extends AppCompatDialogFragment @BindView(R.id.namePanel) NameDescriptionPanel namePanel; + @BindView(R.id.typePanel) + TypePanel typePanel; + @BindView(R.id.reminderPanel) ReminderPanel reminderPanel; @@ -112,6 +116,7 @@ public class EditHabitDialog extends AppCompatDialogFragment populateForm(); setupReminderController(); + setupTypeController(); setupNameController(); return view; @@ -138,11 +143,6 @@ public class EditHabitDialog extends AppCompatDialogFragment } } - private int getTypeFromArguments() - { - return Habit.YES_NO_HABIT; - } - private void initDependencies() { Context appContext = getContext().getApplicationContext(); @@ -164,9 +164,9 @@ public class EditHabitDialog extends AppCompatDialogFragment @OnClick(R.id.buttonSave) void onSaveButtonClick() { - int type = getTypeFromArguments(); - if (!namePanel.validate()) return; + + int type = typePanel.getType(); if (type == Habit.YES_NO_HABIT && !frequencyPanel.validate()) return; if (type == Habit.NUMBER_HABIT && !targetPanel.validate()) return; @@ -204,16 +204,24 @@ public class EditHabitDialog extends AppCompatDialogFragment private void populateForm() { Habit habit = modelFactory.buildHabit(); - habit.setFrequency(Frequency.DAILY); habit.setColor(prefs.getDefaultHabitColor(habit.getColor())); - habit.setType(getTypeFromArguments()); + habit.setType(Habit.YES_NO_HABIT); + habit.setFrequency(Frequency.DAILY); if (originalHabit != null) habit.copyFrom(originalHabit); - if (habit.isNumerical()) frequencyPanel.setVisibility(GONE); - else targetPanel.setVisibility(GONE); + if (habit.isNumerical()) + { + frequencyPanel.setVisibility(GONE); + } + else + { + targetPanel.setVisibility(GONE); + } namePanel.populateFrom(habit); + typePanel.setType(habit.getType()); + typePanel.setEnabled(originalHabit == null); frequencyPanel.setFrequency(habit.getFrequency()); targetPanel.setTargetValue(habit.getTargetValue()); targetPanel.setUnit(habit.getUnit()); @@ -241,6 +249,18 @@ public class EditHabitDialog extends AppCompatDialogFragment }); } + private void setupTypeController() + { + typePanel.setController(new TypePanel.Controller() + { + @Override + public void onTypeSelected(Integer previousType) + { + Log.d("YOUREIT", "Prev: " + previousType.toString() + " Sel: " + typePanel.getType().toString()); + } + }); + } + private void setupReminderController() { reminderPanel.setController(new ReminderPanel.Controller() diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java index cdcd18661..dfbe11524 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java @@ -47,6 +47,11 @@ public class TypePanel extends FrameLayout @BindView(R.id.spinner) Spinner spinner; + private Integer type; + + @NonNull + private Controller controller; + public TypePanel(@NonNull Context context, @Nullable AttributeSet attrs) { @@ -55,19 +60,20 @@ public class TypePanel extends FrameLayout View view = inflate(context, R.layout.edit_habit_type, null); ButterKnife.bind(this, view); addView(view); + + setType(Habit.YES_NO_HABIT); + controller = new Controller() {}; } @NonNull public Integer getType() { - Integer type = spinner.getSelectedItemPosition(); - if (type.equals(0)) return Habit.YES_NO_HABIT; - if (type.equals(0)) return Habit.NUMBER_HABIT; - return -1; + return type; } public void setType(@NonNull Integer type) { + this.type = type; int position = getQuickSelectPosition(type); spinner.setSelection(position); } @@ -76,7 +82,28 @@ public class TypePanel extends FrameLayout public void onTypeSelected(int position) { if (position < 0 || position > 1) throw new IllegalArgumentException(); - // TODO: A callback? + Integer previousType = type; + type = getTypeFromQuickSelect(position); + controller.onTypeSelected(previousType); + } + + public void setEnabled(boolean enabled) + { + spinner.setEnabled(enabled); + } + + public void setController(@NonNull Controller controller) { this.controller = controller; } + + public interface Controller + { + default void onTypeSelected(Integer previousType) {} + } + + private Integer getTypeFromQuickSelect(@NonNull Integer position) + { + if (position.equals(0)) return Habit.YES_NO_HABIT; + if (position.equals(1)) return Habit.NUMBER_HABIT; + return -1; } private int getQuickSelectPosition(@NonNull Integer type) From 93ba12cbed32622121638b57217d5dec240fd4f6 Mon Sep 17 00:00:00 2001 From: Jake Powell Date: Wed, 16 May 2018 19:38:50 -0400 Subject: [PATCH 4/5] Change panel visibility based on type --- .../habits/edit/EditHabitDialog.java | 28 ++++++++++++------- .../habits/edit/views/TypePanel.java | 11 ++------ 2 files changed, 20 insertions(+), 19 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 f4d8a8149..bffeb1de3 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 @@ -41,6 +41,7 @@ import org.isoron.uhabits.core.preferences.*; import butterknife.*; import static android.view.View.GONE; +import static android.view.View.VISIBLE; import static org.isoron.uhabits.core.ui.ThemeSwitcher.THEME_LIGHT; public class EditHabitDialog extends AppCompatDialogFragment @@ -210,24 +211,30 @@ public class EditHabitDialog extends AppCompatDialogFragment if (originalHabit != null) habit.copyFrom(originalHabit); - if (habit.isNumerical()) - { - frequencyPanel.setVisibility(GONE); - } - else - { - targetPanel.setVisibility(GONE); - } - namePanel.populateFrom(habit); typePanel.setType(habit.getType()); typePanel.setEnabled(originalHabit == null); + setPanelsForType(habit.getType()); frequencyPanel.setFrequency(habit.getFrequency()); targetPanel.setTargetValue(habit.getTargetValue()); targetPanel.setUnit(habit.getUnit()); if (habit.hasReminder()) reminderPanel.setReminder(habit.getReminder()); } + private void setPanelsForType(Integer type) + { + if (typePanel.getType() == Habit.NUMBER_HABIT) + { + targetPanel.setVisibility(VISIBLE); + frequencyPanel.setVisibility(GONE); + } + else + { + targetPanel.setVisibility(GONE); + frequencyPanel.setVisibility(VISIBLE); + } + } + private void setupNameController() { namePanel.setController(new NameDescriptionPanel.Controller() @@ -256,7 +263,8 @@ public class EditHabitDialog extends AppCompatDialogFragment @Override public void onTypeSelected(Integer previousType) { - Log.d("YOUREIT", "Prev: " + previousType.toString() + " Sel: " + typePanel.getType().toString()); + Integer currentType = typePanel.getType(); + setPanelsForType(currentType); } }); } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java index dfbe11524..8e7879d8d 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TypePanel.java @@ -19,28 +19,21 @@ package org.isoron.uhabits.activities.habits.edit.views; -import android.annotation.SuppressLint; import android.content.Context; -import android.content.res.Resources; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.Spinner; -import android.widget.TextView; import org.isoron.uhabits.R; -import org.isoron.uhabits.core.models.Frequency; import org.isoron.uhabits.core.models.Habit; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnItemSelected; -import static org.isoron.uhabits.R.id.numerator; - public class TypePanel extends FrameLayout { @@ -83,7 +76,7 @@ public class TypePanel extends FrameLayout { if (position < 0 || position > 1) throw new IllegalArgumentException(); Integer previousType = type; - type = getTypeFromQuickSelect(position); + type = getTypeFromQuickSelectPosition(position); controller.onTypeSelected(previousType); } @@ -99,7 +92,7 @@ public class TypePanel extends FrameLayout default void onTypeSelected(Integer previousType) {} } - private Integer getTypeFromQuickSelect(@NonNull Integer position) + private Integer getTypeFromQuickSelectPosition(@NonNull Integer position) { if (position.equals(0)) return Habit.YES_NO_HABIT; if (position.equals(1)) return Habit.NUMBER_HABIT; From b1a5cfd616a77b1ced8a1be5cb2d4e4b5004b3d0 Mon Sep 17 00:00:00 2001 From: Jake Powell Date: Wed, 16 May 2018 19:41:00 -0400 Subject: [PATCH 5/5] Removed some unnecessary leftover code --- .../activities/habits/edit/EditHabitDialog.java | 2 -- .../activities/habits/edit/EditHabitDialogFactory.java | 10 ---------- 2 files changed, 12 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 bffeb1de3..46b1ee8bd 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 @@ -48,8 +48,6 @@ public class EditHabitDialog extends AppCompatDialogFragment { public static final String BUNDLE_HABIT_ID = "habitId"; - public static final String BUNDLE_HABIT_TYPE = "habitType"; - protected Habit originalHabit; protected Preferences prefs; 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 5c83a941f..554e6d11c 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,15 +35,6 @@ public class EditHabitDialogFactory { } - public EditHabitDialog createNumerical() - { - EditHabitDialog dialog = new EditHabitDialog(); - Bundle args = new Bundle(); - args.putInt(BUNDLE_HABIT_TYPE, Habit.NUMBER_HABIT); - dialog.setArguments(args); - return dialog; - } - public EditHabitDialog create() { EditHabitDialog dialog = new EditHabitDialog(); @@ -58,7 +49,6 @@ public class EditHabitDialogFactory EditHabitDialog dialog = new EditHabitDialog(); Bundle args = new Bundle(); args.putLong(BUNDLE_HABIT_ID, habit.getId()); - args.putInt(BUNDLE_HABIT_TYPE, habit.getType()); dialog.setArguments(args); return dialog; }