Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add map view #385

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add map view #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc027b3
Read the latitude and longitude from the scanner
gmarty Nov 8, 2016
fbbf65a
Add a map for virtual beacons
gmarty Nov 17, 2016
ac69790
Rework local images
gmarty Nov 24, 2016
aaec304
Replace mapbox with react-native-maps
wilsonpage Nov 29, 2016
28f95d6
Related ItemDetail styling
wilsonpage Nov 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,15 @@ android {
}

dependencies {
compile project(':react-native-maps')
compile project(':react-native-linear-gradient')
compile project(':magnet-scanner-android')
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.facebook.react:react-native:+' // From node_modules

// specify the same version as magnet-scanner-android
compile 'com.google.android.gms:play-services-analytics:9.6.1'
compile 'com.google.android.gms:play-services-analytics:9.4.0'
}

// Run this once to be able to run the application with BUCK
Expand Down
5 changes: 4 additions & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<data android:scheme="mozilla-magnet"
android:host="item" />
</intent-filter>

</activity>

<service
Expand All @@ -52,5 +51,9 @@
</receiver>

<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />

<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyAiPMYpPaqJNfEISBeZJqdQMt96cYcfruU"/>
</application>
</manifest>
2 changes: 2 additions & 0 deletions android/app/src/main/java/org/mozilla/magnet/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import com.BV.LinearGradient.LinearGradientPackage;
import com.facebook.react.ReactApplication;
import com.airbnb.android.react.maps.MapsPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
Expand All @@ -28,6 +29,7 @@ protected boolean getUseDeveloperSupport() {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new MapsPackage(),
new LinearGradientPackage(),
new MyAppPackage()
);
Expand Down
6 changes: 3 additions & 3 deletions android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
rootProject.name = 'Project Magnet'

include ':app'
include ':react-native-google-analytics-bridge'
project(':react-native-google-analytics-bridge').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-analytics-bridge/android')
include ':react-native-maps'
project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/android')
include ':react-native-linear-gradient'
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
include ':magnet-scanner-android'
project(':magnet-scanner-android').projectDir = new File(rootProject.projectDir, '../node_modules/magnet-scanner-android')
project(':magnet-scanner-android').projectDir = new File(rootProject.projectDir, '../node_modules/magnet-scanner-android')
3 changes: 2 additions & 1 deletion config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"about": "https://trymagnet.org",
"privacy": "https://trymagnet.org/privacy/",
"feedback": "https://trymagnet.org/#contact"
}
},
"mapboxAccessToken": "pk.eyJ1IjoiZ21hcnR5IiwiYSI6ImNpdm1lanB1azAwNm8yb3A0OXZ6bmUxM2oifQ.i2HycDMBdPoatAB-ONR6FQ"
},

