From 2fb85590271476a40c3d0d6a9cc4683576ff6074 Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Mon, 26 Aug 2024 23:54:10 +0300
Subject: feature(mobile): Allow interacting with images in the app. Fixes #352

---
 apps/mobile/app.json                                 |  4 ++--
 .../components/bookmarks/BookmarkAssetImage.tsx      | 17 ++++-------------
 .../components/bookmarks/ViewBookmarkModal.tsx       | 20 +++++++++++++++++---
 apps/mobile/lib/hooks.ts                             | 13 +++++++++++++
 apps/mobile/package.json                             |  1 +
 5 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 apps/mobile/lib/hooks.ts

(limited to 'apps')

diff --git a/apps/mobile/app.json b/apps/mobile/app.json
index baf2ca6e..4a877623 100644
--- a/apps/mobile/app.json
+++ b/apps/mobile/app.json
@@ -30,7 +30,7 @@
           "NSAllowsLocalNetworking": true
         }
       },
-      "buildNumber": "8"
+      "buildNumber": "9"
     },
     "android": {
       "adaptiveIcon": {
@@ -48,7 +48,7 @@
         }
       },
       "package": "app.hoarder.hoardermobile",
-      "versionCode": 8
+      "versionCode": 9
     },
     "plugins": [
       "expo-router",
diff --git a/apps/mobile/components/bookmarks/BookmarkAssetImage.tsx b/apps/mobile/components/bookmarks/BookmarkAssetImage.tsx
index 95f963f4..8fa88c8b 100644
--- a/apps/mobile/components/bookmarks/BookmarkAssetImage.tsx
+++ b/apps/mobile/components/bookmarks/BookmarkAssetImage.tsx
@@ -1,5 +1,5 @@
 import { Image } from "react-native";
-import useAppSettings from "@/lib/settings";
+import { useAssetUrl } from "@/lib/hooks";
 
 export default function BookmarkAssetImage({
   assetId,
@@ -8,16 +8,7 @@ export default function BookmarkAssetImage({
   assetId: string;
   className: string;
 }) {
-  const { settings } = useAppSettings();
-  return (
-    <Image
-      source={{
-        uri: `${settings.address}/api/assets/${assetId}`,
-        headers: {
-          Authorization: `Bearer ${settings.apiKey}`,
-        },
-      }}
-      className={className}
-    />
-  );
+  const assetSource = useAssetUrl(assetId);
+
+  return <Image source={assetSource} className={className} />;
 }
diff --git a/apps/mobile/components/bookmarks/ViewBookmarkModal.tsx b/apps/mobile/components/bookmarks/ViewBookmarkModal.tsx
index 318249eb..6bec88af 100644
--- a/apps/mobile/components/bookmarks/ViewBookmarkModal.tsx
+++ b/apps/mobile/components/bookmarks/ViewBookmarkModal.tsx
@@ -1,5 +1,7 @@
 import React, { useState } from "react";
 import { Keyboard, Pressable, Text } from "react-native";
+import ImageView from "react-native-image-viewing";
+import { useAssetUrl } from "@/lib/hooks";
 import {
   BottomSheetBackdrop,
   BottomSheetModal,
@@ -122,15 +124,27 @@ function BookmarkTextView({ bookmark }: { bookmark: ZBookmark }) {
 }
 
 function BookmarkAssetView({ bookmark }: { bookmark: ZBookmark }) {
+  const [imageZoom, setImageZoom] = useState(false);
   if (bookmark.content.type !== BookmarkTypes.ASSET) {
     throw new Error("Wrong content type rendered");
   }
+  const assetSource = useAssetUrl(bookmark.content.assetId);
   return (
     <BottomSheetView className="flex gap-2">
-      <BookmarkAssetImage
-        assetId={bookmark.content.assetId}
-        className="h-56 min-h-56 w-full object-cover"
+      <ImageView
+        visible={imageZoom}
+        imageIndex={0}
+        onRequestClose={() => setImageZoom(false)}
+        doubleTapToZoomEnabled={true}
+        images={[assetSource]}
       />
+
+      <Pressable onPress={() => setImageZoom(true)}>
+        <BookmarkAssetImage
+          assetId={bookmark.content.assetId}
+          className="h-56 min-h-56 w-full object-cover"
+        />
+      </Pressable>
     </BottomSheetView>
   );
 }
diff --git a/apps/mobile/lib/hooks.ts b/apps/mobile/lib/hooks.ts
new file mode 100644
index 00000000..beeab391
--- /dev/null
+++ b/apps/mobile/lib/hooks.ts
@@ -0,0 +1,13 @@
+import { ImageURISource } from "react-native";
+
+import useAppSettings from "./settings";
+
+export function useAssetUrl(assetId: string): ImageURISource {
+  const { settings } = useAppSettings();
+  return {
+    uri: `${settings.address}/api/assets/${assetId}`,
+    headers: {
+      Authorization: `Bearer ${settings.apiKey}`,
+    },
+  };
+}
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index 6519692e..578dbeeb 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -44,6 +44,7 @@
     "react-native": "0.73.4",
     "react-native-awesome-slider": "^2.5.3",
     "react-native-gesture-handler": "~2.14.0",
+    "react-native-image-viewing": "^0.2.2",
     "react-native-markdown-display": "^7.0.2",
     "react-native-reanimated": "^3.8.0",
     "react-native-safe-area-context": "4.8.2",
-- 
cgit v1.2.3-70-g09d2