diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java index fe475d9..013e1d7 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/activities/MainActivity.java @@ -174,7 +174,6 @@ public class MainActivity extends AppCompatActivity implements @Override public void onNewTaskDialogNeutralClick(DialogFragment dialog) { - // TODO: add confirm dialog SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); String title = getResources().getString(R.string.task_confirmation_delete_text); boolean showDialog = sharedPref.getBoolean("pref_conf_del", true); @@ -248,7 +247,6 @@ public class MainActivity extends AppCompatActivity implements case ItemTouchHelper.RIGHT: editor.putBoolean("pref_conf_next", false); break; - // TODO: add delete action case -1: editor.putBoolean("pref_conf_del", false); break; @@ -292,7 +290,6 @@ public class MainActivity extends AppCompatActivity implements task.setCycle(task.getCycle() + 1); taskAdapter.add(task, taskAdapter.getItemCount()); break; - // TODO: add delete action case -1: action = "deleted"; taskAdapter.remove(itemPosition); @@ -315,7 +312,6 @@ public class MainActivity extends AppCompatActivity implements taskAdapter.remove(taskAdapter.getItemCount() - 1); task.setCycle(task.getCycle() - 1); break; - // TODO: add delete action // Nothing special to do for delete case -1: break; @@ -344,7 +340,6 @@ public class MainActivity extends AppCompatActivity implements case ItemTouchHelper.RIGHT: taskDataAccess.increaseCycle(task.getCycle(), itemId); break; - // TODO: add delete action case -1: // Commit the changes to DB taskDataAccess.deleteTask(itemId); diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskAdapter.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskAdapter.java index ae62151..7b589fa 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskAdapter.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/adapters/TaskAdapter.java @@ -45,6 +45,10 @@ public class TaskAdapter extends RecyclerView.Adapter { holder.mDescriptionView.setText(holder.mItem.getDescription()); int priority = holder.mItem.getPriority(); + // Reset task rendering + holder.mTitleView.setTypeface(Typeface.DEFAULT); + holder.mTitleView.setTextColor(Color.BLACK); + switch (priority) { case 0: diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java index f784b6c..f887d2d 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java @@ -128,7 +128,7 @@ public class TasksFragment extends Fragment { // Set priority int priority = 1; if (titleTextView.getCurrentTextColor() == Color.LTGRAY) priority = 0; - if (titleTextView.getTypeface().isBold()) priority = 2; + else if (titleTextView.getTypeface().isBold()) priority = 2; args.putInt("priority", priority); taskDialogFragment.setArguments(args);