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

Reformat code

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-02-20 07:16:40 -05:00
parent 1ee3fc79f0
commit c8de4e13f9
20 changed files with 465 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/org/isoron/helpers/ColorHelper.java
View File

@@ -21,40 +21,40 @@ import android.graphics.Color;
public class ColorHelper public class ColorHelper
{ {
public static final int[] palette = public static final int[] palette =
{ {
Color.parseColor("#D32F2F"), // red Color.parseColor("#D32F2F"), // red
Color.parseColor("#E64A19"), // orange Color.parseColor("#E64A19"), // orange
Color.parseColor("#F9A825"), // yellow Color.parseColor("#F9A825"), // yellow
Color.parseColor("#AFB42B"), // light green Color.parseColor("#AFB42B"), // light green
Color.parseColor("#388E3C"), // dark green Color.parseColor("#388E3C"), // dark green
Color.parseColor("#00897B"), // teal Color.parseColor("#00897B"), // teal
Color.parseColor("#00ACC1"), // cyan Color.parseColor("#00ACC1"), // cyan
Color.parseColor("#039BE5"), // blue Color.parseColor("#039BE5"), // blue
Color.parseColor("#5E35B1"), // deep purple Color.parseColor("#5E35B1"), // deep purple
Color.parseColor("#8E24AA"), // purple Color.parseColor("#8E24AA"), // purple
Color.parseColor("#D81B60"), // pink Color.parseColor("#D81B60"), // pink
Color.parseColor("#303030"), // dark grey Color.parseColor("#303030"), // dark grey
Color.parseColor("#aaaaaa") // light grey Color.parseColor("#aaaaaa") // light grey
}; };
public static int mixColors(int color1, int color2, float amount) public static int mixColors(int color1, int color2, float amount)
{ {
final byte ALPHA_CHANNEL = 24; final byte ALPHA_CHANNEL = 24;
final byte RED_CHANNEL = 16; final byte RED_CHANNEL = 16;
final byte GREEN_CHANNEL = 8; final byte GREEN_CHANNEL = 8;
final byte BLUE_CHANNEL = 0; final byte BLUE_CHANNEL = 0;
final float inverseAmount = 1.0f - amount; final float inverseAmount = 1.0f - amount;
int a = ((int) (((float) (color1 >> ALPHA_CHANNEL & 0xff) * amount) + int a = ((int) (((float) (color1 >> ALPHA_CHANNEL & 0xff) * amount) +
((float) (color2 >> ALPHA_CHANNEL & 0xff) * inverseAmount))) & 0xff; ((float) (color2 >> ALPHA_CHANNEL & 0xff) * inverseAmount))) & 0xff;
int r = ((int) (((float) (color1 >> RED_CHANNEL & 0xff) * amount) + int r = ((int) (((float) (color1 >> RED_CHANNEL & 0xff) * amount) +
((float) (color2 >> RED_CHANNEL & 0xff) * inverseAmount))) & 0xff; ((float) (color2 >> RED_CHANNEL & 0xff) * inverseAmount))) & 0xff;
int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) + int g = ((int) (((float) (color1 >> GREEN_CHANNEL & 0xff) * amount) +
((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff; ((float) (color2 >> GREEN_CHANNEL & 0xff) * inverseAmount))) & 0xff;
int b = ((int) (((float) (color1 & 0xff) * amount) + int b = ((int) (((float) (color1 & 0xff) * amount) +
((float) (color2 & 0xff) * inverseAmount))) & 0xff; ((float) (color2 & 0xff) * inverseAmount))) & 0xff;
return a << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL; return a << ALPHA_CHANNEL | r << RED_CHANNEL | g << GREEN_CHANNEL | b << BLUE_CHANNEL;
} }
} }

153
app/src/main/java/org/isoron/helpers/DateHelper.java
View File

@@ -26,35 +26,35 @@ import java.util.TimeZone;
public class DateHelper public class DateHelper
{ {
public static int millisecondsInOneDay = 24 * 60 * 60 * 1000; public static int millisecondsInOneDay = 24 * 60 * 60 * 1000;
public static long getLocalTime()
{
TimeZone tz = TimeZone.getDefault();
long now = new Date().getTime();
return now + tz.getOffset(now);
}
public static long getStartOfDay(long timestamp)
{
return (timestamp / millisecondsInOneDay) * millisecondsInOneDay;
}
public static long getStartOfToday()
{
return getStartOfDay(DateHelper.getLocalTime());
}
public static String formatTime(Context context, int hours, int minutes) public static long getLocalTime()
{ {
int reminderMilliseconds = (hours * 60 + minutes) * 60 * 1000; TimeZone tz = TimeZone.getDefault();
long now = new Date().getTime();
return now + tz.getOffset(now);
}
Date date = new Date(reminderMilliseconds); public static long getStartOfDay(long timestamp)
java.text.DateFormat df = DateFormat.getTimeFormat(context); {
df.setTimeZone(TimeZone.getTimeZone("UTC")); return (timestamp / millisecondsInOneDay) * millisecondsInOneDay;
}
return df.format(date); public static long getStartOfToday()
} {
return getStartOfDay(DateHelper.getLocalTime());
}
public static String formatTime(Context context, int hours, int minutes)
{
int reminderMilliseconds = (hours * 60 + minutes) * 60 * 1000;
Date date = new Date(reminderMilliseconds);
java.text.DateFormat df = DateFormat.getTimeFormat(context);
df.setTimeZone(TimeZone.getTimeZone("UTC"));
return df.format(date);
}
// public static Date getStartOfDay(Date date) // public static Date getStartOfDay(Date date)
// { // {
@@ -67,64 +67,59 @@ public class DateHelper
// return calendar.getTime(); // return calendar.getTime();
// } // }
public static int differenceInDays(Date from, Date to) public static int differenceInDays(Date from, Date to)
{ {
long milliseconds = getStartOfDay(to.getTime()) - getStartOfDay(from.getTime()); long milliseconds = getStartOfDay(to.getTime()) - getStartOfDay(from.getTime());
return (int) (milliseconds / millisecondsInOneDay); return (int) (milliseconds / millisecondsInOneDay);
} }
public static String differenceInWords(Date from, Date to) public static String differenceInWords(Date from, Date to)
{ {
Integer days = differenceInDays(from, to); Integer days = differenceInDays(from, to);
boolean negative = (days < 0); boolean negative = (days < 0);
days = Math.abs(days); days = Math.abs(days);
Integer weeks = (int) Math.round(days / 7.0); Integer weeks = (int) Math.round(days / 7.0);
Double months = days / 30.4; Double months = days / 30.4;
Double years = days / 365.0; Double years = days / 365.0;
StringBuffer s = new StringBuffer(); StringBuffer s = new StringBuffer();
DecimalFormat df = new DecimalFormat("#.#"); DecimalFormat df = new DecimalFormat("#.#");
if(months > 18) if (months > 18)
{ {
s.append(df.format(years)); s.append(df.format(years));
s.append(" years"); s.append(" years");
} }
else if(weeks > 6) else if (weeks > 6)
{ {
s.append(df.format(months)); s.append(df.format(months));
s.append(" months"); s.append(" months");
} }
else if(days > 13) else if (days > 13)
{ {
s.append(weeks); s.append(weeks);
s.append(" weeks"); s.append(" weeks");
} }
else if(days > 6) else if (days > 6)
{ {
s.append(days); s.append(days);
s.append(" days"); s.append(" days");
} }
else else
{ {
if(days == 0) if (days == 0) s.append("Today");
s.append("Today"); else if (days == 1 && negative) s.append("Yesterday");
else if(days == 1 && negative) else if (days == 1 && !negative) s.append("Tomorrow");
s.append("Yesterday"); else
else if(days == 1 && !negative) {
s.append("Tomorrow"); if (negative) s.append("past ");
else s.append(new SimpleDateFormat("EEEE").format(to));
{ }
if(negative) }
s.append("past ");
s.append(new SimpleDateFormat("EEEE").format(to));
}
}
if(negative && days > 6) if (negative && days > 6) s.append(" ago");
s.append(" ago");
return s.toString(); return s.toString();
} }
} }

50
app/src/main/java/org/isoron/helpers/DialogHelper.java
View File

@@ -25,33 +25,33 @@ import android.view.inputmethod.InputMethodManager;
public abstract class DialogHelper public abstract class DialogHelper
{ {
// public static AlertDialog alert(Activity context, String title, String message, OnClickListener positiveClickListener) { // public static AlertDialog alert(Activity context, String title, String message, OnClickListener positiveClickListener) {
// return new AlertDialog.Builder(context) // return new AlertDialog.Builder(context)
// .setTitle(title) // .setTitle(title)
// .setMessage(message) // .setMessage(message)
// .setPositiveButton(android.R.string.yes, positiveClickListener) // .setPositiveButton(android.R.string.yes, positiveClickListener)
// .setNegativeButton(android.R.string.no, null).show(); // .setNegativeButton(android.R.string.no, null).show();
// } // }
public static abstract class SimpleClickListener implements OnClickListener public static abstract class SimpleClickListener implements OnClickListener
{ {
public abstract void onClick(); public abstract void onClick();
public void onClick(DialogInterface dialog, int whichButton) public void onClick(DialogInterface dialog, int whichButton)
{ {
onClick(); onClick();
} }
} }
public static interface OnSavedListener public static interface OnSavedListener
{ {
public void onSaved(Command command, Object savedObject); public void onSaved(Command command, Object savedObject);
} }
public static void showSoftKeyboard(View view) public static void showSoftKeyboard(View view)
{ {
InputMethodManager imm = (InputMethodManager) InputMethodManager imm = (InputMethodManager) view.getContext()
view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE); .getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
} }
} }