"itemExpires": 60000,
Expand Down
50 changes: 29 additions & 21 deletions ios/Magnet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
8DF8217D1D5388090081F56E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DF8217C1D5388090081F56E /* libz.tbd */; };
8DF8217F1D5388190081F56E /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DF8217E1D5388190081F56E /* libsqlite3.0.tbd */; };
8DF821841D53B3830081F56E /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DF821831D53B3830081F56E /* AdSupport.framework */; };
8DF84D3F1DECE161001CF20C /* libAirMaps.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DF84D3E1DECE13F001CF20C /* libAirMaps.a */; };
AA85BDA14B4C4D9A8524DCAD /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0097C20A4D7D4123BF8820C5 /* libBVLinearGradient.a */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -171,12 +172,12 @@
remoteGlobalIDString = 134814201AA4EA6300B7C361;
remoteInfo = BVLinearGradient;
};
8DF8216C1D53879A0081F56E /* PBXContainerItemProxy */ = {
8DF84D3D1DECE13F001CF20C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 8DF821651D53879A0081F56E /* RCTGoogleAnalyticsBridge.xcodeproj */;
containerPortal = 8DF84D391DECE13F001CF20C /* AirMaps.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = A79185C61C30694E001236A6;
remoteInfo = RCTGoogleAnalyticsBridge;
remoteGlobalIDString = 11FA5C511C4A1296003AC2EE;
remoteInfo = AirMaps;
};
/* End PBXContainerItemProxy section */

Expand Down Expand Up @@ -279,12 +280,12 @@
8DBAAAB61D67272500AC32C5 /* FiraSans-LightItalic.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSans-LightItalic.otf"; path = "fonts/FiraSans-LightItalic.otf"; sourceTree = "<group>"; };
8DBAAAB71D67272500AC32C5 /* FiraSans-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "FiraSans-LightItalic.ttf"; path = "fonts/FiraSans-LightItalic.ttf"; sourceTree = "<group>"; };
8DF6981FBE0A4B8D8545B9A5 /* BVLinearGradient.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = BVLinearGradient.xcodeproj; path = "../node_modules/react-native-linear-gradient/BVLinearGradient.xcodeproj"; sourceTree = "<group>"; };
8DF821651D53879A0081F56E /* RCTGoogleAnalyticsBridge.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTGoogleAnalyticsBridge.xcodeproj; path = "../node_modules/react-native-google-analytics-bridge/ios/RCTGoogleAnalyticsBridge/RCTGoogleAnalyticsBridge.xcodeproj"; sourceTree = "<group>"; };
8DF821781D5387F20081F56E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
8DF8217A1D5387FC0081F56E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
8DF8217C1D5388090081F56E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
8DF8217E1D5388190081F56E /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
8DF821831D53B3830081F56E /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
8DF84D391DECE13F001CF20C /* AirMaps.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = AirMaps.xcodeproj; path = "../node_modules/react-native-maps/ios/AirMaps.xcodeproj"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -307,6 +308,7 @@
8DF8217B1D5387FC0081F56E /* SystemConfiguration.framework in Frameworks */,
8DF821791D5387F20081F56E /* CoreData.framework in Frameworks */,
5583EF161D3E4A8400852649 /* SQLite.framework in Frameworks */,
8DF84D3F1DECE161001CF20C /* libAirMaps.a in Frameworks */,
146834051AC3E58100842450 /* libReact.a in Frameworks */,
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
Expand Down Expand Up @@ -491,9 +493,9 @@
559608B91DB918B100816CF1 /* Frameworks */ = {
isa = PBXGroup;
children = (
22AE78AF1DE3302900192FC0 /* GoogleAnalyticsServices.framework */,
555A52AA1DDA3295005D4B98 /* BugfenderSDK.framework */,
559608C61DB918B100816CF1 /* Alamofire.framework */,
555A52AA1DDA3295005D4B98 /* BugfenderSDK.framework */,
22AE78AF1DE3302900192FC0 /* GoogleAnalyticsServices.framework */,
559608C71DB918B100816CF1 /* SwiftyJSON.framework */,
558015601DDE43600068CB8B /* UserNotifications.framework */,
558015621DDE43600068CB8B /* UserNotificationsUI.framework */,
Expand Down Expand Up @@ -546,8 +548,8 @@
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
isa = PBXGroup;
children = (
8DF821651D53879A0081F56E /* RCTGoogleAnalyticsBridge.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */,
8DF84D391DECE13F001CF20C /* AirMaps.xcodeproj */,
8DF6981FBE0A4B8D8545B9A5 /* BVLinearGradient.xcodeproj */,
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */,
00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */,
00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */,
Expand All @@ -557,7 +559,7 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
8DF6981FBE0A4B8D8545B9A5 /* BVLinearGradient.xcodeproj */,
146833FF1AC3E56700842450 /* React.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
Expand Down Expand Up @@ -652,10 +654,10 @@
name = Subscriptions;
sourceTree = "<group>";
};
8DF821661D53879A0081F56E /* Products */ = {
8DF84D3A1DECE13F001CF20C /* Products */ = {
isa = PBXGroup;
children = (
8DF8216D1D53879A0081F56E /* libRCTGoogleAnalyticsBridge.a */,
8DF84D3E1DECE13F001CF20C /* libAirMaps.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -694,6 +696,7 @@
85DF9A271D632FED004DF3F1 /* Copy Files */,
55AE10ED1D67664900CAD0E0 /* ShellScript */,
5580157D1DDE43600068CB8B /* Embed App Extensions */,
0E1D582B1DE62B0400DA918E /* ShellScript */,
);
buildRules = (
);
Expand Down Expand Up @@ -746,7 +749,7 @@
};
};
};
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Magnet" */;
buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "magnet" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 0;
Expand All @@ -758,6 +761,10 @@
productRefGroup = 83CBBA001A601CBA00E9B192 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 8DF84D3A1DECE13F001CF20C /* Products */;
ProjectRef = 8DF84D391DECE13F001CF20C /* AirMaps.xcodeproj */;
},
{
ProductGroup = 8D2FD7881D42607500D8FCE8 /* Products */;
ProjectRef = 8DF6981FBE0A4B8D8545B9A5 /* BVLinearGradient.xcodeproj */;
Expand All @@ -770,10 +777,6 @@
ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */;
ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */;
},
{
ProductGroup = 8DF821661D53879A0081F56E /* Products */;
ProjectRef = 8DF821651D53879A0081F56E /* RCTGoogleAnalyticsBridge.xcodeproj */;
},
{
ProductGroup = 00C302BC1ABCB91800DB3ED1 /* Products */;
ProjectRef = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */;
Expand Down Expand Up @@ -894,11 +897,11 @@
remoteRef = 8D2FD78B1D42607500D8FCE8 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
8DF8216D1D53879A0081F56E /* libRCTGoogleAnalyticsBridge.a */ = {
8DF84D3E1DECE13F001CF20C /* libAirMaps.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libRCTGoogleAnalyticsBridge.a;
remoteRef = 8DF8216C1D53879A0081F56E /* PBXContainerItemProxy */;
path = libAirMaps.a;
remoteRef = 8DF84D3D1DECE13F001CF20C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down Expand Up @@ -1126,7 +1129,9 @@
DEAD_CODE_STRIPPING = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
"$(PROJECT_DIR)/3rdparty",
"$(PROJECT_DIR)/3rdparty/BugfenderSDK-iOS",
"$(PROJECT_DIR)/3rdparty/GoogleAnalyticsSDK-iOS",
);
Expand Down Expand Up @@ -1167,7 +1172,9 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
"$(PROJECT_DIR)/3rdparty",
"$(PROJECT_DIR)/3rdparty/BugfenderSDK-iOS",
"$(PROJECT_DIR)/3rdparty/GoogleAnalyticsSDK-iOS",
);
Expand Down Expand Up @@ -1373,8 +1380,9 @@
5580156F1DDE43600068CB8B /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "Magnet" */ = {
83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "magnet" */ = {
isa = XCConfigurationList;
buildConfigurations = (
83CBBA201A601CBA00E9B192 /* Debug */,
Expand Down
Binary file added lib/images/icon-map-marker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/images/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lib/images/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified lib/images/item-scene-room.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading