Skip to content

I
InvestCustomer
Commit 311d7b2b by Giang Tran
Options

edit ui

parent b7768815
Showing with 56 additions and 49 deletions
ios/Invest.xcodeproj/project.pbxproj
......@@ -912,7 +912,7 @@
);
INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.6;
MARKETING_VERSION = 1.7;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -940,7 +940,7 @@
DEVELOPMENT_TEAM = MXZ24GRH48;
INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.6;
MARKETING_VERSION = 1.7;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
src/Screens/Action/History/Item.js
......@@ -91,7 +91,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txt: {
fontSize: getFontXD(36),
......
src/Screens/Action/Wallet/Tab/Item.js
......@@ -81,7 +81,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Exchange/Item.js
......@@ -38,7 +38,9 @@ const Item = (props) => {
<Text numberOfLines={1} style={styles.txtTitle}>
{item.note}
</Text>
<Text style={styles.txtDate}>`${I18n.t('Date')} ${item.date}`</Text>
<Text style={styles.txtDate}>
`${I18n.t('Date')} ${item.date}`
</Text>
</Block>
</Block>
</View>
......@@ -76,7 +78,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(48),
......
src/Screens/Menu/Payments/Item.js
......@@ -89,7 +89,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txt: {
fontSize: getFontXD(36),
......
src/Screens/Menu/Rose/Item.js
......@@ -37,7 +37,9 @@ const Item = (props) => {
{item.note}
</Text>
</View>
<Text style={styles.txtDate}>`${I18n.t('Date')} ${item.date}`</Text>
<Text style={styles.txtDate}>
`${I18n.t('Date')} ${item.date}`
</Text>
</View>
<View>
<Text
......@@ -86,7 +88,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Menu/Rose/Rose.js
......@@ -13,12 +13,6 @@ const Rose = (props) => {
return (
<View style={{flex: 1}}>
<HeaderSB title={'Rose'} />
<TouchableOpacity onPress={() => props.changeLanguage('en')}>
<Text>Change</Text>
</TouchableOpacity>
<AppText i18nKey={'SetLanguage'}></AppText>
<View style={{justifyContent: 'center', alignItems: 'center', flex: 1}}>
<AppText
i18nKey={'Features_develop'}
......
src/Screens/MethodPay/Item.js
......@@ -20,9 +20,9 @@ const Item = (props) => {
<Text style={styles.txtBig}>{item.title}</Text>
<Block space={'between'} row flex={1}>
<Block>
<AppText style={styles.txtLeft} i18nKey={('OwnerAccount')}/>
<AppText style={styles.txtLeft} i18nKey={'OwnerAccount'} />
<Text style={styles.txtLeft}>STK</Text>
<AppText style={styles.txtLeft} i18nKey={('Branch')}/>
<AppText style={styles.txtLeft} i18nKey={'Branch'} />
</Block>
<Block>
<Text style={styles.txtRight}>{item.account_name}</Text>
......@@ -64,7 +64,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/MethodPay/ItemBank.js
import React from 'react';
import {View, Text, StyleSheet, TouchableOpacity, Image} from 'react-native';
import {getFontXD, HEIGHTXD, WIDTHXD, toPriceVnd, getWidth} from '../../Config/Functions';
import {
getFontXD,
HEIGHTXD,
WIDTHXD,
toPriceVnd,
getWidth,
} from '../../Config/Functions';
import R from '../../assets/R';
import Block from '../../components/Block';
import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
......@@ -10,7 +16,11 @@ const Item = (props) => {
const {item} = props;
return (
<TouchableOpacity onPress={() => props.onPress(item)}>
<View style={[styles.container, {marginBottom: props.isEndItem ? HEIGHTXD(100) : HEIGHTXD(15)}]}>
<View
style={[
styles.container,
{marginBottom: props.isEndItem ? HEIGHTXD(100) : HEIGHTXD(15)},
]}>
<Block flex={1} row center padding={[HEIGHTXD(10), WIDTHXD(10)]}>
<Image source={{uri: item.logo}} style={styles.imgIcon} />
<Block padding={[0, 10]}>
......@@ -55,7 +65,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Notification/Item.js
......@@ -59,7 +59,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Transaction/DueDate/Item.js
......@@ -22,7 +22,6 @@ const Item = (props) => {
<View style={styles.container}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<View style={styles.wrapLeft} />
<View style={styles.wrapDate}>
<Image source={R.images.iconRecharge} style={styles.imgIcon} />
</View>
......@@ -74,7 +73,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Transaction/Escrow/Item.js
......@@ -72,7 +72,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Transaction/PriceList/Item.js
......@@ -72,7 +72,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/Screens/Transaction/TimeTransaction/Item.js
......@@ -22,7 +22,6 @@ const Item = (props) => {
<View style={styles.container}>
<TouchableOpacity onPress={() => props.onPress(item)}>
<Block flex={1} row>
<View style={styles.wrapLeft} />
<View style={styles.wrapDate}>
<Image source={R.images.iconRecharge} style={styles.imgIcon} />
</View>
......@@ -74,7 +73,7 @@ const styles = StyleSheet.create({
},
wrapDate: {
justifyContent: 'center',
paddingHorizontal: 10,
paddingLeft: 10,
},
txtTitle: {
fontSize: getFontXD(42),
......
src/components/Header/Drawer.js
......@@ -106,6 +106,14 @@ const menus = [
icon: R.images.iconHistoryMenu,
screen: HISTORY,
},
{
id: '65',
title: 'PaymentSetting',
icon: R.images.iconMethodPay,
screen: METHODPAY,
active: false,
children: null,
},
],
},
{
......@@ -137,14 +145,6 @@ const menus = [
},
{
id: '2',
title: 'PaymentSetting',
icon: R.images.iconMethodPay,
screen: METHODPAY,
active: false,
children: null,
},
{
id: '5',
title: 'Setting',
icon: R.images.iconSetting,
......
src/components/Header/HeaderHome.js
......@@ -196,7 +196,6 @@ const HeaderHome = (props) => {
/>
</TouchableOpacity>
</View>
{renderLabel(props.user.status)}
</View>
</View>
......@@ -252,7 +251,7 @@ export default connect(mapStateToProps, {})(HeaderHome);
const styles = StyleSheet.create({
container: {},
wrapWallet: {
height: 80,
height: 70,
width: '100%',
borderBottomWidth: 1,
borderBottomColor: '#EDEDF1',
......@@ -266,7 +265,6 @@ const styles = StyleSheet.create({
},
containerTop: {
backgroundColor: 'white',
height: 290,
width: '90%',
borderRadius: 10,
shadowColor: '#000',
......@@ -296,8 +294,8 @@ const styles = StyleSheet.create({
resizeMode: 'contain',
},
imgIconCopy: {
width: WIDTHXD(134),
height: HEIGHTXD(134),
width: WIDTHXD(100),
height: HEIGHTXD(100),
resizeMode: 'contain',
},
......@@ -319,9 +317,9 @@ const styles = StyleSheet.create({
color: '#A2A2A2',
},
imgAvatar: {
width: WIDTHXD(240),
height: WIDTHXD(240),
borderRadius: WIDTHXD(120),
width: WIDTHXD(180),
height: WIDTHXD(180),
borderRadius: WIDTHXD(90),
},
txtMoney: {
fontSize: getFontXD(62),
......@@ -338,7 +336,7 @@ const styles = StyleSheet.create({
},
wrapRight: {
flex: 1,
paddingHorizontal: 20,
paddingLeft: 10,
},
containerInfor: {
flex: 1,
......@@ -348,6 +346,8 @@ const styles = StyleSheet.create({
borderBottomColor: '#EDEDF1',
flexDirection: 'row',
paddingHorizontal: 20,
paddingVertical: 10,
},
row: {
flexDirection: 'row',
......@@ -358,6 +358,7 @@ const styles = StyleSheet.create({
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
marginTop: 5,
},
containerWallet: {
justifyContent: 'center',
......
src/helper/i18/locales/en.js
......@@ -31,7 +31,7 @@ export default {
RevenueDonors: 'Revenue donors',
Invset: 'Invest',
Contract: 'Contract',
PaymentSetting: 'Payment method setting',
PaymentSetting: 'Method setting',
CustomerCare: 'Customer care',
Feedback: 'Feedback',
LegalDocument: 'Legal document',
......
src/helper/i18/locales/vn.js
......@@ -34,7 +34,7 @@ export default {
RevenueDonors: 'Doanh thu nhà tài trợ',
Invset: 'Đầu tư',
Contract: 'Hợp đồng',
PaymentSetting: 'Cài đặt phương thức thanh toán',
PaymentSetting: 'Phương thức thanh toán',
CustomerCare: 'Chăm sóc khách hàng',
Feedback: 'Phản hồi',
LegalDocument: 'Giấy tờ pháp lý',
......
src/routers/TabNavigation.js
......@@ -42,10 +42,10 @@ const TabNavigator = (props) => {
const checkDeepking = () => {
Linking.getInitialURL().then((url) => {
deeplinkScreen(url);
if (url) deeplinkScreen(url);
});
Linking.addEventListener('url', (url) => {
handleOpenURL(url);
if (url) handleOpenURL(url);
});
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment