isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor ListHabitsFragment

Browse Source
pull/30/head
Alinson S. Xavier 10 years ago
parent c36cdb1e42
commit 191b9b9c1f
3 changed files with 381 additions and 311 deletions
Show Stats Download Patch File Download Diff File

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

@ -19,33 +19,22 @@ package org.isoron.helpers;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnClickListener;
import android.graphics.Typeface;
import android.os.Vibrator;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
import org.isoron.uhabits.R;
public abstract class DialogHelper public abstract class DialogHelper
{ {
// public static AlertDialog alert(Activity context, String title, String message, OnClickListener positiveClickListener) { private static Typeface fontawesome;
// return new AlertDialog.Builder(context)
// .setTitle(title)
// .setMessage(message)
// .setPositiveButton(android.R.string.yes, positiveClickListener)
// .setNegativeButton(android.R.string.no, null).show();
// }
public static abstract class SimpleClickListener implements OnClickListener
{
public abstract void onClick();
public void onClick(DialogInterface dialog, int whichButton)
{
onClick();
}
}
public static interface OnSavedListener public interface OnSavedListener
{ {
public void onSaved(Command command, Object savedObject); void onSaved(Command command, Object savedObject);
} }
public static void showSoftKeyboard(View view) public static void showSoftKeyboard(View view)
@ -54,4 +43,10 @@ public abstract class DialogHelper
.getSystemService(Context.INPUT_METHOD_SERVICE); .getSystemService(Context.INPUT_METHOD_SERVICE);
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT); imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
} }
public static void vibrate(Context context, int duration)
{
Vibrator vb = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
vb.vibrate(duration);
}
} }

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

