Skip to content

Commit 724ee27

Browse files
authored
Merge pull request #65 from fleetbase/dev-v2.0.7
v2.0.7 ~ added logo & version to navigation header
2 parents 6cd7f30 + 4932667 commit 724ee27

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fleetbase/navigator-app",
3-
"version": "2.0.6",
3+
"version": "2.0.7",
44
"license": "AGPL-3.0-or-later",
55
"author": "Fleetbase Pte Ltd <hello@fleetbase.io>",
66
"description": "Order management, geolocation tracking and navigation for Fleetbase drivers.",

src/navigation/DriverNavigator.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
faFlag,
1818
faTimes,
1919
} from '@fortawesome/free-solid-svg-icons';
20-
import { useTheme, Text, View, XStack } from 'tamagui';
20+
import { useTheme, Text, View, XStack, Image } from 'tamagui';
2121
import { navigatorConfig, get, config, toArray, getTheme } from '../utils';
2222
import { configCase } from '../utils/format';
2323
import { format } from 'date-fns';
@@ -50,6 +50,7 @@ import DriverOnlineToggle from '../components/DriverOnlineToggle';
5050
import BackButton from '../components/BackButton';
5151
import HeaderButton from '../components/HeaderButton';
5252
import Badge from '../components/Badge';
53+
import DeviceInfo from 'react-native-device-info';
5354

5455
const isAndroid = Platform.OS === 'android';
5556
const importedIconsMap = {
@@ -507,8 +508,14 @@ const DriverNavigator = createBottomTabNavigator({
507508
headerTitle: '',
508509
headerLeft: (props) => (
509510
<View pl='$3'>
510-
<Text color='$textPrimary' fontSize={20} fontWeight='bold'>
511-
Navigator
511+
<XStack alignItems='center'>
512+
<Image source={require('../../assets/navigator-icon-transparent.png')} style={{ width: 18, height: 18, marginRight: 5 }} />
513+
<Text color='$textPrimary' fontSize={20} fontWeight='bold'>
514+
Navigator
515+
</Text>
516+
</XStack>
517+
<Text color='$textSecondary' fontSize={8} ml={25}>
518+
v{DeviceInfo.getVersion()} #{DeviceInfo.getBuildNumber()}
512519
</Text>
513520
</View>
514521
),

0 commit comments

Comments
 (0)