From 46dfbb1048a157a35ce3b7d5afa51ae75b8e44cc Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Fri, 17 Apr 2020 16:42:26 +0200
Subject: [PATCH] Tried to fix image modal animation

---
 package.json                                   | 2 +-
 src/components/Home/FeedItem.js                | 1 +
 src/screens/Amicale/Clubs/ClubDisplayScreen.js | 1 +
 src/screens/FeedItemScreen.js                  | 1 +
 src/screens/HomeScreen.js                      | 3 +++
 src/screens/Planning/PlanningDisplayScreen.js  | 1 +
 6 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 728bc22..a06c340 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "react-native-calendars": "^1.260.0",
     "react-native-collapsible": "^1.5.2",
     "react-native-gesture-handler": "~1.6.0",
-    "react-native-image-modal": "^1.0.1",
+    "react-native-image-modal": "^1.0.4",
     "react-native-modalize": "^1.3.6",
     "react-native-paper": "^3.8.0",
     "react-native-reanimated": "~1.7.0",
diff --git a/src/components/Home/FeedItem.js b/src/components/Home/FeedItem.js
index bd5f0a7..1af08e2 100644
--- a/src/components/Home/FeedItem.js
+++ b/src/components/Home/FeedItem.js
@@ -74,6 +74,7 @@ class FeedItem extends React.Component<Props> {
                 {hasImage ?
                     <View style={{marginLeft: 'auto', marginRight: 'auto'}}>
                         <ImageModal
+                            isTranslucent={Platform.OS === 'android'}
                             resizeMode="contain"
                             imageBackgroundColor={"#000"}
                             style={{
diff --git a/src/screens/Amicale/Clubs/ClubDisplayScreen.js b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
index 54a2c08..93c1031 100644
--- a/src/screens/Amicale/Clubs/ClubDisplayScreen.js
+++ b/src/screens/Amicale/Clubs/ClubDisplayScreen.js
@@ -126,6 +126,7 @@ class ClubDisplayScreen extends React.Component<Props, State> {
                         marginBottom: 10,
                     }}>
                         <ImageModal
+                            isTranslucent={Platform.OS === 'android'}
                             resizeMode="contain"
                             imageBackgroundColor={this.colors.background}
                             style={{
diff --git a/src/screens/FeedItemScreen.js b/src/screens/FeedItemScreen.js
index c60c3dc..88821aa 100644
--- a/src/screens/FeedItemScreen.js
+++ b/src/screens/FeedItemScreen.js
@@ -67,6 +67,7 @@ class FeedItemScreen extends React.Component<Props> {
                 {hasImage ?
                     <View style={{marginLeft: 'auto', marginRight: 'auto'}}>
                         <ImageModal
+                            isTranslucent={Platform.OS === 'android'}
                             resizeMode="contain"
                             imageBackgroundColor={"#000"}
                             style={{
diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
index 3c89d67..3da9e43 100644
--- a/src/screens/HomeScreen.js
+++ b/src/screens/HomeScreen.js
@@ -17,6 +17,7 @@ import MaterialHeaderButtons, {Item} from "../components/Custom/HeaderButton";
 import {AnimatedValue} from "react-native-reanimated";
 import AnimatedFAB from "../components/Custom/AnimatedFAB";
 import AnimatedFocusView from "../components/Custom/AnimatedFocusView";
+import {SafeAreaView} from "react-native-safe-area-context";
 // import DATA from "../dashboard_data.json";
 
 
@@ -471,6 +472,7 @@ class HomeScreen extends React.Component<Props, State> {
     render() {
         const nav = this.props.navigation;
         return (
+            <SafeAreaView style={{flex: 1,}}>
             <AnimatedFocusView
                 {...this.props}
             >
@@ -490,6 +492,7 @@ class HomeScreen extends React.Component<Props, State> {
                     onPress={this.openScanner}
                 />
             </AnimatedFocusView>
+            </SafeAreaView>
         );
     }
 }
diff --git a/src/screens/Planning/PlanningDisplayScreen.js b/src/screens/Planning/PlanningDisplayScreen.js
index eab31bf..2824dcf 100644
--- a/src/screens/Planning/PlanningDisplayScreen.js
+++ b/src/screens/Planning/PlanningDisplayScreen.js
@@ -91,6 +91,7 @@ class PlanningDisplayScreen extends React.Component<Props, State> {
                 {this.displayData.logo !== null ?
                     <View style={{marginLeft: 'auto', marginRight: 'auto'}}>
                         <ImageModal
+                            isTranslucent={Platform.OS === 'android'}
                             resizeMode="contain"
                             imageBackgroundColor={this.colors.background}
                             style={{