Commit ffd3b088 by Giang Tran

change app name

parent 85ec6e8d
...@@ -105,7 +105,7 @@ const styles = StyleSheet.create({ ...@@ -105,7 +105,7 @@ const styles = StyleSheet.create({
backgroundColor: '#1C6AF6', backgroundColor: '#1C6AF6',
}, },
logo: { logo: {
width: 250, width: 220,
height: 80, height: 80,
resizeMode: 'contain', resizeMode: 'contain',
}, },
......
...@@ -186,6 +186,10 @@ android { ...@@ -186,6 +186,10 @@ android {
} }
} }
lintOptions {
checkReleaseBuilds false
}
} }
dependencies { dependencies {
......
{
"version": 1,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.dcv.invest",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"properties": [],
"versionCode": 1,
"versionName": "1.0",
"enabled": true,
"outputFile": "app-release.apk"
}
]
}
\ No newline at end of file
<resources> <resources>
<string name="app_name">Invest</string> <string name="app_name">DCV Invest</string>
</resources> </resources>
...@@ -903,7 +903,7 @@ ...@@ -903,7 +903,7 @@
CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements; CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 23; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = MXZ24GRH48; DEVELOPMENT_TEAM = MXZ24GRH48;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
...@@ -912,7 +912,7 @@ ...@@ -912,7 +912,7 @@
); );
INFOPLIST_FILE = Invest/Info.plist; INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.5; MARKETING_VERSION = 1.6;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -936,11 +936,11 @@ ...@@ -936,11 +936,11 @@
CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements; CODE_SIGN_ENTITLEMENTS = Invest/Invest.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 23; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = MXZ24GRH48; DEVELOPMENT_TEAM = MXZ24GRH48;
INFOPLIST_FILE = Invest/Info.plist; INFOPLIST_FILE = Invest/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.5; MARKETING_VERSION = 1.6;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>Accect connect camera</string> <string>Accect connect camera</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string/> <string></string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>
<string>To upload images</string> <string>To upload images</string>
<key>UIAppFonts</key> <key>UIAppFonts</key>
......
...@@ -13,6 +13,7 @@ import {connect} from 'react-redux'; ...@@ -13,6 +13,7 @@ import {connect} from 'react-redux';
import {showLoading, hideLoading} from '../../../actions/loadingAction'; import {showLoading, hideLoading} from '../../../actions/loadingAction';
import {useNavigation} from '@react-navigation/native'; import {useNavigation} from '@react-navigation/native';
import {saveUserToRedux} from '../../../actions/users'; import {saveUserToRedux} from '../../../actions/users';
import AppText from '../../../components/AppText';
const PacketCQG = (props) => { const PacketCQG = (props) => {
const [listData, setListData] = useState([]); const [listData, setListData] = useState([]);
...@@ -117,10 +118,7 @@ const PacketCQG = (props) => { ...@@ -117,10 +118,7 @@ const PacketCQG = (props) => {
<HeaderBack title={'OpenAccountCQG'} /> <HeaderBack title={'OpenAccountCQG'} />
<ScrollView showsVerticalScrollIndicator={false}> <ScrollView showsVerticalScrollIndicator={false}>
<View style={styles.container}> <View style={styles.container}>
<Text style={styles.txtNote}> <AppText i18nKey={'Note_cqg'} />
Lưu ý:Phí được tính theo tháng và mc giá này được áp dng đến hết
ngày 30/12/2021.
</Text>
<ContainerTop fee={fee} /> <ContainerTop fee={fee} />
<WrapNomarl <WrapNomarl
......
...@@ -11,7 +11,6 @@ import { ...@@ -11,7 +11,6 @@ import {
ImageBackground, ImageBackground,
Dimensions, Dimensions,
} from 'react-native'; } from 'react-native';
import HeaderAuthen from '../../components/Header/HeaderAuthen';
import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs'; import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
import {getFontXD, HEIGHTXD} from '../../Config/Functions'; import {getFontXD, HEIGHTXD} from '../../Config/Functions';
import Login from './Login'; import Login from './Login';
...@@ -52,12 +51,12 @@ const Authen = (props) => { ...@@ -52,12 +51,12 @@ const Authen = (props) => {
<Tab.Screen <Tab.Screen
name="LOGIN" name="LOGIN"
component={Login} component={Login}
options={{tabBarLabel: I18n.t('Login')}} options={{tabBarLabel: 'Login'}}
/> />
<Tab.Screen <Tab.Screen
name="REGISTOR" name="REGISTOR"
component={Registor} component={Registor}
options={{tabBarLabel: I18n.t('Register')}} options={{tabBarLabel: 'Register'}}
/> />
</Tab.Navigator> </Tab.Navigator>
</ImageBackground> </ImageBackground>
......
...@@ -13,19 +13,22 @@ const MethodPayView = (props) => { ...@@ -13,19 +13,22 @@ const MethodPayView = (props) => {
const {isRefresh, listMethod, onRefresh} = props; const {isRefresh, listMethod, onRefresh} = props;
console.log('List', listMethod);
return ( return (
<View style={{flex: 1}}> <View style={{flex: 1}}>
<HeaderBack title={'PaymentSetting'} /> <HeaderBack title={'PaymentSetting'} />
<View style={{flex: 1}}> <View style={{flex: 1}}>
<FlatList {listMethod.length > 0 ? (
keyExtractor={(item) => item.method} <FlatList
showsVerticalScrollIndicator={false} keyExtractor={(item) => item.method}
refreshing={isRefresh} showsVerticalScrollIndicator={false}
onRefresh={onRefresh} refreshing={isRefresh}
onEndReachedThreshold={0.01} onRefresh={onRefresh}
data={listMethod} onEndReachedThreshold={0.01}
renderItem={({item}) => <Item item={item} />} data={listMethod}
/> renderItem={({item}) => <Item item={item} />}
/>
) : null}
<TouchableOpacity <TouchableOpacity
onPress={() => navigate.navigate(ADDMETHODPAY)} onPress={() => navigate.navigate(ADDMETHODPAY)}
......
...@@ -14,6 +14,7 @@ import {getFontXD} from '../../../Config/Functions'; ...@@ -14,6 +14,7 @@ import {getFontXD} from '../../../Config/Functions';
import Item from './item'; import Item from './item';
import {getListNew, getListCategoryNew} from '../../../apis/Functions/NewFeed'; import {getListNew, getListCategoryNew} from '../../../apis/Functions/NewFeed';
import I18n from '../../../helper/i18/i18n'; import I18n from '../../../helper/i18/i18n';
import AppText from '../../../components/AppText';
const NewFeed = (props) => { const NewFeed = (props) => {
const [selected, setSelected] = useState(''); const [selected, setSelected] = useState('');
...@@ -103,10 +104,10 @@ const NewFeed = (props) => { ...@@ -103,10 +104,10 @@ const NewFeed = (props) => {
styles.item, styles.item,
selected == '' ? {backgroundColor: '#BCD7F8'} : {}, selected == '' ? {backgroundColor: '#BCD7F8'} : {},
]}> ]}>
<Text <AppText
style={[styles.txt, selected == '' ? {color: '#1C6AF6'} : {}]}> i18nKey={'All'}
Tt c style={[styles.txt, selected == '' ? {color: '#1C6AF6'} : {}]}
</Text> />
</TouchableOpacity> </TouchableOpacity>
{fillters.map((e) => ( {fillters.map((e) => (
<TouchableOpacity <TouchableOpacity
......
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
Ok: 'Ok', Ok: 'Ok',
Can_not_get_data: "Can't get data", Can_not_get_data: "Can't get data",
Search: 'Search', Search: 'Search',
NullDataSearch: "Data not found", NullDataSearch: 'Data not found',
Cancel: 'Cancel', Cancel: 'Cancel',
Close: 'Close', Close: 'Close',
...@@ -111,4 +111,6 @@ export default { ...@@ -111,4 +111,6 @@ export default {
Re_send: 'Re send', Re_send: 'Re send',
Copied: 'Copied!', Copied: 'Copied!',
Please_fill_in: 'Please fill in ', Please_fill_in: 'Please fill in ',
Note_cqg:
'Note: The fee is calculated on a monthly basis and is applied until the end of the day 30/12/2021',
}; };
...@@ -76,7 +76,9 @@ export default { ...@@ -76,7 +76,9 @@ export default {
Can_not_get_data: 'Không lấy được dữ liệu!', Can_not_get_data: 'Không lấy được dữ liệu!',
Cancel: 'Huỷ', Cancel: 'Huỷ',
Search: 'Tìm kiếm', Search: 'Tìm kiếm',
NullDataSearch: "Không tìm thấy kết quả", NullDataSearch: 'Không tìm thấy kết quả',
Note_cqg:
' Lưu ý:Phí được tính theo tháng và mức giá này được áp dụng đến hết ngày 30/12/2021.',
Close: 'Đóng', Close: 'Đóng',
No_Internet: 'Không có kết nốt Internet', No_Internet: 'Không có kết nốt Internet',
......
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