wismna/donext
1
0
Fork 0
mirror of https://github.com/wismna/DoNext.git synced 2025-10-03 23:50:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correction of priority changes

Browse Source
This commit is contained in:
geoffroy
2015-12-26 14:32:00 -05:00
parent ea6c23ae38
commit 27884add9e
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java
View File

@@ -174,7 +174,6 @@ public class MainActivity extends AppCompatActivity implements
@Override @Override
public void onNewTaskDialogNeutralClick(DialogFragment dialog) { public void onNewTaskDialogNeutralClick(DialogFragment dialog) {
// TODO: add confirm dialog
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
String title = getResources().getString(R.string.task_confirmation_delete_text); String title = getResources().getString(R.string.task_confirmation_delete_text);
boolean showDialog = sharedPref.getBoolean("pref_conf_del", true); boolean showDialog = sharedPref.getBoolean("pref_conf_del", true);
@@ -248,7 +247,6 @@ public class MainActivity extends AppCompatActivity implements
case ItemTouchHelper.RIGHT: case ItemTouchHelper.RIGHT:
editor.putBoolean("pref_conf_next", false); editor.putBoolean("pref_conf_next", false);
break; break;
// TODO: add delete action
case -1: case -1:
editor.putBoolean("pref_conf_del", false); editor.putBoolean("pref_conf_del", false);
break; break;
@@ -292,7 +290,6 @@ public class MainActivity extends AppCompatActivity implements
task.setCycle(task.getCycle() + 1); task.setCycle(task.getCycle() + 1);
taskAdapter.add(task, taskAdapter.getItemCount()); taskAdapter.add(task, taskAdapter.getItemCount());
break; break;
// TODO: add delete action
case -1: case -1:
action = "deleted"; action = "deleted";
taskAdapter.remove(itemPosition); taskAdapter.remove(itemPosition);
@@ -315,7 +312,6 @@ public class MainActivity extends AppCompatActivity implements
taskAdapter.remove(taskAdapter.getItemCount() - 1); taskAdapter.remove(taskAdapter.getItemCount() - 1);
task.setCycle(task.getCycle() - 1); task.setCycle(task.getCycle() - 1);
break; break;
// TODO: add delete action
// Nothing special to do for delete // Nothing special to do for delete
case -1: case -1:
break; break;
@@ -344,7 +340,6 @@ public class MainActivity extends AppCompatActivity implements
case ItemTouchHelper.RIGHT: case ItemTouchHelper.RIGHT:
taskDataAccess.increaseCycle(task.getCycle(), itemId); taskDataAccess.increaseCycle(task.getCycle(), itemId);
break; break;
// TODO: add delete action
case -1: case -1:
// Commit the changes to DB // Commit the changes to DB
taskDataAccess.deleteTask(itemId); taskDataAccess.deleteTask(itemId);

4
DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskAdapter.java
View File

@@ -45,6 +45,10 @@ public class TaskAdapter extends RecyclerView.Adapter<TaskAdapter.ViewHolder> {
holder.mDescriptionView.setText(holder.mItem.getDescription()); holder.mDescriptionView.setText(holder.mItem.getDescription());
int priority = holder.mItem.getPriority(); int priority = holder.mItem.getPriority();
// Reset task rendering
holder.mTitleView.setTypeface(Typeface.DEFAULT);
holder.mTitleView.setTextColor(Color.BLACK);
switch (priority) switch (priority)
{ {
case 0: case 0:

2
DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
View File

@@ -128,7 +128,7 @@ public class TasksFragment extends Fragment {
// Set priority // Set priority
int priority = 1; int priority = 1;
if (titleTextView.getCurrentTextColor() == Color.LTGRAY) priority = 0; if (titleTextView.getCurrentTextColor() == Color.LTGRAY) priority = 0;
if (titleTextView.getTypeface().isBold()) priority = 2; else if (titleTextView.getTypeface().isBold()) priority = 2;
args.putInt("priority", priority); args.putInt("priority", priority);
taskDialogFragment.setArguments(args); taskDialogFragment.setArguments(args);