muba-posting 4.0.4 → 4.0.7

package/Posting.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { BackHandler, Text, TouchableOpacity, View } from 'react-native';
-import { manipulateAsync } from 'expo-image-manipulator';
 import CustomScrollView from 'muba-custom-scroll-view';
 import { CommonActions } from '@react-navigation/native';
 import { loadLocaleData, currentLocale, strings } from 'muba-i18n';
@@ -54,7 +53,7 @@ export default class Posting extends React.Component {
       prevViews: [],
       currentScreen: 1,
       fontLoaded: false,
-      isLoading: true,
+      isLoading: false,
       showImageBrowser: false,
       headerHeight: 0,
       progressBarHeight: 0,
@@ -159,7 +158,7 @@ export default class Posting extends React.Component {
     ]);
     this.setState({ fontLoaded: true });
 
-    this.loadData();
+    this.popupPermissions.open();
   }
 
   refresh = () => {
@@ -182,8 +181,7 @@ export default class Posting extends React.Component {
     });
   }
 
-  loadData = async () => {
-    const canPublish = await this.popupPermissions.open();
+  loadData = async (canPublish) => {
     if (canPublish) {
       const resultJson = await this.props.request(this, GET_COUNTRY_PHONE);
       if (resultJson.success) {
@@ -205,6 +203,7 @@ export default class Posting extends React.Component {
       }
       BackHandler.addEventListener('hardwareBackPress', this.goBack);
     } else {
+      this.goBack();
       await this.setState({ isLoading: false });
     }
   }
@@ -217,7 +216,9 @@ export default class Posting extends React.Component {
         originView: this.props.adId ? Views.EDIT_SELECTOR : Views.PUBLISH_1,
         prevViews: [],
         currentScreen: 1
-      }, this.loadData);
+      }, () => {
+        this.popupPermissions.open();
+      });
     }
   }
 
