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 the display of audio waveforms

n8fr81ebeba0c9ffc
diff --git a/build.gradle b/build.gradle
index 6ee1234..0bf9a75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,4 +64,5 @@ dependencies {
compile 'me.angrybyte.picker:picker:1.3.1'
compile 'com.github.stfalcon:frescoimageviewer:0.5.0'
compile 'com.facebook.fresco:fresco:1.4.0'
+ compile 'com.github.derlio.waveform:library:1.0.3@aar'
}
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
index 6cc854b..322abaf 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
@@ -2,6 +2,8 @@ package info.guardianproject.phoneypot.ui;
import android.content.Context;
import android.content.Intent;
+import android.media.MediaPlayer;
+import android.media.RemoteControlClient;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -10,6 +12,8 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+import com.github.derlio.waveform.SimpleWaveformView;
+import com.github.derlio.waveform.soundfile.SoundFile;
import com.squareup.picasso.Picasso;
import com.stfalcon.frescoimageviewer.ImageViewer;
@@ -23,6 +27,7 @@ import info.guardianproject.phoneypot.model.EventTrigger;
import nl.changer.audiowife.AudioWife;
import static android.R.id.list;
+import static android.content.ContentValues.TAG;
/**
* Created by n8fr8 on 4/16/17.
@@ -69,6 +74,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
holder.image.setVisibility(View.GONE);
holder.extra.setVisibility(View.GONE);
+ holder.sound.setVisibility(View.GONE);
if (eventTrigger.getPath() != null)
@@ -115,11 +121,33 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
{
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
+ holder.sound.setVisibility(View.VISIBLE);
+ final File fileSound = new File(eventTrigger.getPath());
+ try {
+ final SoundFile soundFile = SoundFile.create(fileSound.getPath(), new SoundFile.ProgressListener() {
+ int lastProgress = 0;
+
+ @Override
+ public boolean reportProgress(double fractionComplete) {
+ final int progress = (int) (fractionComplete * 100);
+ if (lastProgress == progress) {
+ return true;
+ }
+ lastProgress = progress;
+
+ return true;
+ }
+ });
+ holder.sound.setAudioFile(soundFile);
+ holder.sound.invalidate();
+ }
+ catch (Exception e){}
+
holder.extra.setVisibility(View.VISIBLE);
holder.extra.removeAllViews();
AudioWife audioWife = new AudioWife();
- audioWife.init(context, Uri.fromFile(new File(eventTrigger.getPath())))
+ audioWife.init(context, Uri.fromFile(fileSound))
.useDefaultUi(holder.extra, inflater);
@@ -174,7 +202,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
TextView title, note;
ImageView image;
ViewGroup extra;
-
+ SimpleWaveformView sound;
public EventTriggerVH(View itemView) {
super(itemView);
@@ -182,7 +210,7 @@ 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);
-
+ sound = (SimpleWaveformView) 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.xml
index b2d94ab..a7810bc 100644
--- a/src/main/res/layout/event_item.xml
+++ b/src/main/res/layout/event_item.xml
@@ -29,6 +29,14 @@
android:visibility="gone"
android:scaleType="centerCrop"
/>
+ <com.github.derlio.waveform.SimpleWaveformView
+ android:id="@+id/event_item_sound"
+ android:layout_width="match_parent"
+ android:layout_height="144dp"
+ app:waveformColor="@color/colorAccent"
+ app:indicatorColor="@color/colorPrimaryDark"
+ android:visibility="gone"
+ />
<LinearLayout
android:id="@+id/event_item_extra"
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index cc09a4e..5cbeda1 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -9,7 +9,6 @@
<item name="colorAccent">@color/colorAccent</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
-
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />