From f4f2ce6f73bebe5b9aba6082a22809e3ca9d8c57 Mon Sep 17 00:00:00 2001 From: geoffroy Date: Thu, 10 Dec 2015 21:01:31 -0500 Subject: [PATCH] Reset task rendering when clicked no on confirmation Add description to task list Change task title look depending on priority --- .../donext/activities/MainActivity.java | 9 ++++ .../geoffroy/donext/adapters/TaskAdapter.java | 16 ++++++++ .../fragments/ConfirmDialogFragment.java | 2 + .../app/src/main/res/layout/fragment_task.xml | 41 +++++++++++-------- DoNExt/app/src/main/res/menu/menu_main.xml | 4 +- 5 files changed, 53 insertions(+), 19 deletions(-) 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 05e64a9..e891d20 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 @@ -231,6 +231,15 @@ public class MainActivity extends AppCompatActivity implements PerformSwipe(taskDataAccess, taskAdapter, itemPosition, direction); } + @Override + public void onDialogNegativeClick(android.support.v4.app.DialogFragment dialog) { + Bundle args = dialog.getArguments(); + int itemPosition = args.getInt("ItemPosition"); + + TaskAdapter taskAdapter = ((ConfirmDialogFragment)dialog).getTaskAdapter(); + taskAdapter.notifyItemChanged(itemPosition); + } + private void OpenNewTaskDialog() { android.app.FragmentManager manager = getFragmentManager(); NewTaskFragment newTaskFragment = new NewTaskFragment(); 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 c9a969f..cd860de 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 @@ -1,5 +1,7 @@ package com.wismna.geoffroy.donext.adapters; +import android.graphics.Color; +import android.graphics.Typeface; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -41,6 +43,18 @@ public class TaskAdapter extends RecyclerView.Adapter { holder.mIdView.setText(String.valueOf(holder.mItem.getId())); holder.mCycleView.setText(String.valueOf(holder.mItem.getCycle())); holder.mTitleView.setText(holder.mItem.getName()); + holder.mDescriptionView.setText(holder.mItem.getDescription()); + int priority = holder.mItem.getPriority(); + + switch (priority) + { + case 0: + holder.mTitleView.setTextColor(Color.LTGRAY); + break; + case 2: + holder.mTitleView.setTypeface(holder.mTitleView.getTypeface(), Typeface.BOLD); + break; + } holder.mView.setOnClickListener(new View.OnClickListener() { @Override @@ -90,6 +104,7 @@ public class TaskAdapter extends RecyclerView.Adapter { public final TextView mIdView; public final TextView mCycleView; public final TextView mTitleView; + public final TextView mDescriptionView; public Task mItem; public ViewHolder(View view) { @@ -99,6 +114,7 @@ public class TaskAdapter extends RecyclerView.Adapter { mIdView = (TextView) view.findViewById(R.id.task_id); mCycleView = (TextView) view.findViewById(R.id.task_cycle); mTitleView = (TextView) view.findViewById(R.id.task_name); + mDescriptionView = (TextView) view.findViewById(R.id.task_description); } @Override diff --git a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java index e7e6beb..907a02e 100644 --- a/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java +++ b/DoNExt/app/src/main/java/com/wismna/geoffroy/donext/fragments/ConfirmDialogFragment.java @@ -14,6 +14,7 @@ public class ConfirmDialogFragment extends DialogFragment { public interface ConfirmDialogListener { void onDialogPositiveClick(DialogFragment dialog); void onDialogNeutralClick(DialogFragment dialog); + void onDialogNegativeClick(DialogFragment dialog); } private ConfirmDialogListener confirmDialogListener; @@ -63,6 +64,7 @@ public class ConfirmDialogFragment extends DialogFragment { .setNegativeButton(R.string.task_swipe_confirmation_no, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // User cancelled the dialog + confirmDialogListener.onDialogNegativeClick(ConfirmDialogFragment.this); } }).setNeutralButton(R.string.task_swipe_confirmation_never, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { diff --git a/DoNExt/app/src/main/res/layout/fragment_task.xml b/DoNExt/app/src/main/res/layout/fragment_task.xml index bb2ec99..575fabd 100644 --- a/DoNExt/app/src/main/res/layout/fragment_task.xml +++ b/DoNExt/app/src/main/res/layout/fragment_task.xml @@ -1,29 +1,36 @@ + - - - + android:layout_height="?listPreferredItemHeight" + android:orientation="vertical"> + + + diff --git a/DoNExt/app/src/main/res/menu/menu_main.xml b/DoNExt/app/src/main/res/menu/menu_main.xml index 61688df..f2d90f8 100644 --- a/DoNExt/app/src/main/res/menu/menu_main.xml +++ b/DoNExt/app/src/main/res/menu/menu_main.xml @@ -2,12 +2,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context=".activities.MainActivity"> - + app:showAsAction="never" />-->