ordering-ui-react-native 0.15.0 → 0.15.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-react-native",
3
- "version": "0.15.0",
3
+ "version": "0.15.3",
4
4
  "description": "Reusable components made in react native",
5
5
  "main": "src/index.tsx",
6
6
  "author": "ordering.inc",
@@ -116,7 +116,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
116
116
  <FastImage
117
117
  style={{ height: 120 }}
118
118
  source={{
119
- uri: optimizeImage(business?.header, 'h_120,c_limit'),
119
+ uri: optimizeImage(business?.header, 'h_500,c_limit'),
120
120
  priority: FastImage.priority.normal,
121
121
  }}
122
122
  resizeMode={FastImage.resizeMode.cover}
@@ -145,7 +145,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
145
145
  <FastImage
146
146
  style={{ width: 56, height: 56 }}
147
147
  source={{
148
- uri: optimizeImage(business?.logo, 'h_60,c_limit'),
148
+ uri: optimizeImage(business?.logo, 'h_150,c_limit'),
149
149
  priority: FastImage.priority.normal,
150
150
  }}
151
151
  resizeMode={FastImage.resizeMode.cover}
@@ -7,6 +7,7 @@ import { useTheme } from 'styled-components/native'
7
7
  import IconAntDesign from 'react-native-vector-icons/AntDesign'
8
8
  import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
9
9
  import SelectDropdown from 'react-native-select-dropdown'
10
+ import { useSafeAreaInsets } from 'react-native-safe-area-context';
10
11
 
11
12
  const windowHeight = Dimensions.get('window').height;
12
13
 
@@ -18,6 +19,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
18
19
 
19
20
  const [, t] = useLanguage()
20
21
  const theme = useTheme()
22
+ const {top} = useSafeAreaInsets()
21
23
 
