Skip to content

Commit

Permalink
🗺 Added & Implemented Device Location Screen
Browse files Browse the repository at this point in the history
  • Loading branch information
aminmeshk committed Sep 13, 2020
1 parent cd674ee commit 0492f6a
Show file tree
Hide file tree
Showing 29 changed files with 311 additions and 10 deletions.
Binary file added android/app/src/main/assets/fonts/AntDesign.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Entypo.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/EvilIcons.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Feather.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Fontisto.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Foundation.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Ionicons.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Roboto.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Zocial.ttf
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'GPSLineRNDemo'
apply from: '../node_modules/react-native-unimodules/gradle.groovy'; includeUnimodulesProjects()
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
// include ':@react-native-mapbox-gl_maps'
// project(':@react-native-mapbox-gl_maps').projectDir = new File(rootProject.projectDir, '../node_modules/mapir-mapbox/android/rctmgl')
include ':app'
6 changes: 1 addition & 5 deletions components/DeviceAction.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ const DeviceAction = ({
}) => {
return (
<Card style={{ ...styles.card, ...style }}>
<TouchableNativeFeedback
style={styles.touchable}
onPress={() => {
console.log('hello' + new Date().toISOString());
}}>
<TouchableNativeFeedback style={styles.touchable} onPress={() => {}}>
<View style={styles.container}>
<View style={{ ...styles.iconContainer, backgroundColor: color }}>
{iconType ? (
Expand Down
12 changes: 10 additions & 2 deletions components/DeviceItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,19 @@ const DeviceItem = ({
onItemPress,
onMorePress,
}) => {
const mapImageUri = `https://api.neshan.org/v2/static?key=${env.neshanApiKey}&type=dreamy-gold&zoom=17&center=${lat},${lng}&width=400&height=800&marker=red`;
// const mapImageUri = `https://api.neshan.org/v2/static?key=${env.neshanApiKey}&type=dreamy-gold&zoom=17&center=${lat},${lng}&width=400&height=800&marker=red`;
const mapImageUri = `https://map.ir/static?width=700&height=1200&zoom_level=16&markers=color:skyblue|label:${name}|${lng},${lat}`;
const mapImageHeaders = {
accept: 'image/png',
'x-api-key': env.mapIrApiKey,
};

return (
<Card style={styles.card}>
<Image style={styles.image} source={{ uri: mapImageUri }} />
<Image
style={styles.image}
source={{ uri: mapImageUri, headers: mapImageHeaders }}
/>
<CardItem style={styles.cardItem}>
<Icon
style={styles.primaryText}
Expand Down
102 changes: 102 additions & 0 deletions components/LocationCard.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import { Button, Card, Icon, Text, View } from 'native-base';
import React from 'react';
import {
StyleSheet,
useWindowDimensions,
Image,
Linking,
Platform,
TouchableNativeFeedback,
} from 'react-native';
import { env } from '../constants/env';
import Colors from '../constants/Colors';

const LocationCard = ({ style, lat, lng, name }) => {
const window = useWindowDimensions();
const mapImageUri = `https://map.ir/static?width=700&height=1200&zoom_level=16&markers=color:skyblue|label:${name}|${lng},${lat}`;
const mapImageHeaders = {
accept: 'image/png',
'x-api-key': env.mapIrApiKey,
};

const openGoogleMapsHandler = () => {
const scheme = Platform.select({
ios: 'maps:0,0?q=',
android: 'geo:0,0?q=',
});
const latLng = `${lat},${lng}`;
const label = { name };
const url = Platform.select({
ios: `${scheme}${label}@${latLng}`,
android: `${scheme}${latLng}(${label})`,
});
Linking.openURL(url);
};

return (
<Card style={{ ...styles.card, ...style }}>
<TouchableNativeFeedback
onPress={openGoogleMapsHandler}
style={{ flex: 1 }}>
<Image
style={styles.image}
source={{ uri: mapImageUri, headers: mapImageHeaders }}
/>
</TouchableNativeFeedback>
<View style={styles.cardItem}>
<Text>طول جغرافیایی:</Text>
<Text style={{ writingDirection: 'ltr' }}>{lat}</Text>
</View>
<View style={styles.cardItem}>
<Text>عرض جغرافیایی:</Text>
<Text style={{ writingDirection: 'ltr' }}>{lng}</Text>
</View>
<View style={styles.cardItem}>
<Text>نمایش نقشه در گوگل:</Text>
<Icon
type="Ionicons"
name="md-open-outline"
style={styles.icon}
onPress={openGoogleMapsHandler}
/>
</View>
</Card>
);
};

const styles = StyleSheet.create({
card: {
overflow: 'hidden',
borderRadius: 10,
},
map: {
height: 800,
width: 600,
},
image: {
resizeMode: 'cover',
flex: 1,
},
cardItem: {
alignSelf: 'stretch',
flexDirection: 'row',
justifyContent: 'space-between',
alignItems: 'center',
paddingHorizontal: 16,
paddingVertical: 8,
borderBottomColor: '#ccc',
borderBottomWidth: StyleSheet.hairlineWidth,
},
button: {
paddingTop: 0,
paddingBottom: 0,
marginTop: 0,
marginBottom: 0,
},
icon: {
color: Colors.primary,
fontSize: 36,
},
});

export default LocationCard;
2 changes: 2 additions & 0 deletions constants/env.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 85 additions & 0 deletions ios/GPSLineRNDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,25 @@
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DCD954D1E0B4F2C00145EB5 /* GPSLineRNDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* GPSLineRNDemoTests.m */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
18A7FBA40F604761A7C633A8 /* AntDesign.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9947B7E878A541B2B377355C /* AntDesign.ttf */; };
4761DAE71F9F4B7FABAFE81C /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B0B26E9AFA74ED6B50B445B /* Entypo.ttf */; };
A2DF170FD8F44DD997F6BFBA /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5414AD8680914D36A5FA0157 /* EvilIcons.ttf */; };
B91A56FE360341DE9D6FB8E0 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA7BA36AAE2C4C1688AE87CB /* Feather.ttf */; };
26B572AC0CA14856912C788E /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DB7A3DF0E954A6A83BFB2AF /* FontAwesome.ttf */; };
C9E5D59A0C424A55B72F993D /* FontAwesome5_Brands.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 40FB53BD95CA43F1A2755D4E /* FontAwesome5_Brands.ttf */; };
D91F9AB76B614237B8D3D2C5 /* FontAwesome5_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C4E4374B0DB4A9BBE52990D /* FontAwesome5_Regular.ttf */; };
B6275496882245CF84419F38 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8360F250271D4246A5A251C8 /* FontAwesome5_Solid.ttf */; };
8F8BC3F073D34400AC50018E /* Fontisto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 07F908B5E7E84942A997CF28 /* Fontisto.ttf */; };
ADD93B8247BA4D03A6D0EB3B /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2F4384C5A5C44DED879AA639 /* Foundation.ttf */; };
9BA4971E371848AE84398B3E /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7BDDA4711922489280B83CDB /* Ionicons.ttf */; };
C50114F75F874B75A3402A0A /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4DF5572B84DC4612996CF989 /* MaterialCommunityIcons.ttf */; };
A4441078B16146CA8121FBB1 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9C030AA80DE94514B4A1330C /* MaterialIcons.ttf */; };
D2F6C7B58DE5494B98A84925 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3AFC3CDF838A45AA8B5452C5 /* Octicons.ttf */; };
35157843E8EB4D809F1783BF /* Roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17F183E24F684A8B86BCF8A3 /* Roboto_medium.ttf */; };
90B3BDF4F03B45E0A24D9833 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2457B1819B7A47A39E053F19 /* Roboto.ttf */; };
A39ECC952CDE4475897500AB /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C182B16D0A6B4DC697EBBE84 /* rubicon-icon-font.ttf */; };
AC79D0B7784E4558AB8B4E6F /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8299514F8A7046CC877F1EA4 /* SimpleLineIcons.ttf */; };
7645D5DDA091493E8B1421A1 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BF13FE4832794E5DBA109F09 /* Zocial.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -51,6 +70,25 @@
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = GPSLineRNDemo/LaunchScreen.storyboard; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
9947B7E878A541B2B377355C /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/native-base/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
3B0B26E9AFA74ED6B50B445B /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/native-base/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5414AD8680914D36A5FA0157 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/native-base/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
CA7BA36AAE2C4C1688AE87CB /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/native-base/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
9DB7A3DF0E954A6A83BFB2AF /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
40FB53BD95CA43F1A2755D4E /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
8C4E4374B0DB4A9BBE52990D /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
8360F250271D4246A5A251C8 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
07F908B5E7E84942A997CF28 /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/native-base/Fonts/Fontisto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
2F4384C5A5C44DED879AA639 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/native-base/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
7BDDA4711922489280B83CDB /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/native-base/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
4DF5572B84DC4612996CF989 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
9C030AA80DE94514B4A1330C /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
3AFC3CDF838A45AA8B5452C5 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/native-base/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
17F183E24F684A8B86BCF8A3 /* Roboto_medium.ttf */ = {isa = PBXFileReference; name = "Roboto_medium.ttf"; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
2457B1819B7A47A39E053F19 /* Roboto.ttf */ = {isa = PBXFileReference; name = "Roboto.ttf"; path = "../node_modules/native-base/Fonts/Roboto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
C182B16D0A6B4DC697EBBE84 /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; name = "rubicon-icon-font.ttf"; path = "../node_modules/native-base/Fonts/rubicon-icon-font.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
8299514F8A7046CC877F1EA4 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/native-base/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
BF13FE4832794E5DBA109F09 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/native-base/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -140,6 +178,7 @@
00E356EF1AD99517003FC87E /* GPSLineRNDemoTests */,
83CBBA001A601CBA00E9B192 /* Products */,
2D16E6871FA4F8E400B85C8A /* Frameworks */,
B2D0A8A48DC741E290D427C9 /* Resources */,
);
indentWidth = 2;
sourceTree = "<group>";
Expand All @@ -157,6 +196,33 @@
name = Products;
sourceTree = "<group>";
};
B2D0A8A48DC741E290D427C9 /* Resources */ = {
isa = "PBXGroup";
children = (
9947B7E878A541B2B377355C /* AntDesign.ttf */,
3B0B26E9AFA74ED6B50B445B /* Entypo.ttf */,
5414AD8680914D36A5FA0157 /* EvilIcons.ttf */,
CA7BA36AAE2C4C1688AE87CB /* Feather.ttf */,
9DB7A3DF0E954A6A83BFB2AF /* FontAwesome.ttf */,
40FB53BD95CA43F1A2755D4E /* FontAwesome5_Brands.ttf */,
8C4E4374B0DB4A9BBE52990D /* FontAwesome5_Regular.ttf */,
8360F250271D4246A5A251C8 /* FontAwesome5_Solid.ttf */,
07F908B5E7E84942A997CF28 /* Fontisto.ttf */,
2F4384C5A5C44DED879AA639 /* Foundation.ttf */,
7BDDA4711922489280B83CDB /* Ionicons.ttf */,
4DF5572B84DC4612996CF989 /* MaterialCommunityIcons.ttf */,
9C030AA80DE94514B4A1330C /* MaterialIcons.ttf */,
3AFC3CDF838A45AA8B5452C5 /* Octicons.ttf */,
17F183E24F684A8B86BCF8A3 /* Roboto_medium.ttf */,
2457B1819B7A47A39E053F19 /* Roboto.ttf */,
C182B16D0A6B4DC697EBBE84 /* rubicon-icon-font.ttf */,
8299514F8A7046CC877F1EA4 /* SimpleLineIcons.ttf */,
BF13FE4832794E5DBA109F09 /* Zocial.ttf */,
);
name = Resources;
sourceTree = "<group>";
path = "";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -295,6 +361,25 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
18A7FBA40F604761A7C633A8 /* AntDesign.ttf in Resources */,
4761DAE71F9F4B7FABAFE81C /* Entypo.ttf in Resources */,
A2DF170FD8F44DD997F6BFBA /* EvilIcons.ttf in Resources */,
B91A56FE360341DE9D6FB8E0 /* Feather.ttf in Resources */,
26B572AC0CA14856912C788E /* FontAwesome.ttf in Resources */,
C9E5D59A0C424A55B72F993D /* FontAwesome5_Brands.ttf in Resources */,
D91F9AB76B614237B8D3D2C5 /* FontAwesome5_Regular.ttf in Resources */,
B6275496882245CF84419F38 /* FontAwesome5_Solid.ttf in Resources */,
8F8BC3F073D34400AC50018E /* Fontisto.ttf in Resources */,
ADD93B8247BA4D03A6D0EB3B /* Foundation.ttf in Resources */,
9BA4971E371848AE84398B3E /* Ionicons.ttf in Resources */,
C50114F75F874B75A3402A0A /* MaterialCommunityIcons.ttf in Resources */,
A4441078B16146CA8121FBB1 /* MaterialIcons.ttf in Resources */,
D2F6C7B58DE5494B98A84925 /* Octicons.ttf in Resources */,
35157843E8EB4D809F1783BF /* Roboto_medium.ttf in Resources */,
90B3BDF4F03B45E0A24D9833 /* Roboto.ttf in Resources */,
A39ECC952CDE4475897500AB /* rubicon-icon-font.ttf in Resources */,
AC79D0B7784E4558AB8B4E6F /* SimpleLineIcons.ttf in Resources */,
7645D5DDA091493E8B1421A1 /* Zocial.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
24 changes: 23 additions & 1 deletion ios/GPSLineRNDemo/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
Expand All @@ -53,5 +53,27 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>UIAppFonts</key>
<array>
<string>AntDesign.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Fontisto.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>Octicons.ttf</string>
<string>Roboto_medium.ttf</string>
<string>Roboto.ttf</string>
<string>rubicon-icon-font.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
</array>
</dict>
</plist>
6 changes: 6 additions & 0 deletions navigation/AppNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import { NavigationContainer } from '@react-navigation/native';
import DeviceListScreen from '../screens/DeviceListScreen';
import DeviceDetailScreen from '../screens/DeviceDetailScreen';
import DeviceLocationScreen from '../screens/DeviceLocationScreen';
import { createStackNavigator } from '@react-navigation/stack';
import Colors from '../constants/Colors';

Expand Down Expand Up @@ -30,6 +31,11 @@ const AppNavigator = (props) => {
component={DeviceDetailScreen}
options={{ title: 'امکانات' }}
/>
<AppStackNavigator.Screen
name="DeviceLocation"
component={DeviceLocationScreen}
options={{ title: 'موقعیت' }}
/>
</AppStackNavigator.Navigator>
);
};
Expand Down
Loading

0 comments on commit 0492f6a

Please sign in to comment.