Skip to content

armgit / haven

Public Imported from GitHub
0

Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors

ensure Event delete and undo is working as expected

n8fr82654119f8d90
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 0a136d0..bc9bb87 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -178,30 +178,19 @@ public class ListActivity extends AppCompatActivity {
private void deleteEvent (final Event event, final int position)
{
- final Runnable runnableDelete = new Runnable ()
- {
- public void run ()
- {
- event.delete();
- }
- };
-
- handler.postDelayed(runnableDelete,3000);
+ final Runnable runnableDelete = () -> event.delete();
+ handler.postDelayed(runnableDelete,5000);
events.remove(position);
adapter.notifyItemRemoved(position);
- event.delete();
-
Snackbar.make(recyclerView, getString(R.string.event_deleted), Snackbar.LENGTH_SHORT)
- .setAction(getString(R.string.undo), new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- handler.removeCallbacks(runnableDelete);
- event.save();
- events.add(position, event);
- adapter.notifyItemInserted(position);
- }
+ .setAction(getString(R.string.undo), v -> {
+ handler.removeCallbacks(runnableDelete);
+ event.save();
+ events.add(position, event);
+ adapter.notifyItemInserted(position);
+ recyclerView.scrollToPosition(position);
})
.show();
}
@@ -343,16 +332,13 @@ public class ListActivity extends AppCompatActivity {
handler.postDelayed(runnableDelete, 3000);
Snackbar.make(recyclerView, getString(R.string.events_deleted), Snackbar.LENGTH_SHORT)
- .setAction(getString(R.string.undo), new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- handler.removeCallbacks(runnableDelete);
-
- for (Event event : removedEvents) {
- event.save();
- events.add(event);
- adapter.notifyItemInserted(events.size() - 1);
- }
+ .setAction(getString(R.string.undo), v -> {
+ handler.removeCallbacks(runnableDelete);
+
+ for (Event event : removedEvents) {
+ event.save();
+ events.add(event);
+ adapter.notifyItemInserted(events.size() - 1);
}
})
.show();