From d42343cab331fd62c4ff5858b8ed32944d35fe88 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Mon, 15 Feb 2016 17:51:41 -0500 Subject: [PATCH] Display toast when user does not long press --- .../uhabits/dialogs/ListHabitsFragment.java | 32 ++++++++++++------- app/src/main/res/values/strings.xml | 1 + 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java index 02775a5d3..96c932a19 100644 --- a/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java +++ b/app/src/main/java/org/isoron/uhabits/dialogs/ListHabitsFragment.java @@ -260,22 +260,23 @@ public class ListHabitsFragment extends Fragment @Override public boolean onLongClick(View v) { - int id = v.getId(); - - if (id == R.id.tvCheck) + switch(v.getId()) { - lastLongClick = new Date().getTime(); - Habit habit = Habit.get((Long) v.getTag(R.string.habit_key)); - int offset = (Integer) v.getTag(R.string.offset_key); - long timestamp = DateHelper.getStartOfDay( - DateHelper.getLocalTime() - offset * DateHelper.millisecondsInOneDay); + case R.id.tvCheck: + { + lastLongClick = new Date().getTime(); + Habit habit = Habit.get((Long) v.getTag(R.string.habit_key)); + int offset = (Integer) v.getTag(R.string.offset_key); + long timestamp = DateHelper.getStartOfDay( + DateHelper.getLocalTime() - offset * DateHelper.millisecondsInOneDay); - executeCommand(habit.new ToggleRepetitionCommand(timestamp)); + executeCommand(habit.new ToggleRepetitionCommand(timestamp)); - Vibrator vb = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE); - vb.vibrate(100); + Vibrator vb = (Vibrator) getActivity().getSystemService(Context.VIBRATOR_SERVICE); + vb.vibrate(100); - return true; + return true; + } } return false; @@ -296,6 +297,12 @@ public class ListHabitsFragment extends Fragment @Override public void onClick(View v) { + switch(v.getId()) + { + case R.id.tvCheck: + activity.showToast(R.string.long_press_to_toggle); + return; + } } class ListHabitsAdapter extends BaseAdapter @@ -356,6 +363,7 @@ public class ListHabitsFragment extends Fragment TextView btCheck = (TextView) check.findViewById(R.id.tvCheck); btCheck.setTypeface(fontawesome); btCheck.setOnLongClickListener(ListHabitsFragment.this); + btCheck.setOnClickListener(ListHabitsFragment.this); ((LinearLayout) view.findViewById(R.id.llButtons)).addView(check); } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa0a25dd0..aa772b579 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,5 +62,6 @@ Save Streaks You have no active habits + Long press to check or uncheck \ No newline at end of file