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

for #24 add ability to swipe away false trigger events

n8fr8a83c4e2dff4e
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
index 88b1144..d8906a9 100644
--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
@@ -173,7 +173,7 @@ public class ListActivity extends AppCompatActivity {
};
handler.postDelayed(runnableDelete,3000);
-
+
events.remove(position);
adapter.notifyItemRemoved(position);
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
index 8a49bb9..235f119 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventActivity.java
@@ -3,6 +3,7 @@ package info.guardianproject.phoneypot.ui;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
+import android.os.Handler;
import android.os.StrictMode;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
@@ -10,6 +11,7 @@ import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
+import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.View;
import android.widget.TextView;
@@ -25,6 +27,8 @@ public class EventActivity extends AppCompatActivity {
private RecyclerView mRecyclerView;
private Event mEvent;
+ private Handler mHandler = new Handler();
+ private EventTriggerAdapter mAdapter;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -45,11 +49,11 @@ public class EventActivity extends AppCompatActivity {
setTitle(mEvent.getStartTime().toLocaleString());
- EventTriggerAdapter adapter = new EventTriggerAdapter(this, mEvent.getEventTriggers());
+ mAdapter = new EventTriggerAdapter(this, mEvent.getEventTriggers());
LinearLayoutManager llm = new LinearLayoutManager(this);
mRecyclerView.setLayoutManager(llm);
- mRecyclerView.setAdapter(adapter);
+ mRecyclerView.setAdapter(mAdapter);
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@@ -60,12 +64,71 @@ public class EventActivity extends AppCompatActivity {
}
});
+ // Handling swipe to delete
+ ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {
+
+ @Override
+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+ return false;
+ }
+
+ @Override
+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+ //Remove swiped item from list and notify the RecyclerView
+
+ final int position = viewHolder.getAdapterPosition();
+ final EventTrigger eventTrigger = mEvent.getEventTriggers().get(viewHolder.getAdapterPosition());
+
+ deleteEventTrigger (eventTrigger, position);
+
+
+ }
+
+ };
+
+
+ ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);
+ itemTouchHelper.attachToRecyclerView(mRecyclerView);
}
else
finish();
}
+ private void deleteEventTrigger (final EventTrigger eventTrigger, final int position)
+ {
+
+ final Runnable runnableDelete = new Runnable ()
+ {
+ public void run ()
+ {
+
+ new File(eventTrigger.getPath()).delete();
+ eventTrigger.delete();
+
+ }
+ };
+
+ mHandler.postDelayed(runnableDelete,3000);
+
+ mEvent.getEventTriggers().remove(position);
+ mAdapter.notifyItemRemoved(position);
+
+ eventTrigger.delete();
+
+ Snackbar.make(mRecyclerView, "Event Trigger deleted", Snackbar.LENGTH_SHORT)
+ .setAction("UNDO", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mHandler.removeCallbacks(runnableDelete);
+ eventTrigger.save();
+ mEvent.getEventTriggers().add(position, eventTrigger);
+ mAdapter.notifyItemInserted(position);
+ }
+ })
+ .show();
+ }
+
private void shareEvent ()
{
Intent intent = new Intent(Intent.ACTION_SEND);