3
app/src/main/java/org/isoron/helpers/ReplayableActivity.java
View File

@@ -81,8 +81,7 @@ abstract public class ReplayableActivity extends Activity
toast.show(); toast.show();
} }
public void executeCommand(final Command command, Boolean clearRedoStack, public void executeCommand(final Command command, Boolean clearRedoStack, final Long refreshKey)
final Long refreshKey)
{ {
undoList.push(command); undoList.push(command);

3
app/src/main/java/org/isoron/uhabits/IntroActivity.java
View File

@@ -16,7 +16,6 @@
package org.isoron.uhabits; package org.isoron.uhabits;
import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
@@ -31,7 +30,7 @@ public class IntroActivity extends AppIntro2
showStatusBar(false); showStatusBar(false);
addSlide(AppIntroFragment.newInstance("Welcome", addSlide(AppIntroFragment.newInstance("Welcome",
"Habits Tracker helps you create and maintain good habits.", R.drawable.tutorial_1, "Loop helps you create and maintain good habits.", R.drawable.tutorial_1,
Color.parseColor("#194673"))); Color.parseColor("#194673")));
addSlide(AppIntroFragment.newInstance("Create some new habits", addSlide(AppIntroFragment.newInstance("Create some new habits",

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

@@ -41,8 +41,8 @@ public class MainActivity extends ReplayableActivity
PreferenceManager.setDefaultValues(this, R.xml.preferences, false); PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
listHabitsFragment = (ListHabitsFragment) getFragmentManager().findFragmentById( listHabitsFragment =
R.id.fragment1); (ListHabitsFragment) getFragmentManager().findFragmentById(R.id.fragment1);
ReminderHelper.createReminderAlarms(MainActivity.this); ReminderHelper.createReminderAlarms(MainActivity.this);
@@ -55,7 +55,7 @@ public class MainActivity extends ReplayableActivity
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
Boolean firstRun = prefs.getBoolean("pref_first_run", true); Boolean firstRun = prefs.getBoolean("pref_first_run", true);
if(firstRun) if (firstRun)
{ {
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
editor.putBoolean("pref_first_run", false); editor.putBoolean("pref_first_run", false);

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

@@ -62,9 +62,9 @@ public class ReminderHelper
alarmIntent.setAction(ReminderAlarmReceiver.ACTION_REMIND); alarmIntent.setAction(ReminderAlarmReceiver.ACTION_REMIND);
alarmIntent.setData(uri); alarmIntent.setData(uri);
PendingIntent pendingIntent = PendingIntent.getBroadcast(context, PendingIntent pendingIntent =
((int) (habit.getId() % Integer.MAX_VALUE)) + 1, alarmIntent, PendingIntent.getBroadcast(context, ((int) (habit.getId() % Integer.MAX_VALUE)) + 1,
PendingIntent.FLAG_UPDATE_CURRENT); alarmIntent, PendingIntent.FLAG_UPDATE_CURRENT);
AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE); AlarmManager manager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
if (Build.VERSION.SDK_INT >= 19) if (Build.VERSION.SDK_INT >= 19)

5
app/src/main/java/org/isoron/uhabits/SettingsActivity.java
View File

@@ -27,7 +27,8 @@ public class SettingsActivity extends Activity
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getFragmentManager().beginTransaction().replace(android.R.id.content, getFragmentManager().beginTransaction()
new SettingsFragment()).commit(); .replace(android.R.id.content, new SettingsFragment())
.commit();
} }
} }

7
app/src/main/java/org/isoron/uhabits/ShowHabitActivity.java
View File

@@ -16,10 +16,6 @@
package org.isoron.uhabits; package org.isoron.uhabits;
import org.isoron.helpers.ReplayableActivity;
import org.isoron.uhabits.models.Habit;
import android.app.Activity;
import android.content.ContentUris; import android.content.ContentUris;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
@@ -28,6 +24,9 @@ import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import org.isoron.helpers.ReplayableActivity;
import org.isoron.uhabits.models.Habit;
public class ShowHabitActivity extends ReplayableActivity public class ShowHabitActivity extends ReplayableActivity
{ {

402
app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java
View File

@@ -23,7 +23,6 @@ import android.graphics.ColorMatrix;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@@ -45,270 +44,267 @@ import org.isoron.helpers.DialogHelper.OnSavedListener;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.util.Date;
import java.util.TimeZone;
public class EditHabitFragment extends DialogFragment implements OnClickListener public class EditHabitFragment extends DialogFragment implements OnClickListener
{ {
private int mode; private int mode;
static final int EDIT_MODE = 0; static final int EDIT_MODE = 0;
static final int CREATE_MODE = 1; static final int CREATE_MODE = 1;
private OnSavedListener onSavedListener; private OnSavedListener onSavedListener;
private Habit originalHabit, modified_habit; private Habit originalHabit, modified_habit;
private TextView tvName, tvDescription, tvFreqNum, tvFreqDen, tvInputReminder; private TextView tvName, tvDescription, tvFreqNum, tvFreqDen, tvInputReminder;
private SharedPreferences prefs; private SharedPreferences prefs;
private boolean is24HourMode; private boolean is24HourMode;
static class SolidColorMatrix extends ColorMatrix static class SolidColorMatrix extends ColorMatrix
{ {
public SolidColorMatrix(int color) public SolidColorMatrix(int color)
{ {
float matrix[] = { 0.0f, 0.0f, 0.0f, 0.0f, Color.red(color), 0.0f, 0.0f, 0.0f, 0.0f, float matrix[] = {0.0f, 0.0f, 0.0f, 0.0f, Color.red(color), 0.0f, 0.0f, 0.0f, 0.0f,
Color.green(color), 0.0f, 0.0f, 0.0f, 0.0f, Color.blue(color), 0.0f, 0.0f, Color.green(color), 0.0f, 0.0f, 0.0f, 0.0f, Color.blue(color), 0.0f, 0.0f, 0.0f,
0.0f, 1.0f, 0 }; 1.0f, 0};
set(matrix); set(matrix);
} }
} }
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Factory * * Factory *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
static EditHabitFragment editSingleHabitFragment(long id) static EditHabitFragment editSingleHabitFragment(long id)
{ {
EditHabitFragment frag = new EditHabitFragment(); EditHabitFragment frag = new EditHabitFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("habitId", id); args.putLong("habitId", id);
args.putInt("editMode", EDIT_MODE); args.putInt("editMode", EDIT_MODE);
frag.setArguments(args); frag.setArguments(args);
return frag; return frag;
} }
static EditHabitFragment createHabitFragment() static EditHabitFragment createHabitFragment()
{ {
EditHabitFragment frag = new EditHabitFragment(); EditHabitFragment frag = new EditHabitFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putInt("editMode", CREATE_MODE); args.putInt("editMode", CREATE_MODE);
frag.setArguments(args); frag.setArguments(args);
return frag; return frag;
} }
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Creation * * Creation *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) Bundle savedInstanceState)
{ {
View view = inflater.inflate(R.layout.edit_habit, container, false); View view = inflater.inflate(R.layout.edit_habit, container, false);
tvName = (TextView) view.findViewById(R.id.input_name); tvName = (TextView) view.findViewById(R.id.input_name);
tvDescription = (TextView) view.findViewById(R.id.input_description); tvDescription = (TextView) view.findViewById(R.id.input_description);
tvFreqNum = (TextView) view.findViewById(R.id.input_freq_num); tvFreqNum = (TextView) view.findViewById(R.id.input_freq_num);
tvFreqDen = (TextView) view.findViewById(R.id.input_freq_den); tvFreqDen = (TextView) view.findViewById(R.id.input_freq_den);
tvInputReminder = (TextView) view.findViewById(R.id.input_reminder_time); tvInputReminder = (TextView) view.findViewById(R.id.input_reminder_time);
Button buttonSave = (Button) view.findViewById(R.id.buttonSave); Button buttonSave = (Button) view.findViewById(R.id.buttonSave);
Button buttonDiscard = (Button) view.findViewById(R.id.buttonDiscard); Button buttonDiscard = (Button) view.findViewById(R.id.buttonDiscard);
buttonSave.setOnClickListener(this); buttonSave.setOnClickListener(this);
buttonDiscard.setOnClickListener(this); buttonDiscard.setOnClickListener(this);
tvInputReminder.setOnClickListener(this); tvInputReminder.setOnClickListener(this);
ImageButton buttonPickColor = (ImageButton) view.findViewById(R.id.button_pick_color); ImageButton buttonPickColor = (ImageButton) view.findViewById(R.id.button_pick_color);
prefs = PreferenceManager.getDefaultSharedPreferences(getActivity()); prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
Bundle args = getArguments(); Bundle args = getArguments();
mode = (Integer) args.get("editMode"); mode = (Integer) args.get("editMode");
is24HourMode = DateFormat.is24HourFormat(getContext()); is24HourMode = DateFormat.is24HourFormat(getContext());
if(mode == CREATE_MODE) if (mode == CREATE_MODE)
{ {
getDialog().setTitle("Create habit"); getDialog().setTitle("Create habit");
modified_habit = new Habit(); modified_habit = new Habit();
int defaultNum = prefs.getInt("pref_default_habit_freq_num", modified_habit.freq_num); int defaultNum = prefs.getInt("pref_default_habit_freq_num", modified_habit.freq_num);
int defaultDen = prefs.getInt("pref_default_habit_freq_den", modified_habit.freq_den); int defaultDen = prefs.getInt("pref_default_habit_freq_den", modified_habit.freq_den);
int defaultColor = prefs.getInt("pref_default_habit_color", modified_habit.color); int defaultColor = prefs.getInt("pref_default_habit_color", modified_habit.color);
modified_habit.color = defaultColor; modified_habit.color = defaultColor;
modified_habit.freq_num = defaultNum; modified_habit.freq_num = defaultNum;
modified_habit.freq_den = defaultDen; modified_habit.freq_den = defaultDen;
} }
else if(mode == EDIT_MODE) else if (mode == EDIT_MODE)
{ {
originalHabit = Habit.get((Long) args.get("habitId")); originalHabit = Habit.get((Long) args.get("habitId"));
modified_habit = new Habit(originalHabit); modified_habit = new Habit(originalHabit);
getDialog().setTitle("Edit habit"); getDialog().setTitle("Edit habit");
tvName.append(modified_habit.name); tvName.append(modified_habit.name);
tvDescription.append(modified_habit.description); tvDescription.append(modified_habit.description);
} }
tvFreqNum.append(modified_habit.freq_num.toString()); tvFreqNum.append(modified_habit.freq_num.toString());
tvFreqDen.append(modified_habit.freq_den.toString()); tvFreqDen.append(modified_habit.freq_den.toString());
changeColor(modified_habit.color); changeColor(modified_habit.color);
updateReminder(); updateReminder();
buttonPickColor.setOnClickListener(new OnClickListener() buttonPickColor.setOnClickListener(new OnClickListener()
{ {
public void onClick(View view) public void onClick(View view)
{ {
ColorPickerDialog picker = ColorPickerDialog.newInstance( ColorPickerDialog picker =
R.string.color_picker_default_title, ColorPickerDialog.newInstance(R.string.color_picker_default_title,
ColorHelper.palette, modified_habit.color, 4, ColorPickerDialog.SIZE_SMALL); ColorHelper.palette, modified_habit.color, 4,
ColorPickerDialog.SIZE_SMALL);
picker.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener() picker.setOnColorSelectedListener(new ColorPickerSwatch.OnColorSelectedListener()
{ {
public void onColorSelected(int color) public void onColorSelected(int color)
{ {
changeColor(color); changeColor(color);
} }
}); });
picker.show(getFragmentManager(), "picker"); picker.show(getFragmentManager(), "picker");
} }
}); });
return view; return view;
} }
private void changeColor(Integer color) private void changeColor(Integer color)
{ {
modified_habit.color = color; modified_habit.color = color;
tvName.setTextColor(color); tvName.setTextColor(color);
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
editor.putInt("pref_default_habit_color", color); editor.putInt("pref_default_habit_color", color);
editor.apply(); editor.apply();
} }
private void updateReminder() private void updateReminder()
{ {
if(modified_habit.reminder_hour != null) if (modified_habit.reminder_hour != null)
{ {
tvInputReminder.setTextColor(Color.BLACK); tvInputReminder.setTextColor(Color.BLACK);
tvInputReminder.setText(DateHelper.formatTime(getActivity(), tvInputReminder.setText(
modified_habit.reminder_hour, modified_habit.reminder_min)); DateHelper.formatTime(getActivity(), modified_habit.reminder_hour,
} modified_habit.reminder_min));
else }
{ else
tvInputReminder.setTextColor(Color.GRAY); {
tvInputReminder.setText("Off"); tvInputReminder.setTextColor(Color.GRAY);
} tvInputReminder.setText("Off");
} }
}
public void setOnSavedListener(OnSavedListener onSavedListener) public void setOnSavedListener(OnSavedListener onSavedListener)
{ {
this.onSavedListener = onSavedListener; this.onSavedListener = onSavedListener;
} }
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* Callback * * Callback *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@Override @Override
public void onClick(View v) public void onClick(View v)
{ {
int id = v.getId(); int id = v.getId();
/* Due date spinner */ /* Due date spinner */
if(id == R.id.input_reminder_time) if (id == R.id.input_reminder_time)
{ {
int default_hour = 8; int default_hour = 8;
int default_min = 0; int default_min = 0;
if(modified_habit.reminder_hour != null) { if (modified_habit.reminder_hour != null)
default_hour = modified_habit.reminder_hour; {
default_min = modified_habit.reminder_min; default_hour = modified_habit.reminder_hour;
} default_min = modified_habit.reminder_min;
}
TimePickerDialog timePicker = TimePickerDialog.newInstance(new OnTimeSetListener() TimePickerDialog timePicker = TimePickerDialog.newInstance(new OnTimeSetListener()
{ {
@Override @Override
public void onTimeSet(RadialPickerLayout view, int hour, int minute) public void onTimeSet(RadialPickerLayout view, int hour, int minute)
{ {
modified_habit.reminder_hour = hour; modified_habit.reminder_hour = hour;
modified_habit.reminder_min = minute; modified_habit.reminder_min = minute;
updateReminder(); updateReminder();
} }
@Override @Override
public void onTimeCleared(RadialPickerLayout view) public void onTimeCleared(RadialPickerLayout view)
{ {
modified_habit.reminder_hour = null; modified_habit.reminder_hour = null;
modified_habit.reminder_min = null; modified_habit.reminder_min = null;
updateReminder(); updateReminder();
} }
}, default_hour, default_min, is24HourMode); }, default_hour, default_min, is24HourMode);
timePicker.show(getFragmentManager(), "timePicker"); timePicker.show(getFragmentManager(), "timePicker");
} }
/* Save button */ /* Save button */
if(id == R.id.buttonSave) if (id == R.id.buttonSave)
{ {
Command command = null; Command command = null;
modified_habit.name = tvName.getText().toString().trim(); modified_habit.name = tvName.getText().toString().trim();
modified_habit.description = tvDescription.getText().toString().trim(); modified_habit.description = tvDescription.getText().toString().trim();
modified_habit.freq_num = Integer.parseInt(tvFreqNum.getText().toString()); modified_habit.freq_num = Integer.parseInt(tvFreqNum.getText().toString());
modified_habit.freq_den = Integer.parseInt(tvFreqDen.getText().toString()); modified_habit.freq_den = Integer.parseInt(tvFreqDen.getText().toString());
Boolean valid = true; Boolean valid = true;
if(modified_habit.name.length() == 0) if (modified_habit.name.length() == 0)
{ {
tvName.setError("Name cannot be blank."); tvName.setError("Name cannot be blank.");
valid = false; valid = false;
} }
if(modified_habit.freq_den <= 0) if (modified_habit.freq_den <= 0)
{ {
tvFreqNum.setError("Number must be positive."); tvFreqNum.setError("Number must be positive.");
valid = false; valid = false;
} }
if(modified_habit.freq_num > modified_habit.freq_den) if (modified_habit.freq_num > modified_habit.freq_den)
{ {
tvFreqNum.setError("You can have at most one repetition per day"); tvFreqNum.setError("You can have at most one repetition per day");
valid = false; valid = false;
} }
if(!valid) if (!valid) return;
return;
SharedPreferences.Editor editor = prefs.edit(); SharedPreferences.Editor editor = prefs.edit();
editor.putInt("pref_default_habit_freq_num", modified_habit.freq_num); editor.putInt("pref_default_habit_freq_num", modified_habit.freq_num);
editor.putInt("pref_default_habit_freq_den", modified_habit.freq_den); editor.putInt("pref_default_habit_freq_den", modified_habit.freq_den);
editor.apply(); editor.apply();
Habit savedHabit = null; Habit savedHabit = null;
if(mode == EDIT_MODE) if (mode == EDIT_MODE)
{ {
command = originalHabit.new EditCommand(modified_habit); command = originalHabit.new EditCommand(modified_habit);
savedHabit = originalHabit; savedHabit = originalHabit;
} }
if(mode == CREATE_MODE) if (mode == CREATE_MODE) command = new Habit.CreateCommand(modified_habit);
command = new Habit.CreateCommand(modified_habit);
if(onSavedListener != null) if (onSavedListener != null) onSavedListener.onSaved(command, savedHabit);
onSavedListener.onSaved(command, savedHabit);
dismiss(); dismiss();
} }
/* Discard button */ /* Discard button */
if(id == R.id.buttonDiscard) if (id == R.id.buttonDiscard)
{ {
dismiss(); dismiss();
} }
} }
} }

76
app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java
View File

@@ -140,8 +140,8 @@ public class ListHabitsFragment extends Fragment
listView.setOnTouchListener(controller); listView.setOnTouchListener(controller);
listView.setDragEnabled(true); listView.setDragEnabled(true);
Typeface fontawesome = Typeface.createFromAsset(getActivity().getAssets(), Typeface fontawesome =
"fontawesome-webfont.ttf"); Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf");
((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome); ((TextView) view.findViewById(R.id.tvStarEmpty)).setTypeface(fontawesome);
llEmpty = view.findViewById(R.id.llEmpty); llEmpty = view.findViewById(R.id.llEmpty);
@@ -162,7 +162,7 @@ public class ListHabitsFragment extends Fragment
public void onResume() public void onResume()
{ {
super.onResume(); super.onResume();
if(lastLoadedTimestamp == null || lastLoadedTimestamp != DateHelper.getStartOfToday()) if (lastLoadedTimestamp == null || lastLoadedTimestamp != DateHelper.getStartOfToday())
{ {
updateHeader(); updateHeader();
fetchAllHabits(); fetchAllHabits();
@@ -192,9 +192,10 @@ public class ListHabitsFragment extends Fragment
{ {
View check = inflater.inflate(R.layout.list_habits_header_check, null); View check = inflater.inflate(R.layout.list_habits_header_check, null);
Button btCheck = (Button) check.findViewById(R.id.tvCheck); Button btCheck = (Button) check.findViewById(R.id.tvCheck);
btCheck.setText(day.getDisplayName(GregorianCalendar.DAY_OF_WEEK, btCheck.setText(
GregorianCalendar.SHORT, Locale.US) + "\n" + day.getDisplayName(GregorianCalendar.DAY_OF_WEEK, GregorianCalendar.SHORT,
Integer.toString(day.get(GregorianCalendar.DAY_OF_MONTH))); Locale.US) + "\n" +
Integer.toString(day.get(GregorianCalendar.DAY_OF_MONTH)));
llButtonsHeader.addView(check); llButtonsHeader.addView(check);
day.add(GregorianCalendar.DAY_OF_MONTH, -1); day.add(GregorianCalendar.DAY_OF_MONTH, -1);
@@ -203,7 +204,7 @@ public class ListHabitsFragment extends Fragment
private void fetchAllHabits() private void fetchAllHabits()
{ {
if(currentFetchTask != null) currentFetchTask.cancel(true); if (currentFetchTask != null) currentFetchTask.cancel(true);
currentFetchTask = new AsyncTask<Void, Integer, Void>() currentFetchTask = new AsyncTask<Void, Integer, Void>()
{ {
@@ -219,7 +220,7 @@ public class ListHabitsFragment extends Fragment
long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay; long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay;
int[] empty = new int[button_count]; int[] empty = new int[button_count];
for(Habit h : newHabits.values()) for (Habit h : newHabits.values())
{ {
newScores.put(h.getId(), 0); newScores.put(h.getId(), 0);
newPositionToHabit.put(h.position, h); newPositionToHabit.put(h.position, h);
@@ -227,9 +228,9 @@ public class ListHabitsFragment extends Fragment
} }
int current = 0; int current = 0;
for(int i = 0; i < newHabits.size(); i++) for (int i = 0; i < newHabits.size(); i++)
{ {
if(isCancelled()) return null; if (isCancelled()) return null;
Habit h = newPositionToHabit.get(i); Habit h = newPositionToHabit.get(i);
newScores.put(h.getId(), h.getScore()); newScores.put(h.getId(), h.getScore());
@@ -265,7 +266,7 @@ public class ListHabitsFragment extends Fragment
progressBar.setMax(values[1]); progressBar.setMax(values[1]);
progressBar.setProgress(values[0]); progressBar.setProgress(values[0]);
if(lastLoadedTimestamp == null) if (lastLoadedTimestamp == null)
{ {
commit(); commit();
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
@@ -275,7 +276,7 @@ public class ListHabitsFragment extends Fragment
@Override @Override
protected void onPostExecute(Void aVoid) protected void onPostExecute(Void aVoid)
{ {
if(isCancelled()) return; if (isCancelled()) return;
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
updateEmptyMessage(); updateEmptyMessage();
@@ -316,7 +317,7 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public void run() public void run()
{ {
if(getStatus() == Status.RUNNING) if (getStatus() == Status.RUNNING)
{ {
progressBar.setIndeterminate(true); progressBar.setIndeterminate(true);
progressBar.setVisibility(View.VISIBLE); progressBar.setVisibility(View.VISIBLE);
@@ -353,16 +354,14 @@ public class ListHabitsFragment extends Fragment
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
final Habit habit = habits.get(info.id); final Habit habit = habits.get(info.id);
if(habit.isArchived()) if (habit.isArchived()) menu.findItem(R.id.action_archive_habit).setVisible(false);
menu.findItem(R.id.action_archive_habit).setVisible(false); else menu.findItem(R.id.action_unarchive_habit).setVisible(false);
else
menu.findItem(R.id.action_unarchive_habit).setVisible(false);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) public boolean onOptionsItemSelected(MenuItem item)
{ {
switch(item.getItemId()) switch (item.getItemId())
{ {
case R.id.action_add: case R.id.action_add:
{ {
@@ -427,7 +426,7 @@ public class ListHabitsFragment extends Fragment
{ {
Habit h = (Habit) savedObject; Habit h = (Habit) savedObject;
if(h == null) activity.executeCommand(command, null); if (h == null) activity.executeCommand(command, null);
else activity.executeCommand(command, h.getId()); else activity.executeCommand(command, h.getId());
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
@@ -436,24 +435,23 @@ public class ListHabitsFragment extends Fragment
private void updateEmptyMessage() private void updateEmptyMessage()
{ {
if(lastLoadedTimestamp == null) if (lastLoadedTimestamp == null) llEmpty.setVisibility(View.GONE);
llEmpty.setVisibility(View.GONE); else llEmpty.setVisibility(habits.size() > 0 ? View.GONE : View.VISIBLE);
else
llEmpty.setVisibility(habits.size() > 0 ? View.GONE : View.VISIBLE);
} }
@Override @Override
public boolean onLongClick(View v) public boolean onLongClick(View v)
{ {
switch(v.getId()) switch (v.getId())
{ {
case R.id.tvCheck: case R.id.tvCheck:
{ {
lastLongClick = new Date().getTime(); lastLongClick = new Date().getTime();
if(!short_toggle_enabled) if (!short_toggle_enabled)
{ {
toggleCheck(v); toggleCheck(v);
Vibrator vb = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE); Vibrator vb =
(Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
vb.vibrate(100); vb.vibrate(100);
} }
@@ -472,10 +470,8 @@ public class ListHabitsFragment extends Fragment
long timestamp = DateHelper.getStartOfDay( long timestamp = DateHelper.getStartOfDay(
DateHelper.getLocalTime() - offset * DateHelper.millisecondsInOneDay); DateHelper.getLocalTime() - offset * DateHelper.millisecondsInOneDay);
if(v.getTag(R.string.toggle_key).equals(2)) if (v.getTag(R.string.toggle_key).equals(2)) updateCheck(habit.color, (TextView) v, 0);
updateCheck(habit.color, (TextView) v, 0); else updateCheck(habit.color, (TextView) v, 2);
else
updateCheck(habit.color, (TextView) v, 2);
executeCommand(habit.new ToggleRepetitionCommand(timestamp), habit.getId()); executeCommand(habit.new ToggleRepetitionCommand(timestamp), habit.getId());
} }
@@ -500,13 +496,11 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public void onClick(View v) public void onClick(View v)
{ {
switch(v.getId()) switch (v.getId())
{ {
case R.id.tvCheck: case R.id.tvCheck:
if(short_toggle_enabled) if (short_toggle_enabled) toggleCheck(v);
toggleCheck(v); else activity.showToast(R.string.long_press_to_toggle);
else
activity.showToast(R.string.long_press_to_toggle);
return; return;
} }
} }
@@ -548,14 +542,14 @@ public class ListHabitsFragment extends Fragment
{ {
final Habit habit = positionToHabit.get(position); final Habit habit = positionToHabit.get(position);
if (view == null || (Long) view.getTag(R.id.KEY_TIMESTAMP) != if (view == null ||
DateHelper.getStartOfToday()) (Long) view.getTag(R.id.KEY_TIMESTAMP) != DateHelper.getStartOfToday())
{ {
view = inflater.inflate(R.layout.list_habits_item, null); view = inflater.inflate(R.layout.list_habits_item, null);
((TextView) view.findViewById(R.id.tvStar)).setTypeface(fontawesome); ((TextView) view.findViewById(R.id.tvStar)).setTypeface(fontawesome);
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(tvNameWidth, LinearLayout.LayoutParams params =
LayoutParams.WRAP_CONTENT, 1); new LinearLayout.LayoutParams(tvNameWidth, LayoutParams.WRAP_CONTENT, 1);
view.findViewById(R.id.tvName).setLayoutParams(params); view.findViewById(R.id.tvName).setLayoutParams(params);
Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)) Display display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE))
@@ -593,7 +587,7 @@ public class ListHabitsFragment extends Fragment
tvName.setText(habit.name); tvName.setText(habit.name);
tvName.setTextColor(activeColor); tvName.setTextColor(activeColor);
if(habit.isArchived()) if (habit.isArchived())
{ {
activeColor = ColorHelper.palette[12]; activeColor = ColorHelper.palette[12];
tvName.setTextColor(activeColor); tvName.setTextColor(activeColor);
@@ -666,7 +660,7 @@ public class ListHabitsFragment extends Fragment
public void onPostExecuteCommand(Long refreshKey) public void onPostExecuteCommand(Long refreshKey)
{ {
if(refreshKey == null) fetchAllHabits(); if (refreshKey == null) fetchAllHabits();
else fetchHabit(refreshKey); else fetchHabit(refreshKey);
} }
} }

3
app/src/main/java/org/isoron/uhabits/dialogs/SettingsFragment.java
View File

@@ -23,7 +23,8 @@ import android.preference.PreferenceFragment;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
public class SettingsFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener public class SettingsFragment extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener
{ {
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)

8
app/src/main/java/org/isoron/uhabits/dialogs/ShowHabitFragment.java
View File

@@ -80,9 +80,9 @@ public class ShowHabitFragment extends Fragment implements DialogHelper.OnSavedL
tvStreaks.setTextColor(habit.color); tvStreaks.setTextColor(habit.color);
LinearLayout llOverview = (LinearLayout) view.findViewById(R.id.llOverview); LinearLayout llOverview = (LinearLayout) view.findViewById(R.id.llOverview);
llOverview.addView(new RingView(activity, (int) activity.getResources().getDimension( llOverview.addView(new RingView(activity,
R.dimen.small_square_size) * 4, habit.color, (int) activity.getResources().getDimension(R.dimen.small_square_size) * 4,
((float) habit.getScore() / Habit.MAX_SCORE), "Habit strength")); habit.color, ((float) habit.getScore() / Habit.MAX_SCORE), "Habit strength"));
LinearLayout llStrength = (LinearLayout) view.findViewById(R.id.llStrength); LinearLayout llStrength = (LinearLayout) view.findViewById(R.id.llStrength);
llStrength.addView(new HabitScoreView(activity, habit, llStrength.addView(new HabitScoreView(activity, habit,
@@ -130,7 +130,7 @@ public class ShowHabitFragment extends Fragment implements DialogHelper.OnSavedL
{ {
Habit h = (Habit) savedObject; Habit h = (Habit) savedObject;
if(h == null) activity.executeCommand(command, null); if (h == null) activity.executeCommand(command, null);
else activity.executeCommand(command, h.getId()); else activity.executeCommand(command, h.getId());
ReminderHelper.createReminderAlarms(activity); ReminderHelper.createReminderAlarms(activity);

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

@@ -105,7 +105,7 @@ public class Habit extends Model
List<Habit> habits = select().execute(); List<Habit> habits = select().execute();
HashMap<Long, Habit> map = new HashMap<>(); HashMap<Long, Habit> map = new HashMap<>();
for(Habit h : habits) for (Habit h : habits)
{ {
map.put(h.getId(), h); map.put(h.getId(), h);
} }
@@ -121,10 +121,8 @@ public class Habit extends Model
protected static From select() protected static From select()
{ {
if(includeArchived) if (includeArchived) return new Select().from(Habit.class).orderBy("position");
return new Select().from(Habit.class).orderBy("position"); else return new Select().from(Habit.class).where("archived = 0").orderBy("position");
else
return new Select().from(Habit.class).where("archived = 0").orderBy("position");
} }
public static void setIncludeArchived(boolean includeArchived) public static void setIncludeArchived(boolean includeArchived)
@@ -155,7 +153,8 @@ public class Habit extends Model
public static java.util.List<Habit> getHighlightedHabits() public static java.util.List<Habit> getHighlightedHabits()
{ {
return select().where("highlight = 1").orderBy("reminder_hour desc, reminder_min desc") return select().where("highlight = 1")
.orderBy("reminder_hour desc, reminder_min desc")
.execute(); .execute();
} }
@@ -170,9 +169,11 @@ public class Habit extends Model
Habit h = Habit.getByPosition(from); Habit h = Habit.getByPosition(from);
if (to < from) new Update(Habit.class).set("position = position + 1") if (to < from) new Update(Habit.class).set("position = position + 1")
.where("position >= ? and position < ?", to, from).execute(); .where("position >= ? and position < ?", to, from)
.execute();
else new Update(Habit.class).set("position = position - 1") else new Update(Habit.class).set("position = position - 1")
.where("position > ? and position <= ?", from, to).execute(); .where("position > ? and position <= ?", from, to)
.execute();
h.position = to; h.position = to;
h.save(); h.save();
@@ -193,8 +194,7 @@ public class Habit extends Model
} }
ActiveAndroid.setTransactionSuccessful(); ActiveAndroid.setTransactionSuccessful();
} } finally
finally
{ {
ActiveAndroid.endTransaction(); ActiveAndroid.endTransaction();
} }
@@ -271,8 +271,10 @@ public class Habit extends Model
public void deleteReps(long timestamp) public void deleteReps(long timestamp)
{ {
new Delete().from(Repetition.class).where("habit = ?", getId()) new Delete().from(Repetition.class)
.and("timestamp = ?", timestamp).execute(); .where("habit = ?", getId())
.and("timestamp = ?", timestamp)
.execute();
} }
public void deleteCheckmarksNewerThan(long timestamp) public void deleteCheckmarksNewerThan(long timestamp)
@@ -306,7 +308,7 @@ public class Habit extends Model
int nDays = (int) ((toTimestamp - fromTimestamp) / day) + 1; int nDays = (int) ((toTimestamp - fromTimestamp) / day) + 1;
int[] checks = new int[nDays]; int[] checks = new int[nDays];
if(cursor.moveToFirst()) if (cursor.moveToFirst())
{ {
do do
{ {
@@ -327,7 +329,7 @@ public class Habit extends Model
long day = DateHelper.millisecondsInOneDay; long day = DateHelper.millisecondsInOneDay;
Checkmark newestCheckmark = getNewestCheckmark(); Checkmark newestCheckmark = getNewestCheckmark();
if(newestCheckmark == null) if (newestCheckmark == null)
{ {
Repetition oldestRep = getOldestRep(); Repetition oldestRep = getOldestRep();
if (oldestRep == null) return; if (oldestRep == null) return;
@@ -339,8 +341,7 @@ public class Habit extends Model
beginning = newestCheckmark.timestamp + day; beginning = newestCheckmark.timestamp + day;
} }
if(beginning > today) if (beginning > today) return;
return;
long beginningExtended = beginning - (long) (freq_den) * day; long beginningExtended = beginning - (long) (freq_den) * day;
List<Repetition> reps = selectRepsFromTo(beginningExtended, today).execute(); List<Repetition> reps = selectRepsFromTo(beginningExtended, today).execute();
@@ -382,8 +383,7 @@ public class Habit extends Model
} }
ActiveAndroid.setTransactionSuccessful(); ActiveAndroid.setTransactionSuccessful();
} } finally
finally
{ {
ActiveAndroid.endTransaction(); ActiveAndroid.endTransaction();
} }
@@ -419,10 +419,7 @@ public class Habit extends Model
public Repetition getOldestRepNewerThan(long timestamp) public Repetition getOldestRepNewerThan(long timestamp)
{ {
return selectReps() return selectReps().where("timestamp > ?", timestamp).limit(1).executeSingle();
.where("timestamp > ?", timestamp)
.limit(1)
.executeSingle();
} }
public void toggleRepetition(long timestamp) public void toggleRepetition(long timestamp)
@@ -471,13 +468,18 @@ public class Habit extends Model
public Score getNewestScore() public Score getNewestScore()
{ {
return new Select().from(Score.class).where("habit = ?", getId()).orderBy("timestamp desc") return new Select().from(Score.class)
.limit(1).executeSingle(); .where("habit = ?", getId())
.orderBy("timestamp desc")
.limit(1)
.executeSingle();
} }
public void deleteScoresNewerThan(long timestamp) public void deleteScoresNewerThan(long timestamp)
{ {
new Delete().from(Score.class).where("habit = ?", getId()).and("timestamp >= ?", timestamp) new Delete().from(Score.class)
.where("habit = ?", getId())
.and("timestamp >= ?", timestamp)
.execute(); .execute();
} }
@@ -533,8 +535,7 @@ public class Habit extends Model
} }
ActiveAndroid.setTransactionSuccessful(); ActiveAndroid.setTransactionSuccessful();
} } finally
finally
{ {
ActiveAndroid.endTransaction(); ActiveAndroid.endTransaction();
} }
@@ -549,17 +550,18 @@ public class Habit extends Model
public List<Score> getScores(long fromTimestamp, long toTimestamp, int divisor, long offset) public List<Score> getScores(long fromTimestamp, long toTimestamp, int divisor, long offset)
{ {
return new Select().from(Score.class).where("habit = ? and timestamp > ? and " + return new Select().from(Score.class)
"timestamp <= ? and (timestamp - ?) % ? = 0", getId(), fromTimestamp, toTimestamp, .where("habit = ? and timestamp > ? and " +
offset, divisor).execute(); "timestamp <= ? and (timestamp - ?) % ? = 0", getId(), fromTimestamp,
toTimestamp, offset, divisor)
.execute();
} }
public List<Streak> getStreaks() public List<Streak> getStreaks()
{ {
updateStreaks(); updateStreaks();
return new Select() return new Select().from(Streak.class)
.from(Streak.class)
.where("habit = ?", getId()) .where("habit = ?", getId())
.orderBy("end asc") .orderBy("end asc")
.execute(); .execute();
@@ -567,8 +569,7 @@ public class Habit extends Model
public Streak getNewestStreak() public Streak getNewestStreak()
{ {
return new Select() return new Select().from(Streak.class)
.from(Streak.class)
.where("habit = ?", getId()) .where("habit = ?", getId())
.orderBy("end desc") .orderBy("end desc")
.limit(1) .limit(1)
@@ -582,7 +583,7 @@ public class Habit extends Model
long day = DateHelper.millisecondsInOneDay; long day = DateHelper.millisecondsInOneDay;
Streak newestStreak = getNewestStreak(); Streak newestStreak = getNewestStreak();
if(newestStreak == null) if (newestStreak == null)
{ {
Repetition oldestRep = getOldestRep(); Repetition oldestRep = getOldestRep();
if (oldestRep == null) return; if (oldestRep == null) return;
@@ -597,7 +598,7 @@ public class Habit extends Model
beginning = oldestRep.timestamp; beginning = oldestRep.timestamp;
} }
if(beginning > today) return; if (beginning > today) return;
int checks[] = getCheckmarks(beginning, today); int checks[] = getCheckmarks(beginning, today);
ArrayList<Long> list = new ArrayList<>(); ArrayList<Long> list = new ArrayList<>();
@@ -605,17 +606,16 @@ public class Habit extends Model
long current = beginning; long current = beginning;
list.add(current); list.add(current);
for(int i = 1; i < checks.length; i++) for (int i = 1; i < checks.length; i++)
{ {
current += day; current += day;
int j = checks.length - i - 1; int j = checks.length - i - 1;
if((checks[j + 1] == 0 && checks[j] > 0)) list.add(current); if ((checks[j + 1] == 0 && checks[j] > 0)) list.add(current);
if((checks[j + 1] > 0 && checks[j] == 0)) list.add(current - day); if ((checks[j + 1] > 0 && checks[j] == 0)) list.add(current - day);
} }
if(list.size() % 2 == 1) if (list.size() % 2 == 1) list.add(current);
list.add(current);
ActiveAndroid.beginTransaction(); ActiveAndroid.beginTransaction();
@@ -632,8 +632,7 @@ public class Habit extends Model
} }
ActiveAndroid.setTransactionSuccessful(); ActiveAndroid.setTransactionSuccessful();
} } finally
finally
{ {
ActiveAndroid.endTransaction(); ActiveAndroid.endTransaction();
} }
@@ -657,7 +656,8 @@ public class Habit extends Model
{ {
savedHabit.save(); savedHabit.save();
savedId = savedHabit.getId(); savedId = savedHabit.getId();
} else }
else
{ {
savedHabit.save(savedId); savedHabit.save(savedId);
} }

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

@@ -21,11 +21,12 @@ import com.activeandroid.annotation.Column;
import com.activeandroid.annotation.Table; import com.activeandroid.annotation.Table;
@Table(name = "Repetitions") @Table(name = "Repetitions")
public class Repetition extends Model { public class Repetition extends Model
{
@Column(name = "habit") @Column(name = "habit")
public Habit habit; public Habit habit;
@Column(name = "timestamp") @Column(name = "timestamp")
public Long timestamp; public Long timestamp;
} }

16
app/src/main/java/org/isoron/uhabits/models/Score.java
View File

@@ -23,12 +23,12 @@ import com.activeandroid.annotation.Table;
@Table(name = "Score") @Table(name = "Score")
public class Score extends Model public class Score extends Model
{ {
@Column(name = "habit") @Column(name = "habit")
public Habit habit; public Habit habit;
@Column(name = "timestamp") @Column(name = "timestamp")
public Long timestamp; public Long timestamp;
@Column(name = "score") @Column(name = "score")
public Integer score; public Integer score;
} }

17
app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
View File

@@ -29,13 +29,11 @@ import android.view.View;
import org.isoron.helpers.ColorHelper; import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.DateHelper; import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Checkmark;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.List;
public class HabitHistoryView extends View public class HabitHistoryView extends View
{ {
@@ -122,7 +120,7 @@ public class HabitHistoryView extends View
Rect square = new Rect(0, 0, squareSize - squareSpacing, squareSize - squareSpacing); Rect square = new Rect(0, 0, squareSize - squareSpacing, squareSize - squareSpacing);
Calendar currentDate = new GregorianCalendar(); Calendar currentDate = new GregorianCalendar();
currentDate.add(Calendar.DAY_OF_YEAR, - (offsetWeeks - 1) * 7); currentDate.add(Calendar.DAY_OF_YEAR, -(offsetWeeks - 1) * 7);
int nDays = nColumns * 7; int nDays = nColumns * 7;
int todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7; int todayWeekday = new GregorianCalendar().get(Calendar.DAY_OF_WEEK) % 7;
@@ -160,12 +158,14 @@ public class HabitHistoryView extends View
pTextHeader); pTextHeader);
previousMonth = month; previousMonth = month;
justPrintedYear = false; justPrintedYear = false;
} else if (!year.equals(previousYear)) }
else if (!year.equals(previousYear))
{ {
canvas.drawText(year, square.left, square.bottom - headerTextOffset, pTextHeader); canvas.drawText(year, square.left, square.bottom - headerTextOffset, pTextHeader);
previousYear = year; previousYear = year;
justPrintedYear = true; justPrintedYear = true;
} else }
else
{ {
justPrintedYear = false; justPrintedYear = false;
} }
@@ -177,7 +177,7 @@ public class HabitHistoryView extends View
{ {
if (!(i == nColumns - 1 && offsetWeeks == 0 && j > todayWeekday)) if (!(i == nColumns - 1 && offsetWeeks == 0 && j > todayWeekday))
{ {
if(k >= checks.length) pSquareBg.setColor(colors[0]); if (k >= checks.length) pSquareBg.setColor(colors[0]);
else pSquareBg.setColor(colors[checks[k]]); else pSquareBg.setColor(colors[checks[k]]);
canvas.drawRect(square, pSquareBg); canvas.drawRect(square, pSquareBg);
@@ -225,7 +225,7 @@ public class HabitHistoryView extends View
if (Math.abs(dy) > Math.abs(dx)) return false; if (Math.abs(dy) > Math.abs(dx)) return false;
getParent().requestDisallowInterceptTouchEvent(true); getParent().requestDisallowInterceptTouchEvent(true);
if(move(dx)) if (move(dx))
{ {
prevX = x; prevX = x;
prevY = y; prevY = y;
@@ -247,7 +247,6 @@ public class HabitHistoryView extends View
invalidate(); invalidate();
return true; return true;
} }
else else return false;
return false;
} }
} }

10
app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
View File

@@ -98,8 +98,8 @@ public class HabitScoreView extends View
for (int i = 0; i < nColumns * BUCKET_SIZE; i++) for (int i = 0; i < nColumns * BUCKET_SIZE; i++)
fromTimestamp -= DateHelper.millisecondsInOneDay; fromTimestamp -= DateHelper.millisecondsInOneDay;
scores = habit.getScores(fromTimestamp, toTimestamp, BUCKET_SIZE * DateHelper.millisecondsInOneDay, scores = habit.getScores(fromTimestamp, toTimestamp,
toTimestamp); BUCKET_SIZE * DateHelper.millisecondsInOneDay, toTimestamp);
} }
@Override @Override
@@ -167,7 +167,8 @@ public class HabitScoreView extends View
if (!month.equals(previousMonth)) if (!month.equals(previousMonth))
{ {
canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText); canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
} else }
else
{ {
canvas.drawText(day, r.centerX(), r.bottom + lineHeight * 1.2f, pText); canvas.drawText(day, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
} }
@@ -263,6 +264,7 @@ public class HabitScoreView extends View
fetchScores(); fetchScores();
invalidate(); invalidate();
return true; return true;
} else return false; }
else return false;
} }
} }

22
app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
View File

@@ -26,7 +26,6 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import org.isoron.helpers.ColorHelper; import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import org.isoron.uhabits.models.Streak; import org.isoron.uhabits.models.Streak;
@@ -84,7 +83,7 @@ public class HabitStreakView extends View
{ {
streaks = habit.getStreaks(); streaks = habit.getStreaks();
for(Streak s : streaks) for (Streak s : streaks)
maxStreakLength = Math.max(maxStreakLength, s.length); maxStreakLength = Math.max(maxStreakLength, s.length);
} }
@@ -92,7 +91,7 @@ public class HabitStreakView extends View
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
{ {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
setMeasuredDimension(getMeasuredWidth(), columnHeight + 2*barHeaderHeight); setMeasuredDimension(getMeasuredWidth(), columnHeight + 2 * barHeaderHeight);
} }
@Override @Override
@@ -116,23 +115,23 @@ public class HabitStreakView extends View
String previousMonth = ""; String previousMonth = "";
for (int offset = 0; offset < nColumns && start+offset < nStreaks; offset++) for (int offset = 0; offset < nColumns && start + offset < nStreaks; offset++)
{ {
String month = dfMonth.format(streaks.get(start+offset).start); String month = dfMonth.format(streaks.get(start + offset).start);
long l = streaks.get(offset+start).length; long l = streaks.get(offset + start).length;
double lRelative = ((double) l) / maxStreakLength; double lRelative = ((double) l) / maxStreakLength;
pBar.setColor(colors[(int) Math.floor(lRelative*3)]); pBar.setColor(colors[(int) Math.floor(lRelative * 3)]);
int height = (int) (columnHeight * lRelative); int height = (int) (columnHeight * lRelative);
Rect r = new Rect(0,0,columnWidth-2, height); Rect r = new Rect(0, 0, columnWidth - 2, height);
r.offset(offset * columnWidth, barHeaderHeight + columnHeight - height); r.offset(offset * columnWidth, barHeaderHeight + columnHeight - height);
canvas.drawRect(r, pBar); canvas.drawRect(r, pBar);
canvas.drawText(Long.toString(l), r.centerX(), r.top - barHeaderOffset, pBar); canvas.drawText(Long.toString(l), r.centerX(), r.top - barHeaderOffset, pBar);
if(!month.equals(previousMonth)) if (!month.equals(previousMonth))
canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText); canvas.drawText(month, r.centerX(), r.bottom + lineHeight * 1.2f, pText);
previousMonth = month; previousMonth = month;
@@ -161,7 +160,7 @@ public class HabitStreakView extends View
if (Math.abs(dy) > Math.abs(dx)) return false; if (Math.abs(dy) > Math.abs(dx)) return false;
getParent().requestDisallowInterceptTouchEvent(true); getParent().requestDisallowInterceptTouchEvent(true);
if(move(dx)) if (move(dx))
{ {
prevX = x; prevX = x;
prevY = y; prevY = y;
@@ -182,7 +181,6 @@ public class HabitStreakView extends View
invalidate(); invalidate();
return true; return true;
} }
else else return false;
return false;
} }
} }

7
app/src/main/java/org/isoron/uhabits/views/RingView.java
View File

@@ -52,7 +52,7 @@ public class RingView extends View
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec)
{ {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
setMeasuredDimension(size, size + (int) (2*lineHeight)); setMeasuredDimension(size, size + (int) (2 * lineHeight));
} }
@Override @Override
@@ -75,9 +75,10 @@ public class RingView extends View
pRing.setColor(Color.GRAY); pRing.setColor(Color.GRAY);
pRing.setTextSize(size * 0.2f); pRing.setTextSize(size * 0.2f);
lineHeight = pRing.getFontSpacing(); lineHeight = pRing.getFontSpacing();
canvas.drawText(String.format("%.0f%%", perc * 100), r.centerX(), r.centerY()+lineHeight/3, pRing); canvas.drawText(String.format("%.0f%%", perc * 100), r.centerX(),
r.centerY() + lineHeight / 3, pRing);
pRing.setTextSize(size * 0.15f); pRing.setTextSize(size * 0.15f);
canvas.drawText(label, size/2, size + lineHeight * 1.2f, pRing); canvas.drawText(label, size / 2, size + lineHeight * 1.2f, pRing);
} }
} }