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

add improved support for image display and browsing

n8fr8511ed9822ea8
diff --git a/build.gradle b/build.gradle
index e0902b6..b84a0d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,4 +60,6 @@ dependencies {
compile 'com.nanohttpd:nanohttpd-webserver:2.2.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'me.angrybyte.picker:picker:1.3.1'
+ compile 'com.github.stfalcon:frescoimageviewer:0.5.0'
+ compile 'com.facebook.fresco:fresco:1.4.0'
}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 25275e9..a104de0 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
- android:name="com.orm.SugarApp"
+ android:name=".PhoneyPotApp"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
diff --git a/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java b/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java
new file mode 100644
index 0000000..ef5fb89
--- /dev/null
+++ b/src/main/java/info/guardianproject/phoneypot/PhoneyPotApp.java
@@ -0,0 +1,18 @@
+package info.guardianproject.phoneypot;
+
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.orm.SugarApp;
+
+/**
+ * Created by n8fr8 on 8/9/17.
+ */
+
+public class PhoneyPotApp extends SugarApp {
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+
+ Fresco.initialize(this);
+ }
+}
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
index df7ab1d..d806cab 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
@@ -11,8 +11,10 @@ import android.widget.ImageView;
import android.widget.TextView;
import com.squareup.picasso.Picasso;
+import com.stfalcon.frescoimageviewer.ImageViewer;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
import info.guardianproject.phoneypot.R;
@@ -20,6 +22,8 @@ import info.guardianproject.phoneypot.model.Event;
import info.guardianproject.phoneypot.model.EventTrigger;
import nl.changer.audiowife.AudioWife;
+import static android.R.id.list;
+
/**
* Created by n8fr8 on 4/16/17.
*/
@@ -28,12 +32,22 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
Context context;
List<EventTrigger> eventTriggers;
+ ArrayList<String> eventTriggerImagePaths;
OnItemClickListener clickListener;
public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {
this.context = context;
this.eventTriggers = eventTriggers;
+
+ this.eventTriggerImagePaths = new ArrayList<String>();
+ for (EventTrigger trigger : eventTriggers)
+ {
+ if (trigger.getType() == EventTrigger.CAMERA)
+ {
+ eventTriggerImagePaths.add("file:///" + trigger.getPath());
+ }
+ }
}
@@ -64,13 +78,13 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
{
holder.image.setVisibility(View.VISIBLE);
Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);
- holder.actionShare.setVisibility(View.VISIBLE);
-
- holder.actionShare.setOnClickListener(new View.OnClickListener() {
+ holder.image.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- shareMedia(eventTrigger);
+ new ImageViewer.Builder(context, eventTriggerImagePaths)
+ .setStartPosition(0)
+ .show();
}
});
}
@@ -85,31 +99,15 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
audioWife.init(context, Uri.fromFile(new File(eventTrigger.getPath())))
.useDefaultUi(holder.extra, inflater);
- holder.actionShare.setVisibility(View.VISIBLE);
-
- holder.actionShare.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
-
- shareMedia(eventTrigger);
- }
- });
-
}
else if (eventTrigger.getType() == EventTrigger.ACCELEROMETER)
{
desc += "\nSPEED: " + eventTrigger.getPath();
- holder.actionShare.setVisibility(View.GONE);
-
- holder.actionShare.setOnClickListener(null);
}
else if (eventTrigger.getType() == EventTrigger.PRESSURE)
{
desc += "\nCHANGE IN PRESSURE: " + eventTrigger.getPath();
- holder.actionShare.setVisibility(View.GONE);
-
- holder.actionShare.setOnClickListener(null);
}
}
@@ -140,7 +138,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
TextView title, note;
ImageView image;
ViewGroup extra;
- ImageView actionShare;
public EventTriggerVH(View itemView) {
super(itemView);
@@ -149,7 +146,6 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
note = (TextView) itemView.findViewById(R.id.event_item_desc);
image = (ImageView) itemView.findViewById(R.id.event_item_image);
extra = (ViewGroup)itemView.findViewById(R.id.event_item_extra);
- actionShare = (ImageView) itemView.findViewById(R.id.event_action_share);
itemView.setOnClickListener(this);
}
diff --git a/src/main/res/layout/event_item.xml b/src/main/res/layout/event_item.xml
index 14c1c0d..b2d94ab 100644
--- a/src/main/res/layout/event_item.xml
+++ b/src/main/res/layout/event_item.xml
@@ -27,6 +27,7 @@
android:layout_height="200dp"
android:id="@+id/event_item_image"
android:visibility="gone"
+ android:scaleType="centerCrop"
/>
<LinearLayout