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
Video view for video's.
percy-g2bc6aca8d7136
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex eed1151..1058a11 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -2,13 +2,17 @@ package org.havenapp.main.ui;import android.content.Context;import android.content.Intent;+import android.graphics.drawable.BitmapDrawable;+import android.media.ThumbnailUtils;import android.net.Uri;+import android.provider.MediaStore;import android.support.v7.widget.RecyclerView;import android.view.LayoutInflater;import android.view.View;import android.view.ViewGroup;import android.widget.ImageView;import android.widget.TextView;+import android.widget.VideoView;import com.github.derlio.waveform.SimpleWaveformView;import com.github.derlio.waveform.soundfile.SoundFile;@@ -67,6 +71,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteString desc = eventTrigger.getTriggerTime().toLocaleString();holder.image.setVisibility(View.GONE);+ holder.video.setVisibility(View.GONE);holder.extra.setVisibility(View.GONE);holder.sound.setVisibility(View.GONE);@@ -75,33 +80,20 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte{switch (eventTrigger.getType()) {case EventTrigger.CAMERA_VIDEO:- holder.image.setVisibility(View.VISIBLE);- Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);- holder.image.setOnClickListener(new View.OnClickListener() {+ holder.video.setVisibility(View.VISIBLE);+ BitmapDrawable bitmapD = new BitmapDrawable(context.getResources(), ThumbnailUtils.createVideoThumbnail(eventTrigger.getPath(),+ MediaStore.Video.Thumbnails.FULL_SCREEN_KIND));+ holder.video.setBackground(bitmapD);+ holder.video.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View view) {-- int startPosition = 0;- for (int i = 0; i < eventTriggerImagePaths.size(); i++) {- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {- startPosition = i;- break;- }- }--- ShareOverlayView overlayView = new ShareOverlayView(context);- ImageViewer viewer = new ImageViewer.Builder(context, eventTriggerImagePaths)- .setStartPosition(startPosition)- .setOverlayView(overlayView)- .show();- overlayView.setImageViewer(viewer);--+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(eventTrigger.getPath()));+ intent.setDataAndType(Uri.parse(eventTrigger.getPath()), "video/*");+ context.startActivity(intent);}});- holder.image.setOnLongClickListener(new View.OnLongClickListener() {+ holder.video.setOnLongClickListener(new View.OnLongClickListener() {@Overridepublic boolean onLongClick(View view) {shareMedia(eventTrigger);@@ -228,6 +220,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteclass EventTriggerVH extends RecyclerView.ViewHolder implements View.OnClickListener {TextView title, note;ImageView image;+ VideoView video;ViewGroup extra;SimpleWaveformView sound;public EventTriggerVH(View itemView) {@@ -236,6 +229,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptetitle = itemView.findViewById(R.id.event_item_title);note = itemView.findViewById(R.id.event_item_desc);image = itemView.findViewById(R.id.event_item_image);+ video = itemView.findViewById(R.id.event_item_video);extra = itemView.findViewById(R.id.event_item_extra);sound = itemView.findViewById(R.id.event_item_sound);itemView.setOnClickListener(this);diff --git a/src/main/res/layout/event_item.xml b/src/main/res/layout/event_item.xmlindex 95b5b69..ccba4c5 100644--- a/src/main/res/layout/event_item.xml+++ b/src/main/res/layout/event_item.xml@@ -30,6 +30,14 @@android:scaleType="centerCrop"/>+ <VideoView+ android:layout_width="match_parent"+ android:layout_height="200dp"+ android:id="@+id/event_item_video"+ android:visibility="gone"+ android:scaleType="centerCrop"+ />+<com.github.derlio.waveform.SimpleWaveformViewandroid:id="@+id/event_item_sound"android:layout_width="match_parent"