diff --git a/screen/wallets/hodlHodl.js b/screen/wallets/hodlHodl.js index 5ee2febe5..403cb98fd 100644 --- a/screen/wallets/hodlHodl.js +++ b/screen/wallets/hodlHodl.js @@ -13,8 +13,9 @@ import { Platform, Image, TextInput, + ScrollView, } from 'react-native'; -import { BlueNavigationStyle, BlueLoading, BlueCard } from '../../BlueComponents'; +import { BlueNavigationStyle, BlueLoading, BlueCard, SafeBlueArea } from '../../BlueComponents'; import PropTypes from 'prop-types'; import { HodlHodlApi } from '../../class/hodl-hodl-api'; import Modal from 'react-native-modal'; @@ -26,7 +27,8 @@ const METHOD_ANY = '_any'; const styles = StyleSheet.create({ grayDropdownText: { fontSize: 17, - color: 'gray', + fontWeight: "600", + color: '#9AA0AA', }, modalContent: { backgroundColor: '#FFFFFF', @@ -47,8 +49,8 @@ const styles = StyleSheet.create({ borderTopLeftRadius: 16, borderTopRightRadius: 16, borderColor: 'rgba(0, 0, 0, 0.1)', - minHeight: 150, - height: 150, + minHeight: 200, + height: 200, }, bottomModal: { justifyContent: 'flex-end', @@ -68,11 +70,15 @@ const styles = StyleSheet.create({ }, grayDropdownTextContainer: { - backgroundColor: '#ebebeb', + backgroundColor: '#EEF0F4', borderRadius: 20, width: 100, height: 35, - top: 10, + top: 3, + paddingLeft: 2, + paddingBottom: 6, + paddingTop: 6, + paddingRight: 0, justifyContent: 'center', alignItems: 'center', flex: 0.65, @@ -80,9 +86,9 @@ const styles = StyleSheet.create({ }, grayTextContainerContainer: { - backgroundColor: '#ebebeb', + backgroundColor: '#EEF0F4', borderRadius: 20, - height: 40, + height: 44, justifyContent: 'center', alignItems: 'center', marginTop: 15, @@ -96,10 +102,11 @@ const styles = StyleSheet.create({ blueText: { color: '#2f5fb3', fontSize: 18, + fontWeight: "600", }, allOffersText: { fontSize: 12, - color: 'gray', + color: '#9AA0AA', position: 'absolute', top: 0, left: 15, @@ -109,20 +116,21 @@ const styles = StyleSheet.create({ left: 5, color: '#0c2550', fontSize: 20, - fontWeight: '100', + fontWeight: '500', }, nicknameText: { color: '#0c2550', - fontSize: 16, - fontWeight: '700', + fontSize: 18, + fontWeight: '600', }, blueTextContainer: { - backgroundColor: '#ccddf9', + backgroundColor: '#CCDDF9', borderRadius: 20, width: 110, flex: 1, flexDirection: 'row', - height: 34, + height: 36, + paddingLeft: 8, justifyContent: 'center', alignItems: 'center', right: 4, @@ -131,17 +139,17 @@ const styles = StyleSheet.create({ searchInputContainer: { flexDirection: 'row', - borderColor: '#d2d2d2', - borderBottomColor: '#d2d2d2', + borderColor: '#EEF0F4', + borderBottomColor: '#EEF0F4', borderWidth: 1.0, borderBottomWidth: 0.5, - backgroundColor: '#f5f5f5', - minHeight: 44, - height: 44, + backgroundColor: '#EEF0F4', + minHeight: 48, + height: 48, marginHorizontal: 20, alignItems: 'center', marginVertical: 8, - borderRadius: 22, + borderRadius: 26, width: '100%', }, }); @@ -424,6 +432,7 @@ export default class HodlHodl extends Component { } data={[ @@ -437,8 +446,8 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} onPress={() => this._onSidePress(item)} > - - {item.name} + + {item.name} )} @@ -471,6 +480,7 @@ export default class HodlHodl extends Component { } data={[ @@ -488,17 +498,17 @@ export default class HodlHodl extends Component { }} > - + - {item.native_name} - + {item.native_name} + {item.code === 'currency' && ( - {this.state.currency ? this.state.currency + ' >' : 'Detail >'} + {this.state.currency ? this.state.currency + ' ❯' : 'Detail ❯'} )} {item.code === 'method' && ( - + {' '} - {this.state.method ? this.getMethodName(this.state.method) + ' >' : 'Detail >'} + {this.state.method ? this.getMethodName(this.state.method) + ' ❯' : 'Detail ❯'} )} @@ -565,9 +575,10 @@ export default class HodlHodl extends Component { this.setState({ countrySearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.countrySearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ fontSize: 17, flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -583,9 +594,9 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + - + {item.native_name} @@ -640,9 +651,10 @@ export default class HodlHodl extends Component { this.setState({ currencySearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.currencySearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -658,10 +670,11 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + this.setState({ methodSearchInput: text })} placeholder={'Search..'} + placeholderTextColor="#9AA0AA" value={this.state.methodSearchInput || ''} numberOfLines={1} - style={{ flex: 1, marginHorizontal: 8, minHeight: 33 }} + style={{ flex: 1, marginHorizontal: 8, minHeight: 33, paddingLeft: 6, paddingRight: 6 }} /> @@ -741,10 +755,11 @@ export default class HodlHodl extends Component { onHideUnderlay={separators.unhighlight} > - + + + Powered by HodlHodl® @@ -778,7 +794,7 @@ export default class HodlHodl extends Component { }} > {this.state.side === HodlHodlApi.FILTERS_SIDE_VALUE_SELL ? 'Buying' : 'Selling'} - + @@ -797,29 +813,31 @@ export default class HodlHodl extends Component { this.setState({ isFiltersModalVisible: true }); }} > - Filters + Filters - + {(this.state.isLoading && ) || ( + this._refresh()} refreshing={this.state.isLoading} - style={{ height: '80%', marginTop: 10 }} + contentContainerStyle={{ flex: 1, justifyContent: 'center', paddingHorizontal: 0 }} + style={{ marginTop: 24, flex: 1 }} ItemSeparatorComponent={() => } data={this.state.offers} - ListEmptyComponent={() => No offers. Try changing country or filters!} + ListEmptyComponent={() => No offers. Try to change "Near me" to Global offers!} renderItem={({ item, index, separators }) => ( this._onPress(item)} onShowUnderlay={separators.highlight} onHideUnderlay={separators.unhighlight} > - - + + {item.trader.login} - + {item.trader.trades_count > 0 ? Math.round(item.trader.rating * 100) + '%' : 'No rating'} - {this.getItemText(item)} + {this.getItemText(item)} - {this.getItemPrice(item)} + {this.getItemPrice(item)} - + Min/Max: {item.min_amount.replace('.00', '')} - {item.max_amount.replace('.00', '')} {item.currency_code} + + )} /> + )} - + + {this.renderChooseSideModal()} @@ -873,7 +896,8 @@ export default class HodlHodl extends Component { {this.renderChooseCurrencyModal()} {this.renderChooseMethodModal()} - + + ); } }