muba-posting 6.0.9 → 6.0.11

package/Posting.js

@@ -58,8 +58,6 @@ export default class Posting extends React.Component {
       currentScreen: 1,
       fontLoaded: false,
       isLoading: false,
-      headerHeight: 0,
-      progressBarHeight: 0,
       adId: this.props.adId,
       maxPictures: 0,
       countryPhone: '',
@@ -445,17 +443,17 @@ export default class Posting extends React.Component {
         <LoadingCursor loading={this.state.isLoading} />
 
         <View style={commonStyles.flex1}>
-          <View onLayout={(event) => this.setState({ headerHeight: event.nativeEvent.layout.height })}>
+          <View>
             {!this.state.showImageBrowser && this.state.view !== Views.PAYMENT_ONLINE ? this.props.topBar : null}
           </View>
 
-          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
+          <PopupPermissions ref={(element) => this.popupPermissions = element} camera={true} mediaLibrary={true} sensor={true} message={strings('setup.permissionsMessage')} onClose={this.loadData} />
 
           {this.state.fontLoaded ?
             <View style={[this.props.containerStyle, this.state.showImageBrowser ? commonStyles.displayNone : '']}>
               <CustomScrollView ref={(element) => this.scroll = element}>
                 {this.state.view !== Views.PREVIEW && this.state.view !== Views.PAYMENT_ONLINE ?
-                  <View onLayout={(event) => this.setState({ progressBarHeight: event.nativeEvent.layout.height })}>
+                  <View>
                     {
                       this.state.adId == null ?
                         <PublishProgressBar currentScreen={this.state.currentScreen} />
@@ -477,9 +475,7 @@ export default class Posting extends React.Component {
                     fullPosting={this.state.fullPosting}
                     goToPage={(view, editingStepOne) => this._goToPage(view, editingStepOne)}
                     saveEditAd={() => this._saveEditAd()}
-                    realEstateDeveloper={this.state.realEstateDeveloper}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight} />
+                    realEstateDeveloper={this.state.realEstateDeveloper} />
                   :
                   null
                 }
@@ -497,8 +493,6 @@ export default class Posting extends React.Component {
                     hideLoading={() => this._hideLoading()}
                     hereApiKey={this.props.hereApiKey}
                     fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight}
                     businessId={this.state.businessId} />
                   :
                   null
@@ -515,8 +509,6 @@ export default class Posting extends React.Component {
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
                     fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight}
                     businessId={this.state.businessId} />
                   :
                   null
@@ -533,9 +525,7 @@ export default class Posting extends React.Component {
                     context={this.props.context}
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight} />
+                    fullPosting={this.state.fullPosting}/>
                   :
                   null
                 }
@@ -550,8 +540,6 @@ export default class Posting extends React.Component {
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
                     fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight}
                     maxPictures={this.state.maxPictures} />
                   :
                   null
@@ -567,9 +555,7 @@ export default class Posting extends React.Component {
                     context={this.props.context}
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight} />
+                    fullPosting={this.state.fullPosting} />
                   :
                   null
                 }
@@ -585,9 +571,7 @@ export default class Posting extends React.Component {
                     context={this.props.context}
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
-                    fullPosting={this.state.fullPosting}
-                    progressBarHeight={this.state.progressBarHeight}
-                    headerHeight={this.state.headerHeight} />
+                    fullPosting={this.state.fullPosting}/>
                   :
                   null
                 }
@@ -599,9 +583,7 @@ export default class Posting extends React.Component {
                     showLoading={() => this._showLoading()}
                     hideLoading={() => this._hideLoading()}
                     businessId={this.state.businessId}
-                    progressBarHeight={this.state.progressBarHeight}
                     request={this.props.request}
-                    headerHeight={this.state.headerHeight}
                     highlight={() => this._goToPage(Views.PAYMENT_ONLINE)}
                     params={this.state.params} />
                   :

package/Preview.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, TouchableOpacity, ImageBackground, Dimensions, StatusBar, Image } from 'react-native';
+import { Text, View, TouchableOpacity, ImageBackground, Image } from 'react-native';
 import DisplayPrice from 'muba-display-price'
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
@@ -7,7 +7,6 @@ import PopupSpendProduct from './PopupSpendProduct';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
-const window = Dimensions.get('window');
 
 const PAYMENT_ONLINE_ACTIVE = { method: 'GET', url: '/controller/payments-online/{countryCode}/active' };
 
@@ -26,11 +25,6 @@ export default class Preview extends React.Component {
   }
 
   componentDidMount = async () => {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight + (StatusBar.currentHeight ? StatusBar.currentHeight : 0);
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
     const paymentOnlineActive = await this.props.request(this, PAYMENT_ONLINE_ACTIVE, { regionId: this.props.postingAd.region });
     this.setState({ showPaymentOnline: paymentOnlineActive.value === 'true' });
     this.refreshData();
@@ -68,7 +62,7 @@ export default class Preview extends React.Component {
   render() {
     return (
       <View>
-        <View style={{ minHeight: this.state.minHeight }}>
+        <View style={{ flex: 1 }}>
           <View style={commonStyles.formFieldset}>
             <View style={commonStyles.confirmNote}>
               <View style={commonStyles.row}>

package/Publish1.js

@@ -1,11 +1,10 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, Dimensions } from 'react-native';
+import { Text, View, TouchableHighlight } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import RadioButtonGroup from 'muba-radio-button-group';
 import InputSelect from 'muba-input-select';
 import { Views } from './utils/Views';
-const window = Dimensions.get('window');
 
 const GET_PROMOTIONS = { method: 'GET', url: '/controller/posting/promotions' };
 const PROMOTION_LOCATION = { method: 'GET', url: '/controller/promotions/{promotionId}/location' };
@@ -49,12 +48,6 @@ export default class Publish1 extends React.Component {
     }
     this.props.hideLoading();
 
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
-
     if (this.props.realEstateDeveloper) {
       this.loadPromotions();
     }
@@ -167,7 +160,7 @@ export default class Publish1 extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.typeTransaction')}</Text>

package/Publish2.js

@@ -101,14 +101,9 @@ export default class Publish2 extends React.Component {
     this.setState({ latitude: region.latitude, longitude: region.longitude, zoom: region.zoom });
   }
 
-  onLayout = (event) => {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight + event.nativeEvent.layout.height;
-    this.setState({ mapHeight: window.height - componentsHeight })
-  }
-
   render() {
     return (
-      <View>
+      <View style={{ flex: 1 }}>
         <Map hereApiKey={this.props.hereApiKey}
           containerStyle={{ height: this.state.mapHeight }}
           showPopupPermissions={true}

package/Publish2b.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, Dimensions } from 'react-native';
+import { Text, View, TouchableHighlight } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import InputSelect from 'muba-input-select';
@@ -9,7 +9,6 @@ import { Views } from './utils/Views';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
-const window = Dimensions.get('window');
 
 const GET_REGIONS = { method: 'GET', url: '/controller/countries/{countryCode}/regions' };
 const GET_CITIES_FROM_REGION = { method: 'GET', url: '/controller/regions/{regionId}/cities' };
@@ -43,12 +42,6 @@ export default class Publish2b extends React.Component {
   }
 
   componentDidMount = () => {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
-
     this.loadData();
   }
 
@@ -253,7 +246,7 @@ export default class Publish2b extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1}}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.location')}</Text>

package/Publish3.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, Dimensions } from 'react-native';
+import { Text, View, TouchableHighlight } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import RadioButtonGroup from 'muba-radio-button-group';
@@ -7,7 +7,6 @@ import InputNumber from './shared/InputNumber.js';
 import InputSelect from 'muba-input-select';
 import InputText from 'muba-input-text';
 import { Views } from './utils/Views';
-const window = Dimensions.get('window');
 
 const GET_CURRENCIES = { method: 'GET', url: '/controller/countries/{countryCode}/currencies' };
 
@@ -73,12 +72,6 @@ export default class Publish3 extends React.Component {
 
     this.setState({ priceOptions: priceOptions });
     this.refreshData();
-
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
   }
 
   async refreshData() {
@@ -193,7 +186,7 @@ export default class Publish3 extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.propertyCharacteristics')}</Text>

package/Publish4.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, TouchableOpacity, ImageBackground, Dimensions, Image } from 'react-native';
+import { Text, View, TouchableHighlight, TouchableOpacity } from 'react-native';
 import PopupAdvice from 'muba-popup-advice';
 import PictureSelector from 'muba-picture';
 import { strings } from 'muba-i18n';
@@ -8,26 +8,16 @@ import { Views } from './utils/Views';
 import { createIconSetFromFontello } from 'react-native-vector-icons';
 import fontelloConfig from './fonts/config.json';
 const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
-const window = Dimensions.get('window');
 
 export default class Publish4 extends React.Component {
   constructor(props) {
     super(props);
 
     this.state = {
-      minHeight: 0,
       video: this.props.postingAd.video
     }
   }
 
-  componentDidMount() {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
-  }
-
   nextStep() {
     if (this.pictureSelector.onSubmitValidate()) {
       this.props.postingAd.video = this.state.video;
@@ -49,7 +39,7 @@ export default class Publish4 extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <PictureSelector
             ref={(pictureSelector) => this.pictureSelector = pictureSelector}

package/Publish5.js

@@ -1,10 +1,9 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, Image, TouchableOpacity, Dimensions } from 'react-native';
+import { Text, View, TouchableHighlight, Image, TouchableOpacity } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import InputSelect from 'muba-input-select';
 import { Views } from './utils/Views';
-const window = Dimensions.get('window');
 
 export default class Publish5 extends React.Component {
   constructor(props) {
@@ -93,12 +92,6 @@ export default class Publish5 extends React.Component {
   }
 
   componentDidMount = () => {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
-
     this.refreshData();
   }
 
@@ -170,7 +163,7 @@ export default class Publish5 extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.features')}</Text>

package/Publish6.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Text, View, TouchableHighlight, TouchableOpacity, Dimensions } from 'react-native';
+import { Text, View, TouchableHighlight, TouchableOpacity } from 'react-native';
 import { strings } from 'muba-i18n';
 import commonStyles from './commonStyles';
 import InputText from 'muba-input-text';
@@ -11,7 +11,6 @@ const FontAwesomeIcon = createIconSetFromFontello(fontelloConfig);
 
 const GENERATE_TITLE_DESCRIPTION = { method: 'GET', url: '/controller/posting/generate-title-description' };
 const PHONE_REGISTERED = { method: 'GET', url: '/controller/posting/phone-registered' };
-const window = Dimensions.get('window');
 const PHONE_SEPARATOR = '###';
 
 let submitClicked;
@@ -35,13 +34,7 @@ export default class Publish6 extends React.Component {
     this.resetSubmitClicked();
   }
 
-  componentDidMount = (prevProps) => {
-    const componentsHeight = this.props.headerHeight + this.props.progressBarHeight;
-    const minHeight = window.height - componentsHeight;
-    if (this.state.minHeight != minHeight) {
-      this.setState({ minHeight: minHeight })
-    }
-
+  componentDidMount = () => {
     this.generateTitleDescription();
     this.resetSubmitClicked();
   }
@@ -151,7 +144,7 @@ export default class Publish6 extends React.Component {
 
   render() {
     return (
-      <View style={{ minHeight: this.state.minHeight }}>
+      <View style={{ flex: 1 }}>
         <View style={commonStyles.formFieldset}>
           <View style={commonStyles.progressbarInputArea}>
             <Text style={commonStyles.progressbarInputAreaH3}>{strings('setup.checkPublication')}</Text>

package/commonStyles.js

@@ -1,7 +1,6 @@
 import { StyleSheet, Dimensions, Platform } from 'react-native';
 import { isRTL } from 'muba-i18n';
 import Constants from 'expo-constants';
-import { Fonts } from '../../app/utils/Common';
 
 const window = Dimensions.get('window');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muba-posting",
-  "version": "6.0.9",
+  "version": "6.0.11",
   "description": "Posting",
   "main": "Posting.js",
   "scripts": {