Skip to content

Commit 7f35d8d

Browse files
change some icons; remove unused icons
1 parent 70f9617 commit 7f35d8d

File tree

15 files changed

+57
-62
lines changed

15 files changed

+57
-62
lines changed

app/App.tsx

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
Text,
55
View,
66
AppState,
7-
Image,
87
// Appearance,
98
} from 'react-native';
109

@@ -33,6 +32,8 @@ import Toast from 'react-native-toast-message';
3332
import * as AutoLock from './wallet/autolock';
3433
import {useNavigationTheme} from './util/theme';
3534
import {useTranslation} from 'react-i18next';
35+
// @ts-ignore
36+
import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons';
3637

3738
const Tab = createBottomTabNavigator();
3839

@@ -46,14 +47,7 @@ const TabHome = () => {
4647
focused: boolean;
4748
color: string;
4849
size: number;
49-
}) => (
50-
<Image
51-
source={require('./images/network.png')}
52-
tintColor={color}
53-
width={size}
54-
height={size}
55-
/>
56-
);
50+
}) => <MCIcon name="wifi" color={color} size={size} />;
5751
const scanTabIcon = ({
5852
color,
5953
// focused,
@@ -62,14 +56,7 @@ const TabHome = () => {
6256
focused: boolean;
6357
color: string;
6458
size: number;
65-
}) => (
66-
<Image
67-
source={require('./images/scan.png')}
68-
tintColor={color}
69-
width={size}
70-
height={size}
71-
/>
72-
);
59+
}) => <MCIcon name="qrcode-scan" color={color} size={size} />;
7360
const accountTabIcon = ({
7461
color,
7562
// focused,
@@ -78,28 +65,21 @@ const TabHome = () => {
7865
focused: boolean;
7966
color: string;
8067
size: number;
81-
}) => (
82-
<Image
83-
source={require('./images/account.png')}
84-
tintColor={color}
85-
width={size}
86-
height={size}
87-
/>
88-
);
68+
}) => <MCIcon name="cog" color={color} size={size} />;
8969
return (
9070
<Tab.Navigator>
9171
<Tab.Screen
92-
name={t('home.title')}
93-
component={HomePage}
72+
name={t('find.title')}
73+
component={FindPage}
9474
options={{
95-
tabBarIcon: networkTabIcon,
75+
tabBarIcon: scanTabIcon,
9676
}}
9777
/>
9878
<Tab.Screen
99-
name={t('find.title')}
100-
component={FindPage}
79+
name={t('home.title')}
80+
component={HomePage}
10181
options={{
102-
tabBarIcon: scanTabIcon,
82+
tabBarIcon: networkTabIcon,
10383
}}
10484
/>
10585
<Tab.Screen

app/images/[email protected]

-2.61 KB
Binary file not shown.

app/images/[email protected]

-1.11 KB
Binary file not shown.

app/images/[email protected]

-2.61 KB
Binary file not shown.

app/images/[email protected]

-3.82 KB
Binary file not shown.

app/images/[email protected]

-1.34 KB
Binary file not shown.

app/images/[email protected]

-2.08 KB
Binary file not shown.

app/images/[email protected]

-2.68 KB
Binary file not shown.

app/images/[email protected]

-540 Bytes
Binary file not shown.

app/pages/Login/index.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,14 @@ import {
1313
ActivityIndicator,
1414
Image,
1515
BackHandler,
16+
Platform,
1617
} from 'react-native';
1718
import * as wallet from '../../wallet';
1819
import Routes from '../../routes/Routes';
1920
import {useTheme} from '../../util/theme';
2021
import {Trans, useTranslation} from 'react-i18next';
22+
// @ts-ignore
23+
import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons';
2124

2225
const LoginPage = ({route, navigation}: {navigation: any; route: any}) => {
2326
const walletHeader = React.useMemo(() => wallet.getWalletHeader(), []);
@@ -296,13 +299,21 @@ const LoginPage = ({route, navigation}: {navigation: any; route: any}) => {
296299
</View>
297300

298301
<View style={styles.login}>
299-
{walletHeader.useBiometrics ? (
302+
{walletHeader.useBiometrics && Platform.OS === 'ios' ? (
300303
<Image
301304
source={require('../../images/face-id.png')}
302305
style={styles.faceIdIcon}
303306
tintColor={theme.colors.placeholder}
304307
/>
305308
) : null}
309+
{walletHeader.useBiometrics && Platform.OS === 'android' ? (
310+
<MCIcon
311+
style={styles.faceIdIcon}
312+
name="fingerprint"
313+
color={theme.colors.placeholder}
314+
size={100}
315+
/>
316+
) : null}
306317
<TouchableOpacity
307318
activeOpacity={0.6}
308319
disabled={loginButtonIsDisable()}

0 commit comments

Comments
 (0)