22
24
  const styles = StyleSheet.create({
23
25
  container: {
@@ -81,7 +83,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
81
83
  dropdownStyle={{
82
84
  borderRadius: 8,
83
85
  borderColor: theme.colors.lightGray,
84
- marginTop: Platform.OS === 'ios' ? 12 : -15,
86
+ marginTop: Platform.OS === 'ios' ? 12 : -top,
85
87
  maxHeight: 160
86
88
  }}
87
89
  rowStyle={{
@@ -123,4 +125,4 @@ export const BusinessMenuList = (props: any) => {
123
125
  };
124
126
 
125
127
  return <BusinessMenuListing {...businessMenuListProps} />;
126
- };
128
+ };
@@ -21,6 +21,7 @@ import {
21
21
  TimeContentWrapper,
22
22
  TimeItem
23
23
  } from './styles'
24
+ import { useSafeAreaInsets } from 'react-native-safe-area-context';
24
25
 
25
26
  const windowHeight = Dimensions.get('window').height;
26
27
 
@@ -50,7 +51,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
50
51
  const [selectDate, setSelectedDate] = useState<any>(null)
51
52
  const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
52
53
  const [isEnabled, setIsEnabled] = useState(false)
53
-
54
+ const {top} = useSafeAreaInsets()
54
55
  const styles = StyleSheet.create({
55
56
  container: {
56
57
  height: windowHeight,
@@ -333,7 +334,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
333
334
  dropdownStyle={{
334
335
  borderRadius: 8,
335
336
  borderColor: theme.colors.lightGray,
336
- marginTop: Platform.OS === 'ios' ? 12 : -15
337
+ marginTop: Platform.OS === 'ios' ? 12 : -top
337
338
  }}
338
339
  rowStyle={{
339
340
  borderBottomColor: theme.colors.backgroundGray100,
@@ -101,7 +101,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
101
101
  >
102
102
  <View style={bpStyles.catIcon}>
103
103
  <OIcon
104
- url={optimizeImage(category.image, 'h_100,c_limit')}
104
+ url={optimizeImage(category.image, 'h_250,c_limit')}
105
105
  width={41}
106
106
  height={41}
107
107
  style={{ borderRadius: 7.6 }}
@@ -237,9 +237,10 @@ const BusinessReviewsUI = (props: BusinessReviewsParams) => {
237
237
  ))}
238
238
  </>
239
239
  )}
240
- {!reviewsList.loading && reviewsList?.reviews.length === 0 && (
241
- <OText>{t('REVIEWS_NOT_FOUND', 'Reviews Not Found')}</OText>
242
- )}
240
+ {reviewsList?.reviews
241
+ .filter((review: any) => searchReview !== '' ? review.comment?.toLowerCase()?.includes(searchReview?.toLowerCase()) : true).length === 0 && (
242
+ <OText>{t('REVIEWS_NOT_FOUND', 'Reviews Not Found')}</OText>
243
+ )}
243
244
  </BusinessReviewContent>
244
245
  </BusinessReviewsContainer>
245
246
  );
@@ -1,4 +1,4 @@
1
- import React from 'react';
1
+ import React, { useEffect } from 'react';
2
2
  import {
3
3
  BusinessList as BusinessesListingController,
4
4
  useLanguage,
@@ -18,7 +18,9 @@ const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
18
18
  const {
19
19
  businessesList,
20
20
  onBusinessClick,
21
- navigation
21
+ navigation,
22
+ isLoading,
23
+ getBusinesses
22
24
  } = props;
23
25
 
24
26
  const [, t] = useLanguage()
@@ -26,6 +28,11 @@ const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
26
28
 
27
29
  const windowWidth = Dimensions.get('window').width;
28
30
 
31
+ useEffect(() => {
32
+ if (businessesList?.loading || !isLoading) return
33
+ getBusinesses(true)
34
+ }, [isLoading])
35
+
29
36
  return (
30
37
  <>
31
38
  <ListWrapper>
@@ -9,7 +9,7 @@ import IconAntDesign from 'react-native-vector-icons/AntDesign'
9
9
  import moment from 'moment';
10
10
  import { OText } from '../shared'
11
11
  import { NotFoundSource } from '../NotFoundSource'
12
- import { View, StyleSheet, TouchableOpacity } from 'react-native'
12
+ import { View, StyleSheet, TouchableOpacity, Platform } from 'react-native'
13
13
  import { Placeholder, Fade, PlaceholderLine } from "rn-placeholder";
14
14
  import FastImage from 'react-native-fast-image'
15
15
  import {
@@ -19,7 +19,6 @@ import {
19
19
  ProgressTextWrapper,
20
20
  OrderInfoWrapper
21
21
  } from './styles'
22
-
23
22
  const OrderProgressUI = (props: any) => {
24
23
  const {
25
24
  orderList,
@@ -139,7 +138,7 @@ const OrderProgressUI = (props: any) => {
139
138
  return (
140
139
  <>
141
140
  {orderList?.loading && (
142
- <Placeholder Animation={Fade} height={158}>
141
+ <Placeholder Animation={Fade} height={Platform.OS === 'ios' ? 147.5 : 158}>
143
142
  <PlaceholderLine height={60} style={{ borderRadius: 8, marginBottom: 10 }} />
144
143
  <PlaceholderLine height={20} style={{ marginBottom: 10 }} />
145
144
  <PlaceholderLine height={40} style={{ borderRadius: 8, marginBottom: 10 }} />
@@ -140,7 +140,7 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
140
140
  <FastImage
141
141
  style={styles.productStyle}
142
142
  source={{
143
- uri: optimizeImage(product?.images, 'h_75,c_limit'),
143
+ uri: optimizeImage(product?.images, 'h_250,c_limit'),
144
144
  priority: FastImage.priority.normal,
145
145
  }}
146
146
  resizeMode={FastImage.resizeMode.cover}
@@ -141,12 +141,17 @@ const ProfileListUI = (props: ProfileParams) => {
141
141
  </OText>
142
142
  <CenterView style={styles.pagePadding}>
143
143
  <View style={styles.photo}>
144
- <OIcon
145
- url={user?.photo}
146
- src={!user?.photo && theme.images.general.user}
147
- width={60}
148
- height={60}
149
- />
144
+ {user?.photo ? (
145
+ <OIcon
146
+ url={user?.photo}
147
+ cover
148
+ width={60}
149
+ height={60}
150
+ borderRadius={8}
151
+ />
152
+ ) : (
153
+ <Ionicons name='person-outline' size={50} style={{ marginRight: 10 }} />
154
+ )}
150
155
  </View>
151
156
  <View style={{ flexBasis: '70%' }}>
152
157
  <OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{user?.name} {user?.lastname}</OText>
@@ -20,6 +20,7 @@ import { CenterView } from './styles';
20
20
  import NavBar from '../NavBar';
21
21
  import { Container } from '../../layouts/Container';
22
22
  import { VerifyPhone } from '../VerifyPhone'
23
+ import Ionicons from 'react-native-vector-icons/Ionicons'
23
24
 
24
25
  const ProfileUI = (props: ProfileParams) => {
25
26
  const {
@@ -286,18 +287,23 @@ const ProfileUI = (props: ProfileParams) => {
286
287
  />
287
288
  <CenterView style={styles.pagePadding}>
288
289
  <View style={styles.photo}>
289
- <OIcon
290
- url={user?.photo}
291
- src={!user?.photo && theme.images.general.user}
292
- width={79}
293
- height={79}
294
- />
290
+ {user?.photo ? (
291
+ <OIcon
292
+ url={user?.photo}
293
+ cover
294
+ width={60}
295
+ height={60}
296
+ borderRadius={8}
297
+ />
298
+ ) : (
299
+ <Ionicons name='person-outline' size={50} />
300
+ )}
295
301
  </View>
296
302
  <OIconButton
297
303
  icon={theme.images.general.camera}
298
304
  borderColor={theme.colors.clear}
299
- iconStyle={{ width: 16, height: 16 }}
300
- style={{ maxWidth: 40, position: 'absolute', bottom: -2, alignSelf: 'center' }}
305
+ iconStyle={{ width: 20, height: 20 }}
306
+ style={{ maxWidth: 40, position: 'absolute', bottom: -2, alignSelf: 'center', backgroundColor: '#000', opacity: 0.5 }}
301
307
  onClick={() => handleImagePicker()}
302
308
  />
303
309
  </CenterView>
@@ -143,6 +143,8 @@ export interface HighestRatedBusinessesParams {
143
143
  businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
144
144
  onBusinessClick?: void;
145
145
  navigation? :any;
146
+ isLoading?: boolean;
147
+ getBusinesses: (newFetch : boolean) => void
146
148
  }
147
149
  export interface BusinessTypeFilterParams {
148
150
  businessTypes?: Array<any>;