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

improve list display of images and audio

n8fr87f70d296c7f9
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
index 8af1c44..de6ef4a 100644
--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java
+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java
@@ -71,6 +71,11 @@ public class ListActivity extends AppCompatActivity {
showOnboarding();
}
+ else
+ {
+ recyclerView.setVisibility(View.VISIBLE);
+ findViewById(R.id.empty_view).setVisibility(View.GONE);
+ }
events = Event.listAll(Event.class);
diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
index 67b828b..dacbdb6 100644
--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java
@@ -41,6 +41,8 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
public EventTriggerVH onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.event_item, parent, false);
EventTriggerVH viewHolder = new EventTriggerVH(view);
+
+
return viewHolder;
}
@@ -69,10 +71,14 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
holder.extra.setVisibility(View.VISIBLE);
+ holder.extra.removeAllViews();
+
AudioWife audioWife = new AudioWife();
audioWife.init(context, Uri.fromFile(new File(eventTrigger.getPath())))
.useDefaultUi(holder.extra, inflater);
+
+
}
else if (eventTrigger.getType() == EventTrigger.ACCELEROMETER)
{
diff --git a/src/main/res/layout/activity_list.xml b/src/main/res/layout/activity_list.xml
index 84ffa4c..1382a5c 100644
--- a/src/main/res/layout/activity_list.xml
+++ b/src/main/res/layout/activity_list.xml
@@ -46,6 +46,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<ImageView
+ android:id="@+id/empty_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/empty_prompt"
diff --git a/src/main/res/layout/event_item.xml b/src/main/res/layout/event_item.xml
index a7d39ef..7e26e9d 100644
--- a/src/main/res/layout/event_item.xml
+++ b/src/main/res/layout/event_item.xml
@@ -24,7 +24,7 @@
<ImageView
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="200dp"
android:id="@+id/event_item_image"
android:visibility="gone"
/>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c3a5f0b..d7ad68d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@
<string name="secure_service_stopped">Phoneypot Deactivated</string>
- <string name="intrusion_detected">An intrusion was detected (Type: $1%s). Capturing audio and photo evidence now.</string>
+ <string name="intrusion_detected">An intrusion was detected (Type: %s). Capturing audio and photo evidence now.</string>
<string name="title_activity_event">EventActivity</string>
<string name="action_settings">Settings</string>