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

Bug fix: Set start position while showing the image viewer

Arka Prava Basu79f0e1930f8b
diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.java
index 3b5c114..8b0cd8e 100644
--- a/src/main/java/org/havenapp/main/ui/EventActivity.java
+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@ -127,7 +127,7 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdap
*/
private void onEventTriggerListFetched(@NonNull List<EventTrigger> eventTriggerList) {
this.eventTriggerList = eventTriggerList;
- setEventTriggerImagePaths(eventTriggerList);
+ setEventTriggerImagePaths();
mAdapter.setEventTriggers(eventTriggerList);
}
@@ -241,8 +241,8 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdap
}
@Override
- public void onImageClick(@NotNull EventTrigger eventTrigger) {
- int startPosition = 0;
+ public void onImageClick(@NotNull EventTrigger eventTrigger, int position) {
+ int startPosition = getPositionOfImagePath(position);
ShareOverlayView overlayView = new ShareOverlayView(this);
ImageViewer viewer = new ImageViewer.Builder<>(this, eventTriggerImagePaths)
@@ -265,7 +265,7 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdap
startActivity(shareIntent);
}
- private void setEventTriggerImagePaths(List<EventTrigger> eventTriggerList) {
+ private void setEventTriggerImagePaths() {
this.eventTriggerImagePaths = new ArrayList<>();
for (EventTrigger trigger : eventTriggerList)
{
@@ -276,4 +276,15 @@ public class EventActivity extends AppCompatActivity implements EventTriggerAdap
}
}
}
+
+ private int getPositionOfImagePath(int position) {
+ int pos = -1;
+ for (int i = 0; i <= position; i++) {
+ if (eventTriggerList.get(i).getType() == EventTrigger.CAMERA &&
+ (!TextUtils.isEmpty(eventTriggerList.get(i).getPath()))) {
+ pos++;
+ }
+ }
+ return pos;
+ }
}
diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
index db3bd40..cb58780 100644
--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java
@@ -75,7 +75,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
((VideoVH) holder).bind(eventTrigger);
break;
case EventTrigger.CAMERA:
- ((ImageVH) holder).bind(eventTrigger);
+ ((ImageVH) holder).bind(eventTrigger, position);
break;
case EventTrigger.MICROPHONE:
((AudioVH) holder).bind(eventTrigger, context);
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 34184b9..d69b79f 100644
--- a/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt
+++ b/src/main/java/org/havenapp/main/ui/viewholder/ImageVH.kt
@@ -22,7 +22,7 @@ class ImageVH(private val resourceManager: IResourceManager,
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) {
+ fun bind(eventTrigger: EventTrigger, position: Int) {
imageTitle.text = eventTrigger.getStringType(resourceManager)
imageDesc.text = eventTrigger.time?.toLocaleString() ?: ""
@@ -39,7 +39,7 @@ class ImageVH(private val resourceManager: IResourceManager,
imageView.setOnClickListener {
- listener.onImageClick(eventTrigger)
+ listener.onImageClick(eventTrigger, position)
}
imageView.setOnLongClickListener {
@@ -49,7 +49,7 @@ class ImageVH(private val resourceManager: IResourceManager,
}
interface ImageClickListener {
- fun onImageClick(eventTrigger: EventTrigger)
+ fun onImageClick(eventTrigger: EventTrigger, position: Int)
fun onImageLongClick(eventTrigger: EventTrigger)
}