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 index numbers to Event log and Event Triggers

Arka Prava Basu69fa543d227f
diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.java
index 827ab67..27cc45c 100644
--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java
@@ -47,6 +47,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {
String desc = event.getEventTriggerCount() + " " +
resourceManager.getString(R.string.detection_events);
+ holder.index.setText("#" + (position + 1));
holder.title.setText(title);
holder.note.setText(desc);
@@ -58,11 +59,12 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {
}
class EventVH extends RecyclerView.ViewHolder implements View.OnClickListener {
- TextView title, note;
+ TextView index, title, note;
EventVH(View itemView) {
super(itemView);
+ index = itemView.findViewById(R.id.index_number);
title = itemView.findViewById(R.id.event_item_title);
note = itemView.findViewById(R.id.event_item_desc);
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index cb58780..11ea38a 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -72,29 +72,29 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
{
switch (eventTrigger.getType()) {
case EventTrigger.CAMERA_VIDEO:
- ((VideoVH) holder).bind(eventTrigger);
+ ((VideoVH) holder).bind(eventTrigger, position);
break;
case EventTrigger.CAMERA:
((ImageVH) holder).bind(eventTrigger, position);
break;
case EventTrigger.MICROPHONE:
- ((AudioVH) holder).bind(eventTrigger, context);
+ ((AudioVH) holder).bind(eventTrigger, context, position);
break;
case EventTrigger.ACCELEROMETER:
((EventTriggerVH) holder)
- .bind(eventTrigger, resourceManager.getString(R.string.data_speed));
+ .bind(eventTrigger, resourceManager.getString(R.string.data_speed), position);
break;
case EventTrigger.LIGHT:
((EventTriggerVH) holder)
- .bind(eventTrigger, resourceManager.getString(R.string.data_light));
+ .bind(eventTrigger, resourceManager.getString(R.string.data_light), position);
break;
case EventTrigger.PRESSURE:
((EventTriggerVH) holder)
- .bind(eventTrigger, resourceManager.getString(R.string.data_pressure));
+ .bind(eventTrigger, resourceManager.getString(R.string.data_pressure), position);
break;
case EventTrigger.POWER:
((EventTriggerVH) holder)
- .bind(eventTrigger, resourceManager.getString(R.string.data_power));
+ .bind(eventTrigger, resourceManager.getString(R.string.data_power), position);
break;
}
}
diff --git a/src/main/java/org/havenapp/main/ui/viewholder/AudioVH.kt b/src/main/java/org/havenapp/main/ui/viewholder/AudioVH.kt
index 6f4feab..dea336d 100644
--- a/src/main/java/org/havenapp/main/ui/viewholder/AudioVH.kt
+++ b/src/main/java/org/havenapp/main/ui/viewholder/AudioVH.kt
@@ -22,12 +22,14 @@ class AudioVH(private val resourceManager: IResourceManager, viewGroup: ViewGrou
: RecyclerView.ViewHolder(LayoutInflater.from(viewGroup.context)
.inflate(R.layout.item_audio, viewGroup, false)) {
+ private val indexNumber = itemView.findViewById<TextView>(R.id.index_number)
private val audioTitle = itemView.findViewById<TextView>(R.id.item_audio_title)
private val audioDesc = itemView.findViewById<TextView>(R.id.item_audio_desc)
private val waveFormView = itemView.findViewById<SimpleWaveformView>(R.id.item_sound)
private val playerContainer = itemView.findViewById<LinearLayout>(R.id.item_player_container)
- fun bind(eventTrigger: EventTrigger, context: Context) {
+ fun bind(eventTrigger: EventTrigger, context: Context, position: Int) {
+ indexNumber.text = "#${position + 1}"
audioTitle.text = eventTrigger.getStringType(resourceManager)
audioDesc.text = eventTrigger.time?.toLocaleString() ?: ""
diff --git a/src/main/java/org/havenapp/main/ui/viewholder/EventTriggerVH.kt b/src/main/java/org/havenapp/main/ui/viewholder/EventTriggerVH.kt
index 9cbabf6..0a05428 100644
--- a/src/main/java/org/havenapp/main/ui/viewholder/EventTriggerVH.kt
+++ b/src/main/java/org/havenapp/main/ui/viewholder/EventTriggerVH.kt
@@ -15,10 +15,12 @@ class EventTriggerVH(private val resourceManager: IResourceManager, viewGroup: V
: RecyclerView.ViewHolder(LayoutInflater.from(viewGroup.context)
.inflate(R.layout.item_event_trigger, viewGroup, false)) {
+ private val indexNumber = itemView.findViewById<TextView>(R.id.index_number)
private val triggerTitle = itemView.findViewById<TextView>(R.id.item_trigger_title)
private val triggerDesc = itemView.findViewById<TextView>(R.id.item_trigger_desc)
- fun bind(eventTrigger: EventTrigger, string: String) {
+ fun bind(eventTrigger: EventTrigger, string: String, position: Int) {
+ indexNumber.text = "#${position + 1}"
triggerTitle.text = eventTrigger.getStringType(resourceManager)
triggerDesc.text = """${eventTrigger.time?.toLocaleString() ?: ""}\n$string: ${eventTrigger.path}"""
}
diff --git a/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt b/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt
index d69b79f..d836542 100644
--- a/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt
+++ b/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt
@@ -18,11 +18,13 @@ class ImageVH(private val resourceManager: IResourceManager,
: RecyclerView.ViewHolder(LayoutInflater.from(viewGroup.context)
.inflate(R.layout.item_photo, viewGroup, false)) {
+ private val indexNumber = itemView.findViewById<TextView>(R.id.index_number)
private val imageTitle = itemView.findViewById<TextView>(R.id.item_camera_title)
private val imageDesc = itemView.findViewById<TextView>(R.id.item_camera_desc)
private val imageView = itemView.findViewById<SimpleDraweeView>(R.id.item_camera_image)
fun bind(eventTrigger: EventTrigger, position: Int) {
+ indexNumber.text = "#${position + 1}"
imageTitle.text = eventTrigger.getStringType(resourceManager)
imageDesc.text = eventTrigger.time?.toLocaleString() ?: ""
diff --git a/src/main/java/org/havenapp/main/ui/viewholder/VideoVH.kt b/src/main/java/org/havenapp/main/ui/viewholder/VideoVH.kt
index 602ca14..689e341 100644
--- a/src/main/java/org/havenapp/main/ui/viewholder/VideoVH.kt
+++ b/src/main/java/org/havenapp/main/ui/viewholder/VideoVH.kt
@@ -21,11 +21,13 @@ class VideoVH(private val clickListener: VideoClickListener, private val context
: RecyclerView.ViewHolder(LayoutInflater.from(viewGroup.context)
.inflate(R.layout.item_video, viewGroup, false)) {
+ private val indexNumber = itemView.findViewById<TextView>(R.id.index_number)
private val title = itemView.findViewById<TextView>(R.id.item_video_title)
private val desc = itemView.findViewById<TextView>(R.id.item_video_desc)
private val videoView = itemView.findViewById<VideoView>(R.id.item_video_view)
- fun bind(eventTrigger: EventTrigger) {
+ fun bind(eventTrigger: EventTrigger, position: Int) {
+ indexNumber.text = "#${position + 1}"
title.text = eventTrigger.getStringType(resourceManager)
desc.text = eventTrigger.time?.toLocaleString() ?: ""
diff --git a/src/main/res/layout/item_audio.xml b/src/main/res/layout/item_audio.xml
index fdd304d..cab1e8f 100644
--- a/src/main/res/layout/item_audio.xml
+++ b/src/main/res/layout/item_audio.xml
@@ -15,6 +15,13 @@
android:orientation="vertical"
android:padding="@dimen/activity_margin_half">
+ <TextView
+ android:id="@+id/index_number"
+ android:textColor="#808080"
+ android:textSize="12sp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
<TextView
android:id="@+id/item_audio_title"
style="@style/TextAppearance.AppCompat.Title"
diff --git a/src/main/res/layout/item_event.xml b/src/main/res/layout/item_event.xml
index d31a4e3..a97ebf0 100644
--- a/src/main/res/layout/item_event.xml
+++ b/src/main/res/layout/item_event.xml
@@ -15,6 +15,13 @@
android:orientation="vertical"
android:padding="@dimen/activity_margin_half">
+ <TextView
+ android:id="@+id/index_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#808080"
+ android:textSize="12sp" />
+
<TextView
android:id="@+id/event_item_title"
style="@style/TextAppearance.AppCompat.Title"
@@ -26,20 +33,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin_half"
- android:paddingRight="4dp"
- android:paddingLeft="4dp">
+ android:paddingLeft="4dp"
+ android:paddingRight="4dp">
- <TextView
- android:id="@+id/event_item_desc"
- style="@style/TextAppearance.AppCompat.Body1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:alpha="0.54"
- android:ellipsize="end"
- android:maxLines="6"
- android:paddingBottom="@dimen/activity_margin_half"
- android:textColor="@android:color/black"
- tools:text="Description" />
+ <TextView
+ android:id="@+id/event_item_desc"
+ style="@style/TextAppearance.AppCompat.Body1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:alpha="0.54"
+ android:ellipsize="end"
+ android:maxLines="6"
+ android:paddingBottom="@dimen/activity_margin_half"
+ android:textColor="@android:color/black"
+ tools:text="Description" />
<ImageView
android:id="@+id/event_action_share"
@@ -47,8 +54,8 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
- android:visibility="gone"
android:tint="@android:color/black"
+ android:visibility="gone"
app:srcCompat="@drawable/ic_share" />
</RelativeLayout>
diff --git a/src/main/res/layout/item_event_trigger.xml b/src/main/res/layout/item_event_trigger.xml
index e46f309..4def30a 100644
--- a/src/main/res/layout/item_event_trigger.xml
+++ b/src/main/res/layout/item_event_trigger.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_margin="@dimen/activity_margin_half"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
@@ -14,6 +14,13 @@
android:orientation="vertical"
android:padding="@dimen/activity_margin_half">
+ <TextView
+ android:id="@+id/index_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#808080"
+ android:textSize="12sp" />
+
<TextView
android:id="@+id/item_trigger_title"
style="@style/TextAppearance.AppCompat.Title"
diff --git a/src/main/res/layout/item_photo.xml b/src/main/res/layout/item_photo.xml
index 0914fc3..e5ebf0b 100644
--- a/src/main/res/layout/item_photo.xml
+++ b/src/main/res/layout/item_photo.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_margin="@dimen/activity_margin_half"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
@@ -14,6 +14,13 @@
android:orientation="vertical"
android:padding="@dimen/activity_margin_half">
+ <TextView
+ android:id="@+id/index_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#808080"
+ android:textSize="12sp" />
+
<TextView
android:id="@+id/item_camera_title"
style="@style/TextAppearance.AppCompat.Title"
@@ -22,11 +29,10 @@
tools:text="Title" />
<com.facebook.drawee.view.SimpleDraweeView
+ android:id="@+id/item_camera_image"
android:layout_width="match_parent"
android:layout_height="200dp"
- android:id="@+id/item_camera_image"
- android:scaleType="centerCrop"
- />
+ android:scaleType="centerCrop" />
<TextView
android:id="@+id/item_camera_desc"
diff --git a/src/main/res/layout/item_video.xml b/src/main/res/layout/item_video.xml
index de6e93c..38bceb8 100644
--- a/src/main/res/layout/item_video.xml
+++ b/src/main/res/layout/item_video.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- xmlns:tools="http://schemas.android.com/tools"
android:layout_margin="@dimen/activity_margin_half"
android:background="?attr/selectableItemBackground"
android:orientation="vertical">
@@ -14,6 +14,13 @@
android:orientation="vertical"
android:padding="@dimen/activity_margin_half">
+ <TextView
+ android:id="@+id/index_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="#808080"
+ android:textSize="12sp" />
+
<TextView
android:id="@+id/item_video_title"
style="@style/TextAppearance.AppCompat.Title"
@@ -22,11 +29,10 @@
tools:text="Title" />
<VideoView
+ android:id="@+id/item_video_view"
android:layout_width="match_parent"
android:layout_height="200dp"
- android:id="@+id/item_video_view"
- android:scaleType="centerCrop"
- />
+ android:scaleType="centerCrop" />
<TextView
android:id="@+id/item_video_desc"