isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use default instead of null for reminderDays

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-18 07:42:59 -04:00
parent 55c058ff42
commit b5bc347624
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/isoron/uhabits/fragments/EditHabitFragment.java
View File

@@ -156,11 +156,7 @@ public class EditHabitFragment extends DialogFragment
modifiedHabit.reminderDays = savedInstanceState.getInt("reminderDays", -1); modifiedHabit.reminderDays = savedInstanceState.getInt("reminderDays", -1);
if(modifiedHabit.reminderMin < 0) if(modifiedHabit.reminderMin < 0)
{ modifiedHabit.clearReminder();
modifiedHabit.reminderMin = null;
modifiedHabit.reminderHour = null;
modifiedHabit.reminderDays = 127;
}
} }
tvFreqNum.append(modifiedHabit.freqNum.toString()); tvFreqNum.append(modifiedHabit.freqNum.toString());

13
app/src/main/java/org/isoron/uhabits/models/Habit.java
View File

@@ -35,6 +35,7 @@ import com.activeandroid.query.Update;
import com.activeandroid.util.SQLiteUtils; import com.activeandroid.util.SQLiteUtils;
import org.isoron.helpers.ColorHelper; import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.DateHelper;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -95,9 +96,10 @@ public class Habit extends Model
/** /**
* Days of the week the reminder should be shown. This field can be converted to a list of * Days of the week the reminder should be shown. This field can be converted to a list of
* booleans using the method DateHelper.unpackWeekdayList and converted back to an integer by * booleans using the method DateHelper.unpackWeekdayList and converted back to an integer by
* using the method DateHelper.packWeekdayList. If there is no reminder, it equals null. * using the method DateHelper.packWeekdayList. If the habit has no reminders, this value
* should be ignored.
*/ */
@Nullable @NonNull
@Column(name = "reminder_days") @Column(name = "reminder_days")
public Integer reminderDays; public Integer reminderDays;
@@ -145,6 +147,8 @@ public class Habit extends Model
*/ */
public Habit(Habit model) public Habit(Habit model)
{ {
reminderDays = DateHelper.ALL_WEEK_DAYS;
copyAttributes(model); copyAttributes(model);
checkmarks = new CheckmarkList(this); checkmarks = new CheckmarkList(this);
@@ -165,6 +169,7 @@ public class Habit extends Model
this.archived = 0; this.archived = 0;
this.freqDen = 7; this.freqDen = 7;
this.freqNum = 3; this.freqNum = 3;
this.reminderDays = DateHelper.ALL_WEEK_DAYS;
checkmarks = new CheckmarkList(this); checkmarks = new CheckmarkList(this);
streaks = new StreakList(this); streaks = new StreakList(this);
@@ -453,7 +458,7 @@ public class Habit extends Model
*/ */
public boolean hasReminder() public boolean hasReminder()
{ {
return (reminderHour != null && reminderMin != null && reminderDays != null); return (reminderHour != null && reminderMin != null);
} }
/** /**
@@ -463,6 +468,6 @@ public class Habit extends Model
{ {
reminderHour = null; reminderHour = null;
reminderMin = null; reminderMin = null;
reminderDays = null; reminderDays = DateHelper.ALL_WEEK_DAYS;
} }
} }