@ -21,18 +21,12 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Point;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler;
import android.os.Vibrator;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.Display;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuInflater; import android.view.MenuInflater;
@ -41,7 +35,6 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnLongClickListener; import android.view.View.OnLongClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemClickListener;
@ -56,26 +49,23 @@ import com.mobeta.android.dslv.DragSortController;
import com.mobeta.android.dslv.DragSortListView; import com.mobeta.android.dslv.DragSortListView;
import com.mobeta.android.dslv.DragSortListView.DropListener; import com.mobeta.android.dslv.DragSortListView.DropListener;
import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.Command; import org.isoron.helpers.Command;
import org.isoron.helpers.DateHelper; import org.isoron.helpers.DateHelper;
import org.isoron.helpers.DialogHelper;
import org.isoron.helpers.DialogHelper.OnSavedListener; import org.isoron.helpers.DialogHelper.OnSavedListener;
import org.isoron.helpers.ReplayableActivity; import org.isoron.helpers.ReplayableActivity;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.ReminderHelper; import org.isoron.uhabits.ReminderHelper;
import org.isoron.uhabits.loaders.HabitListLoader;
import org.isoron.uhabits.models.Habit; import org.isoron.uhabits.models.Habit;
import java.util.Date; import java.util.Date;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Locale;
import java.util.TimeZone;
public class ListHabitsFragment extends Fragment public class ListHabitsFragment extends Fragment
implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener, implements OnSavedListener, OnItemClickListener, OnLongClickListener, DropListener,
OnClickListener OnClickListener, HabitListLoader.Listener
{ {
public static final int INACTIVE_COLOR = Color.rgb(230, 230, 230); public static final int INACTIVE_COLOR = Color.rgb(230, 230, 230);
public interface OnHabitClickListener public interface OnHabitClickListener
@ -88,21 +78,15 @@ public class ListHabitsFragment extends Fragment
ReplayableActivity activity; ReplayableActivity activity;
TextView tvNameHeader; TextView tvNameHeader;
long lastLongClick = 0; long lastLongClick = 0;
private int tvNameWidth; private int tvNameWidth;
private int button_count; private int buttonCount;
private View llEmpty; private View llEmpty;
private ProgressBar progressBar;
private OnHabitClickListener habitClickListener; private OnHabitClickListener habitClickListener;
private boolean short_toggle_enabled; private boolean isShortToggleEnabled;
private HashMap<Long, Habit> habits;
private HashMap<Integer, Habit> positionToHabit;
private HashMap<Long, int[]> checkmarks;
private HashMap<Long, Integer> scores;
private Long lastLoadedTimestamp = null; private HabitListLoader loader;
private AsyncTask<Void, Integer, Void> currentFetchTask = null;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -110,19 +94,19 @@ public class ListHabitsFragment extends Fragment
{ {
DisplayMetrics dm = getResources().getDisplayMetrics(); DisplayMetrics dm = getResources().getDisplayMetrics();
int width = (int) (dm.widthPixels / dm.density); int width = (int) (dm.widthPixels / dm.density);
button_count = (int) ((width - 160) / 42); buttonCount = (int) ((width - 160) / 42.0);
tvNameWidth = (int) ((width - 30 - button_count * 42) * dm.density); tvNameWidth = (int) ((width - 30 - buttonCount * 42) * dm.density);
habits = new HashMap<>(); loader = new HabitListLoader();
positionToHabit = new HashMap<>(); loader.setListener(this);
checkmarks = new HashMap<>(); loader.setCheckmarkCount(buttonCount);
scores = new HashMap<>();
View view = inflater.inflate(R.layout.list_habits_fragment, container, false); View view = inflater.inflate(R.layout.list_habits_fragment, container, false);
tvNameHeader = (TextView) view.findViewById(R.id.tvNameHeader); tvNameHeader = (TextView) view.findViewById(R.id.tvNameHeader);
progressBar = (ProgressBar) view.findViewById(R.id.progressBar); ProgressBar progressBar = (ProgressBar) view.findViewById(R.id.progressBar);
progressBar.setVisibility(View.INVISIBLE); progressBar.setVisibility(View.INVISIBLE);
loader.setProgressBar(progressBar);
adapter = new ListHabitsAdapter(getActivity()); adapter = new ListHabitsAdapter(getActivity());
listView = (DragSortListView) view.findViewById(R.id.listView); listView = (DragSortListView) view.findViewById(R.id.listView);
@ -141,17 +125,19 @@ public class ListHabitsFragment extends Fragment
listView.setOnTouchListener(controller); listView.setOnTouchListener(controller);
listView.setDragEnabled(true); listView.setDragEnabled(true);
Typeface fontawesome = Typeface fontawesome = Typeface.createFromAsset(getActivity().getAssets(),
Typeface.createFromAsset(getActivity().getAssets(), "fontawesome-webfont.ttf"); "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);
updateEmptyMessage(); loader.updateAllHabits();
setHasOptionsMenu(true); setHasOptionsMenu(true);
return view; return view;
} }
@Override @Override
@SuppressWarnings("deprecation")
public void onAttach(Activity activity) public void onAttach(Activity activity)
{ {
super.onAttach(activity); super.onAttach(activity);
@ -163,17 +149,17 @@ public class ListHabitsFragment extends Fragment
public void onResume() public void onResume()
{ {
super.onResume(); super.onResume();
if (lastLoadedTimestamp == null || lastLoadedTimestamp != DateHelper.getStartOfToday()) Long timestamp = loader.getLastLoadTimestamp();
{
updateHeader(); if (timestamp != null && timestamp != DateHelper.getStartOfToday())
fetchAllHabits(); loader.updateAllHabits();
updateEmptyMessage();
}
updateEmptyMessage();
updateHeader();
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
short_toggle_enabled = prefs.getBoolean("pref_short_toggle", false); isShortToggleEnabled = prefs.getBoolean("pref_short_toggle", false);
} }
private void updateHeader() private void updateHeader()
@ -183,159 +169,29 @@ public class ListHabitsFragment extends Fragment
if (view == null) return; if (view == null) return;
GregorianCalendar day = new GregorianCalendar(TimeZone.getTimeZone("GMT")); GregorianCalendar day = DateHelper.getStartOfTodayCalendar();
day.setTimeInMillis(DateHelper.getStartOfDay(DateHelper.getLocalTime()));
LinearLayout llButtonsHeader = (LinearLayout) view.findViewById(R.id.llButtonsHeader); LinearLayout llButtonsHeader = (LinearLayout) view.findViewById(R.id.llButtonsHeader);
llButtonsHeader.removeAllViews(); llButtonsHeader.removeAllViews();
for (int i = 0; i < button_count; i++) for (int i = 0; i < buttonCount; i++)
{ {
View check = inflater.inflate(R.layout.list_habits_header_check, null); View tvDay = inflater.inflate(R.layout.list_habits_header_check, null);
Button btCheck = (Button) check.findViewById(R.id.tvCheck); Button btCheck = (Button) tvDay.findViewById(R.id.tvCheck);
btCheck.setText( btCheck.setText(DateHelper.formatHeaderDate(day));
day.getDisplayName(GregorianCalendar.DAY_OF_WEEK, GregorianCalendar.SHORT, llButtonsHeader.addView(tvDay);
Locale.US) + "\n" +
Integer.toString(day.get(GregorianCalendar.DAY_OF_MONTH)));
llButtonsHeader.addView(check);
day.add(GregorianCalendar.DAY_OF_MONTH, -1); day.add(GregorianCalendar.DAY_OF_MONTH, -1);
} }
} }
private void fetchAllHabits()
{
if (currentFetchTask != null) currentFetchTask.cancel(true);
currentFetchTask = new AsyncTask<Void, Integer, Void>()
{
HashMap<Long, Habit> newHabits = Habit.getAll();
HashMap<Integer, Habit> newPositionToHabit = new HashMap<>();
HashMap<Long, int[]> newCheckmarks = new HashMap<>();
HashMap<Long, Integer> newScores = new HashMap<>();
@Override
protected Void doInBackground(Void... params)
{
long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay;
int[] empty = new int[button_count];
for (Habit h : newHabits.values())
{
newScores.put(h.getId(), 0);
newPositionToHabit.put(h.position, h);
newCheckmarks.put(h.getId(), empty);
}
int current = 0;
for (int i = 0; i < newHabits.size(); i++)
{
if (isCancelled()) return null;
Habit h = newPositionToHabit.get(i);
newScores.put(h.getId(), h.getScore());
newCheckmarks.put(h.getId(), h.getCheckmarks(dateFrom, dateTo));
publishProgress(current++, newHabits.size());
}
commit();
return null;
}
private void commit()
{
habits = newHabits;
positionToHabit = newPositionToHabit;
checkmarks = newCheckmarks;
scores = newScores;
}
@Override
protected void onPreExecute()
{
progressBar.setIndeterminate(false);
progressBar.setProgress(0);
progressBar.setVisibility(View.VISIBLE);
}
@Override @Override
protected void onProgressUpdate(Integer... values) public void onLoadFinished()
{ {
progressBar.setMax(values[1]);
progressBar.setProgress(values[0]);
if (lastLoadedTimestamp == null)
{
commit();
adapter.notifyDataSetChanged();
}
}
@Override
protected void onPostExecute(Void aVoid)
{
if (isCancelled()) return;
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
progressBar.setVisibility(View.INVISIBLE);
lastLoadedTimestamp = DateHelper.getStartOfToday();
currentFetchTask = null;
updateEmptyMessage(); updateEmptyMessage();
} }
};
currentFetchTask.execute();
}
private void fetchHabit(final Long id)
{
new AsyncTask<Void, Void, Void>()
{
@Override
protected Void doInBackground(Void... params)
{
long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
long dateFrom = dateTo - (button_count - 1) * DateHelper.millisecondsInOneDay;
Habit h = Habit.get(id);
habits.put(id, h);
scores.put(id, h.getScore());
checkmarks.put(id, h.getCheckmarks(dateFrom, dateTo));
return null;
}
@Override
protected void onPreExecute()
{
new Handler().postDelayed(new Runnable()
{
@Override
public void run()
{
if (getStatus() == Status.RUNNING)
{
progressBar.setIndeterminate(true);
progressBar.setVisibility(View.VISIBLE);
}
}
}, 500);
}
@Override
protected void onPostExecute(Void aVoid)
{
progressBar.setVisibility(View.GONE);
adapter.notifyDataSetChanged();
}
}.execute();
}
@Override @Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
{ {
@ -353,7 +209,7 @@ public class ListHabitsFragment extends Fragment
getActivity().getMenuInflater().inflate(R.menu.list_habits_context, menu); getActivity().getMenuInflater().inflate(R.menu.list_habits_context, menu);
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
final Habit habit = habits.get(info.id); final Habit habit = loader.habits.get(info.id);
if (habit.isArchived()) menu.findItem(R.id.action_archive_habit).setVisible(false); if (habit.isArchived()) 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);
@ -375,7 +231,7 @@ public class ListHabitsFragment extends Fragment
case R.id.action_show_archived: case R.id.action_show_archived:
{ {
Habit.setIncludeArchived(!Habit.isIncludeArchived()); Habit.setIncludeArchived(!Habit.isIncludeArchived());
fetchAllHabits(); loader.updateAllHabits();
activity.invalidateOptionsMenu(); activity.invalidateOptionsMenu();
return true; return true;
} }
@ -389,36 +245,41 @@ public class ListHabitsFragment extends Fragment
public boolean onContextItemSelected(MenuItem menuItem) public boolean onContextItemSelected(MenuItem menuItem)
{ {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuItem.getMenuInfo(); AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuItem.getMenuInfo();
final int id = menuItem.getItemId(); final Habit habit = loader.habits.get(info.id);
final Habit habit = habits.get(info.id);
if (id == R.id.action_edit_habit) switch(menuItem.getItemId())
{
case R.id.action_edit_habit:
{ {
EditHabitFragment frag = EditHabitFragment.editSingleHabitFragment(habit.getId()); EditHabitFragment frag = EditHabitFragment.editSingleHabitFragment(habit.getId());
frag.setOnSavedListener(this); frag.setOnSavedListener(this);
frag.show(getFragmentManager(), "dialog"); frag.show(getFragmentManager(), "dialog");
return true; return true;
} }
else if (id == R.id.action_archive_habit)
case R.id.action_archive_habit:
{ {
Command c = habit.new ArchiveCommand(); Command c = habit.new ArchiveCommand();
executeCommand(c, null); executeCommand(c, null);
return true;
} }
else if (id == R.id.action_unarchive_habit)
case R.id.action_unarchive_habit:
{ {
Command c = habit.new UnarchiveCommand(); Command c = habit.new UnarchiveCommand();
executeCommand(c, null); executeCommand(c, null);
} }
}
return super.onContextItemSelected(menuItem); return super.onContextItemSelected(menuItem);
} }
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) public void onItemClick(AdapterView parent, View view, int position, long id)
{ {
if (new Date().getTime() - lastLongClick < 1000) return; if (new Date().getTime() - lastLongClick < 1000) return;
Habit habit = positionToHabit.get(position); Habit habit = loader.positionToHabit.get(position);
habitClickListener.onHabitClicked(habit); habitClickListener.onHabitClicked(habit);
} }
@ -436,43 +297,44 @@ public class ListHabitsFragment extends Fragment
private void updateEmptyMessage() private void updateEmptyMessage()
{ {
if (lastLoadedTimestamp == null) llEmpty.setVisibility(View.GONE); if (loader.getLastLoadTimestamp() == null) llEmpty.setVisibility(View.GONE);
else llEmpty.setVisibility(habits.size() > 0 ? View.GONE : View.VISIBLE); else llEmpty.setVisibility(loader.habits.size() > 0 ? View.GONE : View.VISIBLE);
} }
@Override @Override
public boolean onLongClick(View v) public boolean onLongClick(View v)
{ {
lastLongClick = new Date().getTime();
switch (v.getId()) switch (v.getId())
{ {
case R.id.tvCheck: case R.id.tvCheck:
{ onCheckmarkLongClick(v);
lastLongClick = new Date().getTime();
if (!short_toggle_enabled)
{
toggleCheck(v);
Vibrator vb =
(Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE);
vb.vibrate(100);
}
return true; return true;
} }
}
return false; return false;
} }
private void onCheckmarkLongClick(View v)
{
if (isShortToggleEnabled) return;
toggleCheck(v);
DialogHelper.vibrate(activity, 100);
}
private void toggleCheck(View v) private void toggleCheck(View v)
{ {
Habit habit = habits.get((Long) v.getTag(R.string.habit_key)); Long tag = (Long) v.getTag(R.string.habit_key);
Habit habit = loader.habits.get(tag);
int offset = (Integer) v.getTag(R.string.offset_key); int offset = (Integer) v.getTag(R.string.offset_key);
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)) updateCheck(habit.color, (TextView) v, 0); if (v.getTag(R.string.toggle_key).equals(2)) updateCheckmark(habit.color, (TextView) v, 0);
else updateCheck(habit.color, (TextView) v, 2); else updateCheckmark(habit.color, (TextView) v, 2);
executeCommand(habit.new ToggleRepetitionCommand(timestamp), habit.getId()); executeCommand(habit.new ToggleRepetitionCommand(timestamp), habit.getId());
} }
@ -485,10 +347,10 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public void drop(int from, int to) public void drop(int from, int to)
{ {
Habit fromHabit = positionToHabit.get(from); Habit fromHabit = loader.positionToHabit.get(from);
Habit toHabit = positionToHabit.get(to); Habit toHabit = loader.positionToHabit.get(to);
positionToHabit.put(to, fromHabit); loader.positionToHabit.put(to, fromHabit);
positionToHabit.put(from, toHabit); loader.positionToHabit.put(from, toHabit);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
Habit.reorder(from, to); Habit.reorder(from, to);
@ -500,21 +362,19 @@ public class ListHabitsFragment extends Fragment
switch (v.getId()) switch (v.getId())
{ {
case R.id.tvCheck: case R.id.tvCheck:
if (short_toggle_enabled) toggleCheck(v); if (isShortToggleEnabled) toggleCheck(v);
else activity.showToast(R.string.long_press_to_toggle); else activity.showToast(R.string.long_press_to_toggle);
return; break;
} }
} }
class ListHabitsAdapter extends BaseAdapter class ListHabitsAdapter extends BaseAdapter
{ {
private Context context;
private LayoutInflater inflater; private LayoutInflater inflater;
private Typeface fontawesome; private Typeface fontawesome;
public ListHabitsAdapter(Context context) public ListHabitsAdapter(Context context)
{ {
this.context = context;
inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
fontawesome = Typeface.createFromAsset(context.getAssets(), "fontawesome-webfont.ttf"); fontawesome = Typeface.createFromAsset(context.getAssets(), "fontawesome-webfont.ttf");
@ -523,13 +383,13 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public int getCount() public int getCount()
{ {
return habits.size(); return loader.habits.size();
} }
@Override @Override
public Object getItem(int position) public Object getItem(int position)
{ {
return positionToHabit.get(position); return loader.positionToHabit.get(position);
} }
@Override @Override
@ -541,7 +401,7 @@ public class ListHabitsFragment extends Fragment
@Override @Override
public View getView(int position, View view, ViewGroup parent) public View getView(int position, View view, ViewGroup parent)
{ {
final Habit habit = positionToHabit.get(position); final Habit habit = loader.positionToHabit.get(position);
if (view == null || if (view == null ||
(Long) view.getTag(R.id.KEY_TIMESTAMP) != DateHelper.getStartOfToday()) (Long) view.getTag(R.id.KEY_TIMESTAMP) != DateHelper.getStartOfToday())
@ -553,12 +413,27 @@ public class ListHabitsFragment extends Fragment
new LinearLayout.LayoutParams(tvNameWidth, 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)) inflateCheckmarkButtons(view);
.getDefaultDisplay();
Point size = new Point(); view.setTag(R.id.KEY_TIMESTAMP, DateHelper.getStartOfToday());
display.getSize(size); }
TextView tvStar = ((TextView) view.findViewById(R.id.tvStar));
TextView tvName = (TextView) view.findViewById(R.id.tvName);
LinearLayout llInner = (LinearLayout) view.findViewById(R.id.llInner);
LinearLayout llButtons = (LinearLayout) view.findViewById(R.id.llButtons);
llInner.setTag(R.string.habit_key, habit.getId());
updateNameAndIcon(habit, tvStar, tvName);
updateCheckmarkButtons(habit, llButtons);
for (int i = 0; i < button_count; i++) return view;
}
private void inflateCheckmarkButtons(View view)
{
for (int i = 0; i < buttonCount; i++)
{ {
View check = inflater.inflate(R.layout.list_habits_item_check, null); View check = inflater.inflate(R.layout.list_habits_item_check, null);
TextView btCheck = (TextView) check.findViewById(R.id.tvCheck); TextView btCheck = (TextView) check.findViewById(R.id.tvCheck);
@ -567,75 +442,68 @@ public class ListHabitsFragment extends Fragment
btCheck.setOnClickListener(ListHabitsFragment.this); btCheck.setOnClickListener(ListHabitsFragment.this);
((LinearLayout) view.findViewById(R.id.llButtons)).addView(check); ((LinearLayout) view.findViewById(R.id.llButtons)).addView(check);
} }
}
view.setTag(R.id.KEY_TIMESTAMP, DateHelper.getStartOfToday());
} }
TextView tvStar = (TextView) view.findViewById(R.id.tvStar); private void updateCheckmarkButtons(Habit habit, LinearLayout llButtons)
TextView tvName = (TextView) view.findViewById(R.id.tvName); {
int activeColor = getActiveColor(habit);
if (habit == null) int m = llButtons.getChildCount();
int isChecked[] = loader.checkmarks.get(habit.getId());
for (int i = 0; i < m; i++)
{ {
tvName.setText(null);
return view;
}
LinearLayout llInner = (LinearLayout) view.findViewById(R.id.llInner); TextView tvCheck = (TextView) llButtons.getChildAt(i);
llInner.setTag(R.string.habit_key, habit.getId()); tvCheck.setTag(R.string.habit_key, habit.getId());
tvCheck.setTag(R.string.offset_key, i);
updateCheckmark(activeColor, tvCheck, isChecked[i]);
}
}
int activeColor = habit.color; private void updateNameAndIcon(Habit habit, TextView tvStar, TextView tvName)
{
int activeColor = getActiveColor(habit);
tvName.setText(habit.name); tvName.setText(habit.name);
tvName.setTextColor(activeColor); tvName.setTextColor(activeColor);
if (habit.isArchived()) if (habit.isArchived())
{ {
activeColor = ColorHelper.palette[12]; tvStar.setText(getString(R.string.fa_archive));
tvName.setTextColor(activeColor);
tvStar.setText(context.getString(R.string.fa_archive));
tvStar.setTextColor(activeColor); tvStar.setTextColor(activeColor);
} }
else else
{ {
int score = scores.get(habit.getId()); int score = loader.scores.get(habit.getId());
if (score < Habit.HALF_STAR_CUTOFF) if (score < Habit.HALF_STAR_CUTOFF)
{ {
tvStar.setText(context.getString(R.string.fa_star_o)); tvStar.setText(getString(R.string.fa_star_o));
tvStar.setTextColor(INACTIVE_COLOR); tvStar.setTextColor(INACTIVE_COLOR);
} }
else if (score < Habit.FULL_STAR_CUTOFF) else if (score < Habit.FULL_STAR_CUTOFF)
{ {
tvStar.setText(context.getString(R.string.fa_star_half_o)); tvStar.setText(getString(R.string.fa_star_half_o));
tvStar.setTextColor(INACTIVE_COLOR); tvStar.setTextColor(INACTIVE_COLOR);
} }
else else
{ {
tvStar.setText(context.getString(R.string.fa_star)); tvStar.setText(getString(R.string.fa_star));
tvStar.setTextColor(activeColor); tvStar.setTextColor(activeColor);
} }
} }
LinearLayout llButtons = (LinearLayout) view.findViewById(R.id.llButtons);
int m = llButtons.getChildCount();
int isChecked[] = checkmarks.get(habit.getId());
for (int i = 0; i < m; i++)
{
TextView tvCheck = (TextView) llButtons.getChildAt(i);
tvCheck.setTag(R.string.habit_key, habit.getId());
tvCheck.setTag(R.string.offset_key, i);
updateCheck(activeColor, tvCheck, isChecked[i]);
} }
return view; private int getActiveColor(Habit habit)
} {
int activeColor = habit.color;
if(habit.isArchived()) activeColor = INACTIVE_COLOR;
return activeColor;
} }
private void updateCheck(int activeColor, TextView tvCheck, int check) private void updateCheckmark(int activeColor, TextView tvCheck, int check)
{ {
switch (check) switch (check)
{ {
@ -661,7 +529,7 @@ public class ListHabitsFragment extends Fragment
public void onPostExecuteCommand(Long refreshKey) public void onPostExecuteCommand(Long refreshKey)
{ {
if (refreshKey == null) fetchAllHabits(); if (refreshKey == null) loader.updateAllHabits();
else fetchHabit(refreshKey); else loader.updateHabit(refreshKey);
} }
} }

207
app/src/main/java/org/isoron/uhabits/loaders/HabitListLoader.java
Unescape View File

@ -0,0 +1,207 @@
/*
* Copyright (C) 2016 Alinson Santos Xavier
*
* This program 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.
*
* This program 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.loaders;
import android.os.AsyncTask;
import android.os.Handler;
import android.view.View;
import android.widget.ProgressBar;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.models.Habit;
import java.util.HashMap;
public class HabitListLoader
{
public interface Listener
{
void onLoadFinished();
}
private AsyncTask<Void, Integer, Void> currentFetchTask;
private int checkmarkCount;
private ProgressBar progressBar;
private Listener listener;
private Long lastLoadTimestamp;
public HashMap<Long, Habit> habits;
public HashMap<Integer, Habit> positionToHabit;
public HashMap<Long, int[]> checkmarks;
public HashMap<Long, Integer> scores;
public void setProgressBar(ProgressBar progressBar)
{
this.progressBar = progressBar;
}
public void setCheckmarkCount(int checkmarkCount)
{
this.checkmarkCount = checkmarkCount;
}
public void setListener(Listener listener)
{
this.listener = listener;
}
public Long getLastLoadTimestamp()
{
return lastLoadTimestamp;
}
public HabitListLoader()
{
habits = new HashMap<>();
positionToHabit = new HashMap<>();
checkmarks = new HashMap<>();
scores = new HashMap<>();
}
private void resetData()
{
habits.clear();
positionToHabit.clear();
checkmarks.clear();
scores.clear();
}
public void updateAllHabits()
{
if (currentFetchTask != null) currentFetchTask.cancel(true);
currentFetchTask = new AsyncTask<Void, Integer, Void>()
{
@Override
protected Void doInBackground(Void... params)
{
resetData();
habits = Habit.getAll();
long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
long dateFrom = dateTo - (checkmarkCount - 1) * DateHelper.millisecondsInOneDay;
int[] empty = new int[checkmarkCount];
for (Habit h : habits.values())
{
scores.put(h.getId(), 0);
positionToHabit.put(h.position, h);
checkmarks.put(h.getId(), empty);
}
int current = 0;
for (int i = 0; i < habits.size(); i++)
{
if (isCancelled()) return null;
Habit h = positionToHabit.get(i);
scores.put(h.getId(), h.getScore());
checkmarks.put(h.getId(), h.getCheckmarks(dateFrom, dateTo));
publishProgress(current++, habits.size());
}
return null;
}
@Override
protected void onPreExecute()
{
progressBar.setIndeterminate(false);
progressBar.setProgress(0);
progressBar.setVisibility(View.VISIBLE);
}
@Override
protected void onProgressUpdate(Integer... values)
{
progressBar.setMax(values[1]);
progressBar.setProgress(values[0]);
if (lastLoadTimestamp == null)
{
listener.onLoadFinished();
}
}
@Override
protected void onPostExecute(Void aVoid)
{
if (isCancelled()) return;
progressBar.setVisibility(View.INVISIBLE);
lastLoadTimestamp = DateHelper.getStartOfToday();
currentFetchTask = null;
}
};
currentFetchTask.execute();
}
public void updateHabit(final Long id)
{
new AsyncTask<Void, Void, Void>()
{
@Override
protected Void doInBackground(Void... params)
{
long dateTo = DateHelper.getStartOfDay(DateHelper.getLocalTime());
long dateFrom = dateTo - (checkmarkCount - 1) * DateHelper.millisecondsInOneDay;
Habit h = Habit.get(id);
habits.put(id, h);
scores.put(id, h.getScore());
checkmarks.put(id, h.getCheckmarks(dateFrom, dateTo));
return null;
}
@Override
protected void onPreExecute()
{
new Handler().postDelayed(new Runnable()
{
@Override
public void run()
{
if (getStatus() == Status.RUNNING)
{
progressBar.setIndeterminate(true);
progressBar.setVisibility(View.VISIBLE);
}
}
}, 500);
}
@Override
protected void onPostExecute(Void aVoid)
{
progressBar.setVisibility(View.GONE);
if(listener != null)
listener.onLoadFinished();
}
}.execute();
}
}
Write Preview
Loading…
Cancel
Save