@@ -338,14 +339,6 @@ export default class Posting extends React.Component {
     let i = 0;
     for (let imageObject of this.state.postingAd.images) {
       if (imageObject.photo.url) {
-        if (imageObject.photo.extension === 'heic' || imageObject.photo.extension === 'heif') {
-          const manipResult = await manipulateAsync(
-            imageObject.photo.url.uri, [], {}
-          );
-
-          imageObject.photo.url.uri = manipResult.uri;
-        }
-
         formData.append('photo' + i, {
           uri: imageObject.photo.url.uri,
           name: imageObject.photo.fileName ? imageObject.photo.fileName : 'photo_' + i + '.' + imageObject.photo.extension,
@@ -398,14 +391,19 @@ export default class Posting extends React.Component {
     }
   }
 
-  _showLoading() {
+  async _showLoading() {
     this.setState({ isLoading: true });
   }
 
-  _hideLoading() {
+  async _hideLoading() {
+    await this.sleep(500);
     this.setState({ isLoading: false });
   }
 
+  sleep = (ms) => {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
+
   _openPictureSelector() {
     this.setState({ showImageBrowser: true })
   }
@@ -414,7 +412,7 @@ export default class Posting extends React.Component {
     await this.setState({ showImageBrowser: false });
 
     for (let photo of photos) {
-      this.publish4Screen.loadImage(photo.uri);
+      this.publish4Screen.loadImage(photo);
     }
   }
 
@@ -429,7 +427,7 @@ export default class Posting extends React.Component {
   _savePicture = async (picture) => {
     await this.setState({ showImageBrowser: false })
     this.setState({ view: Views.PUBLISH_4 }, () => {
-      this.publish4Screen.loadImage(picture.uri);
+      this.publish4Screen.loadImage(picture);
     })
   }
 
@@ -447,7 +445,7 @@ export default class Posting extends React.Component {
             :
             null}
 
-          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} message={strings('setup.permissionsMessage')} goBack={this.goBack} />
+          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
 
           {this.state.fontLoaded ?
             <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>

package/Publish1.js

@@ -23,26 +23,30 @@ export default class Publish1 extends React.Component {
     };
   }
 
-  async componentDidMount() {
-    this.props.showLoading();
-    const responseJson = await this.props.request(this.props.context, GET_CATEGORIES, {
-      userEmail: this.props.postingAd.userEmail
-    });
-
-    if (responseJson.success) {
-      this.jsonCategories = responseJson.categoryList;
-      this.props.postingAd.category = this.props.postingAd.category != null ? this.props.postingAd.category : this.jsonCategories[0].value;
-      this.props.postingAd.subCategory = this.props.postingAd.subCategory != null ? this.props.postingAd.subCategory : this.jsonCategories[0].subCategoryList[0].value;
-
-      await this.setState({
-        transactionOptions: { elements: this.jsonCategories.map(jsonCategory => { return { label: jsonCategory.label, value: jsonCategory.value } }), selectedItem: this.props.postingAd.category },
-        typeBienOptions: { elements: this.getSubCategories(this.props.postingAd.category), selectedItem: this.props.postingAd.subCategory }
-      })
+  componentDidUpdate = async (prevProps) => {
+    if (!prevProps.showView && this.props.showView && !this.state.viewLoaded) {
+      this.props.showLoading();
+      this.setState({
+        viewLoaded: true
+      });
+
+      const responseJson = await this.props.request(this.props.context, GET_CATEGORIES, {
+        userEmail: this.props.postingAd.userEmail
+      });
+
+      if (responseJson.success) {
+        this.jsonCategories = responseJson.categoryList;
+        this.props.postingAd.category = this.props.postingAd.category != null ? this.props.postingAd.category : this.jsonCategories[0].value;
+        this.props.postingAd.subCategory = this.props.postingAd.subCategory != null ? this.props.postingAd.subCategory : this.jsonCategories[0].subCategoryList[0].value;
+
+        await this.setState({
+          transactionOptions: { elements: this.jsonCategories.map(jsonCategory => { return { label: jsonCategory.label, value: jsonCategory.value } }), selectedItem: this.props.postingAd.category },
+          typeBienOptions: { elements: this.getSubCategories(this.props.postingAd.category), selectedItem: this.props.postingAd.subCategory }
+        })
+      }
+      this.props.hideLoading();
     }
-    this.props.hideLoading();
-  }
 
-  componentDidUpdate = (prevProps) => {
     const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
     const minHeight = window.height - componentsHeight;
     if (this.state.minHeight != minHeight) {

package/Publish2.js

@@ -34,7 +34,6 @@ export default class Publish2 extends React.Component {
       });
     }
     if (!prevProps.showView && this.props.showView && !this.state.viewLoaded) {
-      this.props.showLoading();
       this.setState({
         viewLoaded: true
       });
@@ -54,7 +53,6 @@ export default class Publish2 extends React.Component {
   }
 
   async validateLocation() {
-    this.props.showLoading();
     let validateLocation = false;
 
     this._changeMapLocation(await this.map.getPosition());
@@ -98,8 +96,6 @@ export default class Publish2 extends React.Component {
       }
     }
 
-    this.props.hideLoading();
-
     return validateLocation;
   }
 

package/Publish4.js

@@ -3,7 +3,6 @@ import { Text, View, TouchableHighlight, TouchableOpacity, ImageBackground, Dime
 import PopupAdvice from 'muba-popup-advice';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
-import { canOpenCamera } from './utils/Common.js';
 import { Views } from './utils/Views';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
@@ -47,11 +46,13 @@ export default class Publish4 extends React.Component {
 
   async loadImage(imgUri) {
     if (imgUri) {
+      let extension = imgUri.substring(imgUri.lastIndexOf('.') + 1).toLowerCase();
+
       const image = {
         photo: {
           id: 0,
           url: { uri: imgUri },
-          extension: imgUri.substring(imgUri.lastIndexOf('.') + 1)
+          extension: extension
         }
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "4.0.4",
+  "version": "4.0.7",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {
@@ -18,7 +18,6 @@
   "homepage": "https://github.com/Mubawab/muba-posting#readme",
   "dependencies": {
     "@react-native-async-storage/async-storage": "~1.15.0",
-    "expo-image-manipulator": "~10.2.0",
     "muba-custom-scroll-view": "4",
     "muba-display-price": "4",
     "muba-font": "4",