mirror of https://github.com/iSoron/uhabits.git
parent
b98853ab26
commit
8d57273987
@ -0,0 +1,212 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
|
||||||
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.isoron.uhabits.ui.habits.edit;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.annotation.Nullable;
|
||||||
|
import android.support.v7.app.AppCompatDialogFragment;
|
||||||
|
import android.text.format.DateFormat;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import com.android.colorpicker.ColorPickerDialog;
|
||||||
|
import com.android.colorpicker.ColorPickerSwatch;
|
||||||
|
import com.android.datetimepicker.time.RadialPickerLayout;
|
||||||
|
import com.android.datetimepicker.time.TimePickerDialog;
|
||||||
|
|
||||||
|
import org.isoron.uhabits.R;
|
||||||
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
import org.isoron.uhabits.utils.ColorUtils;
|
||||||
|
import org.isoron.uhabits.utils.DateUtils;
|
||||||
|
import org.isoron.uhabits.utils.Preferences;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import butterknife.ButterKnife;
|
||||||
|
import butterknife.OnClick;
|
||||||
|
import butterknife.OnItemSelected;
|
||||||
|
|
||||||
|
public abstract class BaseDialogFragment extends AppCompatDialogFragment
|
||||||
|
{
|
||||||
|
protected Habit originalHabit;
|
||||||
|
protected Habit modifiedHabit;
|
||||||
|
protected Preferences prefs = Preferences.getInstance();
|
||||||
|
protected BaseDialogHelper helper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState)
|
||||||
|
{
|
||||||
|
View view = inflater.inflate(R.layout.edit_habit, container, false);
|
||||||
|
helper = new BaseDialogHelper(this, view);
|
||||||
|
ButterKnife.bind(this, view);
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
|
public void onSaveInstanceState(Bundle outState)
|
||||||
|
{
|
||||||
|
super.onSaveInstanceState(outState);
|
||||||
|
outState.putInt("color", modifiedHabit.color);
|
||||||
|
if(modifiedHabit.hasReminder())
|
||||||
|
{
|
||||||
|
outState.putInt("reminderMin", modifiedHabit.reminderMin);
|
||||||
|
outState.putInt("reminderHour", modifiedHabit.reminderHour);
|
||||||
|
outState.putInt("reminderDays", modifiedHabit.reminderDays);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void restoreSavedInstance(@Nullable Bundle bundle)
|
||||||
|
{
|
||||||
|
if(bundle == null) return;
|
||||||
|
modifiedHabit.color = bundle.getInt("color", modifiedHabit.color);
|
||||||
|
modifiedHabit.reminderMin = bundle.getInt("reminderMin", -1);
|
||||||
|
modifiedHabit.reminderHour = bundle.getInt("reminderHour", -1);
|
||||||
|
modifiedHabit.reminderDays = bundle.getInt("reminderDays", -1);
|
||||||
|
if(modifiedHabit.reminderMin < 0) modifiedHabit.clearReminder();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnClick(R.id.buttonDiscard)
|
||||||
|
void onButtonDiscardClick()
|
||||||
|
{
|
||||||
|
dismiss();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnClick(R.id.buttonSave)
|
||||||
|
void onSaveButtonClick()
|
||||||
|
{
|
||||||
|
helper.parseFormIntoHabit(modifiedHabit);
|
||||||
|
if (!helper.validate(modifiedHabit)) return;
|
||||||
|
saveHabit();
|
||||||
|
dismiss();
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnClick(R.id.tvReminderTime)
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
|
void onDateSpinnerClick()
|
||||||
|
{
|
||||||
|
int defaultHour = 8;
|
||||||
|
int defaultMin = 0;
|
||||||
|
|
||||||
|
if (modifiedHabit.hasReminder())
|
||||||
|
{
|
||||||
|
defaultHour = modifiedHabit.reminderHour;
|
||||||
|
defaultMin = modifiedHabit.reminderMin;
|
||||||
|
}
|
||||||
|
|
||||||
|
showTimePicker(defaultHour, defaultMin);
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnClick(R.id.tvReminderDays)
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
|
void onWeekdayClick()
|
||||||
|
{
|
||||||
|
if(!modifiedHabit.hasReminder()) return;
|
||||||
|
WeekdayPickerDialog dialog = new WeekdayPickerDialog();
|
||||||
|
dialog.setListener(new OnWeekdaysPickedListener());
|
||||||
|
dialog.setSelectedDays(DateUtils.unpackWeekdayList(modifiedHabit.reminderDays));
|
||||||
|
dialog.show(getFragmentManager(), "weekdayPicker");
|
||||||
|
}
|
||||||
|
|
||||||
|
@OnItemSelected(R.id.sFrequency)
|
||||||
|
public void onFrequencySelected(int position)
|
||||||
|
{
|
||||||
|
if(position < 0 || position > 4) throw new IllegalArgumentException();
|
||||||
|
int freqNums[] = { 1, 1, 2, 5, 3 };
|
||||||
|
int freqDens[] = { 1, 7, 7, 7, 7 };
|
||||||
|
modifiedHabit.freqNum = freqNums[position];
|
||||||
|
modifiedHabit.freqDen = freqDens[position];
|
||||||
|
helper.populateFrequencyFields(modifiedHabit);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected abstract void saveHabit();
|
||||||
|
|
||||||
|
@OnClick(R.id.buttonPickColor)
|
||||||
|
void showColorPicker()
|
||||||
|
{
|
||||||
|
int androidColor = ColorUtils.getColor(getContext(), modifiedHabit.color);
|
||||||
|
|
||||||
|
ColorPickerDialog picker = ColorPickerDialog.newInstance(
|
||||||
|
R.string.color_picker_default_title, ColorUtils.getPalette(getContext()),
|
||||||
|
androidColor, 4, ColorPickerDialog.SIZE_SMALL);
|
||||||
|
|
||||||
|
picker.setOnColorSelectedListener(new OnColorSelectedListener());
|
||||||
|
picker.show(getFragmentManager(), "picker");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showTimePicker(int defaultHour, int defaultMin)
|
||||||
|
{
|
||||||
|
boolean is24HourMode = DateFormat.is24HourFormat(getContext());
|
||||||
|
TimePickerDialog timePicker = TimePickerDialog.newInstance(new OnTimeSetListener(),
|
||||||
|
defaultHour, defaultMin, is24HourMode);
|
||||||
|
timePicker.show(getFragmentManager(), "timePicker");
|
||||||
|
}
|
||||||
|
|
||||||
|
private class OnColorSelectedListener implements ColorPickerSwatch.OnColorSelectedListener
|
||||||
|
{
|
||||||
|
public void onColorSelected(int androidColor)
|
||||||
|
{
|
||||||
|
int paletteColor = ColorUtils.colorToPaletteIndex(getActivity(), androidColor);
|
||||||
|
prefs.setDefaultHabitColor(paletteColor);
|
||||||
|
modifiedHabit.color = paletteColor;
|
||||||
|
helper.populateColor(paletteColor);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class OnWeekdaysPickedListener implements WeekdayPickerDialog.OnWeekdaysPickedListener
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onWeekdaysPicked(boolean[] selectedDays)
|
||||||
|
{
|
||||||
|
if(isSelectionEmpty(selectedDays))
|
||||||
|
Arrays.fill(selectedDays, true);
|
||||||
|
|
||||||
|
modifiedHabit.reminderDays = DateUtils.packWeekdayList(selectedDays);
|
||||||
|
helper.populateReminderFields(modifiedHabit);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isSelectionEmpty(boolean[] selectedDays)
|
||||||
|
{
|
||||||
|
for (boolean d : selectedDays) if (d) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class OnTimeSetListener implements TimePickerDialog.OnTimeSetListener
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void onTimeSet(RadialPickerLayout view, int hour, int minute)
|
||||||
|
{
|
||||||
|
modifiedHabit.reminderHour = hour;
|
||||||
|
modifiedHabit.reminderMin = minute;
|
||||||
|
modifiedHabit.reminderDays = DateUtils.ALL_WEEK_DAYS;
|
||||||
|
helper.populateReminderFields(modifiedHabit);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onTimeCleared(RadialPickerLayout view)
|
||||||
|
{
|
||||||
|
modifiedHabit.clearReminder();
|
||||||
|
helper.populateReminderFields(modifiedHabit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,161 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
|
||||||
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.isoron.uhabits.ui.habits.edit;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.support.v4.app.DialogFragment;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.Spinner;
|
||||||
|
import android.widget.TextView;
|
||||||
|
|
||||||
|
import org.isoron.uhabits.R;
|
||||||
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
import org.isoron.uhabits.utils.ColorUtils;
|
||||||
|
import org.isoron.uhabits.utils.DateUtils;
|
||||||
|
|
||||||
|
import butterknife.BindView;
|
||||||
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
|
public class BaseDialogHelper
|
||||||
|
{
|
||||||
|
private DialogFragment frag;
|
||||||
|
@BindView(R.id.tvName) TextView tvName;
|
||||||
|
@BindView(R.id.tvDescription) TextView tvDescription;
|
||||||
|
@BindView(R.id.tvFreqNum) TextView tvFreqNum;
|
||||||
|
@BindView(R.id.tvFreqDen) TextView tvFreqDen;
|
||||||
|
@BindView(R.id.tvReminderTime) TextView tvReminderTime;
|
||||||
|
@BindView(R.id.tvReminderDays) TextView tvReminderDays;
|
||||||
|
@BindView(R.id.sFrequency) Spinner sFrequency;
|
||||||
|
@BindView(R.id.llCustomFrequency) ViewGroup llCustomFrequency;
|
||||||
|
@BindView(R.id.llReminderDays) ViewGroup llReminderDays;
|
||||||
|
|
||||||
|
public BaseDialogHelper(DialogFragment frag, View view)
|
||||||
|
{
|
||||||
|
this.frag = frag;
|
||||||
|
ButterKnife.bind(this, view);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void populateForm(final Habit habit)
|
||||||
|
{
|
||||||
|
if(habit.name != null) tvName.setText(habit.name);
|
||||||
|
if(habit.description != null) tvDescription.setText(habit.description);
|
||||||
|
|
||||||
|
populateColor(habit.color);
|
||||||
|
populateFrequencyFields(habit);
|
||||||
|
populateReminderFields(habit);
|
||||||
|
}
|
||||||
|
|
||||||
|
void populateColor(int paletteColor)
|
||||||
|
{
|
||||||
|
tvName.setTextColor(ColorUtils.getColor(frag.getContext(), paletteColor));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("ConstantConditions")
|
||||||
|
void populateReminderFields(Habit habit)
|
||||||
|
{
|
||||||
|
if (!habit.hasReminder())
|
||||||
|
{
|
||||||
|
tvReminderTime.setText(R.string.reminder_off);
|
||||||
|
llReminderDays.setVisibility(View.GONE);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String time = DateUtils.formatTime(frag.getContext(), habit.reminderHour, habit.reminderMin);
|
||||||
|
tvReminderTime.setText(time);
|
||||||
|
llReminderDays.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
boolean weekdays[] = DateUtils.unpackWeekdayList(habit.reminderDays);
|
||||||
|
tvReminderDays.setText(DateUtils.formatWeekdayList(frag.getContext(), weekdays));
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
|
void populateFrequencyFields(Habit habit)
|
||||||
|
{
|
||||||
|
int quickSelectPosition = -1;
|
||||||
|
|
||||||
|
if(habit.freqNum.equals(habit.freqDen))
|
||||||
|
quickSelectPosition = 0;
|
||||||
|
|
||||||
|
else if(habit.freqNum == 1 && habit.freqDen == 7)
|
||||||
|
quickSelectPosition = 1;
|
||||||
|
|
||||||
|
else if(habit.freqNum == 2 && habit.freqDen == 7)
|
||||||
|
quickSelectPosition = 2;
|
||||||
|
|
||||||
|
else if(habit.freqNum == 5 && habit.freqDen == 7)
|
||||||
|
quickSelectPosition = 3;
|
||||||
|
|
||||||
|
if(quickSelectPosition >= 0) showSimplifiedFrequency(quickSelectPosition);
|
||||||
|
else showCustomFrequency();
|
||||||
|
|
||||||
|
tvFreqNum.setText(habit.freqNum.toString());
|
||||||
|
tvFreqDen.setText(habit.freqDen.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void showCustomFrequency()
|
||||||
|
{
|
||||||
|
sFrequency.setVisibility(View.GONE);
|
||||||
|
llCustomFrequency.setVisibility(View.VISIBLE);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressLint("SetTextI18n")
|
||||||
|
private void showSimplifiedFrequency(int quickSelectPosition)
|
||||||
|
{
|
||||||
|
sFrequency.setVisibility(View.VISIBLE);
|
||||||
|
sFrequency.setSelection(quickSelectPosition);
|
||||||
|
llCustomFrequency.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean validate(Habit habit)
|
||||||
|
{
|
||||||
|
Boolean valid = true;
|
||||||
|
|
||||||
|
if (habit.name.length() == 0)
|
||||||
|
{
|
||||||
|
tvName.setError(frag.getString(R.string.validation_name_should_not_be_blank));
|
||||||
|
valid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (habit.freqNum <= 0)
|
||||||
|
{
|
||||||
|
tvFreqNum.setError(frag.getString(R.string.validation_number_should_be_positive));
|
||||||
|
valid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (habit.freqNum > habit.freqDen)
|
||||||
|
{
|
||||||
|
tvFreqNum.setError(frag.getString(R.string.validation_at_most_one_rep_per_day));
|
||||||
|
valid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return valid;
|
||||||
|
}
|
||||||
|
|
||||||
|
void parseFormIntoHabit(Habit habit)
|
||||||
|
{
|
||||||
|
habit.name = tvName.getText().toString().trim();
|
||||||
|
habit.description = tvDescription.getText().toString().trim();
|
||||||
|
String freqNum = tvFreqNum.getText().toString();
|
||||||
|
String freqDen = tvFreqDen.getText().toString();
|
||||||
|
if(!freqNum.isEmpty()) habit.freqNum = Integer.parseInt(freqNum);
|
||||||
|
if(!freqDen.isEmpty()) habit.freqDen = Integer.parseInt(freqDen);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
|
||||||
|
*
|
||||||
|
* 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 <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.isoron.uhabits.ui.habits.edit;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.view.LayoutInflater;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.ViewGroup;
|
||||||
|
|
||||||
|
import org.isoron.uhabits.R;
|
||||||
|
import org.isoron.uhabits.commands.Command;
|
||||||
|
import org.isoron.uhabits.commands.CommandRunner;
|
||||||
|
import org.isoron.uhabits.commands.CreateHabitCommand;
|
||||||
|
import org.isoron.uhabits.models.Habit;
|
||||||
|
|
||||||
|
public class CreateHabitDialogFragment extends BaseDialogFragment
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||||
|
Bundle savedInstanceState)
|
||||||
|
{
|
||||||
|
View view = super.onCreateView(inflater, container, savedInstanceState);
|
||||||
|
getDialog().setTitle(R.string.create_habit);
|
||||||
|
initializeHabits();
|
||||||
|
restoreSavedInstance(savedInstanceState);
|
||||||
|
helper.populateForm(modifiedHabit);
|
||||||
|
return view;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initializeHabits()
|
||||||
|
{
|
||||||
|
modifiedHabit = new Habit();
|
||||||
|
modifiedHabit.freqNum = 1;
|
||||||
|
modifiedHabit.freqDen = 1;
|
||||||
|
modifiedHabit.color = prefs.getDefaultHabitColor(modifiedHabit.color);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void saveHabit()
|
||||||
|
{
|
||||||
|
Command command = new CreateHabitCommand(modifiedHabit);
|
||||||
|
CommandRunner.getInstance().execute(command, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in new issue