From b3222db1f7aeddea20a1d0f99fcb60f77a8fb2a2 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Wed, 26 Jul 2023 11:22:51 -0700
Subject: [PATCH] removing pan/zoom for now, conflicting with carousel swipe

---
 app/mobile/android/app/build.gradle           |  2 +-
 app/mobile/package.json                       |  1 -
 .../topicItem/imageAsset/ImageAsset.jsx       | 28 +++++++++++++++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/mobile/android/app/build.gradle b/app/mobile/android/app/build.gradle
index 18d2293f..7bb80a6a 100644
--- a/app/mobile/android/app/build.gradle
+++ b/app/mobile/android/app/build.gradle
@@ -104,7 +104,7 @@ compileOptions {
         applicationId "com.databag"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1015
+        versionCode 1018
         versionName "1.5"
     }
 
diff --git a/app/mobile/package.json b/app/mobile/package.json
index 8994871f..35196e40 100644
--- a/app/mobile/package.json
+++ b/app/mobile/package.json
@@ -27,7 +27,6 @@
     "moment": "^2.29.4",
     "react": "18.2.0",
     "react-native": "0.71.3",
-    "react-native-awesome-gallery": "^0.3.5",
     "react-native-base64": "^0.2.1",
     "react-native-create-thumbnail": "^1.6.4",
     "react-native-device-info": "^10.4.0",
diff --git a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
index 74854cfe..be3e1493 100644
--- a/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
+++ b/app/mobile/src/session/conversation/topicItem/imageAsset/ImageAsset.jsx
@@ -4,22 +4,40 @@ import { styles } from './ImageAsset.styled';
 import Colors from 'constants/Colors';
 import Ionicons from 'react-native-vector-icons/AntDesign';
 import FastImage from 'react-native-fast-image'
-import Gallery from 'react-native-awesome-gallery';
 
 export function ImageAsset({ asset, dismiss }) {
   const { state, actions } = useImageAsset(asset);
 
   return (
-    <TouchableOpacity activeOpacity={1} style={{ display: 'flex', width: '100%', height: '100%' }} onPress={actions.showControls}>
+    <TouchableOpacity style={styles.container} activeOpacity={1} onPress={actions.showControls}>
+      <FastImage source={{ uri: asset.thumb }} onLoad={actions.setRatio} 
+          style={{ ...styles.thumb, width: state.imageWidth, height: state.imageHeight }}
+          resizeMode={FastImage.resizeMode.contain} />
       { state.url && (
-        <Gallery data={[ state.url ]} onIndexChange={actions.loaded}
-            style={{ ...styles.main }} />
+        <FastImage source={{ uri: state.url }} onLoad={actions.loaded}
+            style={{ ...styles.main, width: state.imageWidth, height: state.imageHeight }}
+            resizeMode={FastImage.resizeMode.contain} />
       )}
-      { state.controls && (
+
+      { state.loaded && state.controls && (
         <TouchableOpacity style={styles.close} onPress={dismiss}>
           <Ionicons name={'close'} size={32} color={Colors.white} />
         </TouchableOpacity>
       )}
+
+      { state.failed && (
+        <TouchableOpacity style={styles.loading} onPress={dismiss}>
+          <ActivityIndicator color={Colors.alert} size="large" />
+        </TouchableOpacity>
+      )}
+      { !state.loaded && !state.failed && (
+        <TouchableOpacity style={styles.loading} onPress={dismiss}>
+          <ActivityIndicator color={Colors.white} size="large" />
+          { asset.total > 1 && (
+            <Text style={styles.decrypting}>{ asset.block } / { asset.total }</Text>
+          )}
+        </TouchableOpacity>
+      )}
     </TouchableOpacity>
   );
 }