Skip to content

Commit

Permalink
Displays current location of user, and stores
Browse files Browse the repository at this point in the history
  • Loading branch information
Ada Taylor committed Jul 25, 2013
1 parent 3aa44dc commit ff8c424
Show file tree
Hide file tree
Showing 85 changed files with 80 additions and 12 deletions.
Binary file not shown.
Binary file not shown.
34 changes: 34 additions & 0 deletions GoogleMaps.bundle/GMSCacheStorage.momd/VersionInfo.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSManagedObjectModel_CurrentVersionName</key>
<string>Storage</string>
<key>NSManagedObjectModel_VersionHashes</key>
<dict>
<key>Storage</key>
<dict>
<key>GMSCacheProperty</key>
<data>
QaoIkcym3itula0F304pZa3x432niQez51fLRsScFMw=
</data>
<key>GMSCachedObject</key>
<data>
QSOFyJYNNqHN5xlbUj9GIZC+F35CGWBGHNhd2/Z0cQA=
</data>
<key>GMSCachedObjectBlob</key>
<data>
noK2ayPbzw+yZIq2ekMRGSILYZyxs7oE4dZjuknRPrk=
</data>
<key>GMSCachedTile</key>
<data>
6GLdEuCbhqgrpr/FNSMyfhXYz0OsfUtbp/2zzxPZFpU=
</data>
<key>GMSCachedTileBlob</key>
<data>
GOwOTZdLt947wADRzN4reePTdqMZWEYvUjuniL9EgdI=
</data>
</dict>
</dict>
</dict>
</plist>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions GoogleMaps.bundle/GMSCoreResources.bundle/HybridRoadShader.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Because of this #extension this shader doesn't get precompiled by our
// precompiling script.
#extension GL_EXT_shader_framebuffer_fetch : require

uniform sampler2D sTexture0;
varying lowp vec2 vTextureCoord;
varying lowp vec4 vColor;
uniform mediump float uAlphaLodBias;
lowp vec4 gl_LastFragData[gl_MaxDrawBuffers];

void main() {
// If we've drawn a stroke to the framebuffer the alpha value will be
// HybridRoadShaderProgram::kDefaultAlpha == 0.6. Choose 1/2 of this value
// as a cutoff to delineate the complement rectangular area that surrounds
// end caps. We do need to draw to these areas or we'll have tombstone shaped
// stencil gaps around endcaps that haven't been filled. If we have not
// drawn a stroke to this fragment it will have the background satellite image
// alpha.
const lowp float kSatelliteBackgroundAlpha = 1.0;
const lowp float kOneHalfOfStrokeAlpha = 0.3;
const lowp float kStrokeAlpha = 0.6;
if (gl_LastFragData[0].a == kSatelliteBackgroundAlpha ||
gl_LastFragData[0].a < kOneHalfOfStrokeAlpha) {
// Sample from alpha texture. Add an lod bias to push sampling up closer
// to the base level.
lowp vec4 alpha_value = texture2D(sTexture0, vTextureCoord, uAlphaLodBias);
mediump float alpha_scalar = vColor.a * kStrokeAlpha * alpha_value.a;
gl_FragColor = vec4(mix(gl_LastFragData[0].rgb, vColor.rgb, alpha_scalar),
alpha_scalar);
} else {
gl_FragColor = gl_LastFragData[0];
}
}
Binary file added GoogleMaps.bundle/GMSCoreResources.bundle/Info.plist
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added GoogleMaps.bundle/Info.plist
Binary file not shown.
Binary file added GoogleMaps.bundle/bubble_left.png
Binary file added GoogleMaps.bundle/[email protected]
Binary file added GoogleMaps.bundle/bubble_right.png
Binary file added GoogleMaps.bundle/[email protected]
Binary file added GoogleMaps.bundle/default_marker.png
Binary file added GoogleMaps.bundle/[email protected]
Binary file added GoogleMaps.bundle/en.lproj/InfoPlist.strings
Binary file not shown.
Binary file added GoogleMaps.bundle/turn_arrow_background.png
Binary file added GoogleMaps.bundle/turn_arrow_foreground.png
10 changes: 6 additions & 4 deletions Ubiquity.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
60C0B46E17A1AA4500DC0F92 /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 60C0B46D17A1AA4500DC0F92 /* libc++.dylib */; };
60C0B47017A1AA5100DC0F92 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 60C0B46F17A1AA5100DC0F92 /* libicucore.dylib */; };
60C0B47217A1AA6000DC0F92 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60C0B47117A1AA6000DC0F92 /* OpenGLES.framework */; };
60C0B47417A1DF7A00DC0F92 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 60C0B47317A1DF7A00DC0F92 /* GoogleMaps.bundle */; };
60C0B47617A1E44A00DC0F92 /* GoogleMaps.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 60C0B47517A1E44A00DC0F92 /* GoogleMaps.bundle */; };
60CB90B217A0866B00A9E93A /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CB90B117A0866B00A9E93A /* Parse.framework */; };
60CB90B617A086B500A9E93A /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CB90B517A086B500A9E93A /* AdSupport.framework */; };
60CB90BA17A086CF00A9E93A /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 60CB90B917A086CF00A9E93A /* SystemConfiguration.framework */; };
Expand Down Expand Up @@ -81,7 +81,8 @@
60C0B46D17A1AA4500DC0F92 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
60C0B46F17A1AA5100DC0F92 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
60C0B47117A1AA6000DC0F92 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
60C0B47317A1DF7A00DC0F92 /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GoogleMaps.bundle; path = "../../../Downloads/GoogleMaps-iOS-1.4.0 2/GoogleMaps.framework/Versions/A/Resources/GoogleMaps.bundle"; sourceTree = "<group>"; };
60C0B47517A1E44A00DC0F92 /* GoogleMaps.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = GoogleMaps.bundle; sourceTree = "<group>"; };
60C0B47717A1E4F000DC0F92 /* GMSCoreResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GMSCoreResources.bundle; path = GoogleMaps.bundle/GMSCoreResources.bundle; sourceTree = "<group>"; };
60CB90B117A0866B00A9E93A /* Parse.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Parse.framework; sourceTree = "<group>"; };
60CB90B517A086B500A9E93A /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
60CB90B917A086CF00A9E93A /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -196,8 +197,10 @@
82E9316717A079C600B3958B /* Frameworks */ = {
isa = PBXGroup;
children = (
60C0B47717A1E4F000DC0F92 /* GMSCoreResources.bundle */,
60C0B47117A1AA6000DC0F92 /* OpenGLES.framework */,
60C0B46F17A1AA5100DC0F92 /* libicucore.dylib */,
60C0B47517A1E44A00DC0F92 /* GoogleMaps.bundle */,
60C0B46D17A1AA4500DC0F92 /* libc++.dylib */,
60C0B46B17A1AA3C00DC0F92 /* ImageIO.framework */,
60C0B46917A1AA3500DC0F92 /* GLKit.framework */,
Expand All @@ -208,7 +211,6 @@
82E931E117A0939100B3958B /* StoreKit.framework */,
60CB90C717A0899700A9E93A /* libsqlite3.dylib */,
60CB90C517A0897E00A9E93A /* libz.dylib */,
60C0B47317A1DF7A00DC0F92 /* GoogleMaps.bundle */,
60C0B45F17A1A9EF00DC0F92 /* FacebookSDK.framework */,
60C0B45D17A1A4E400DC0F92 /* GoogleMaps.framework */,
60CB90BF17A0872F00A9E93A /* MobileCoreServices.framework */,
Expand Down Expand Up @@ -368,7 +370,7 @@
82E931F017A093C600B3958B /* [email protected] in Resources */,
82E931EB17A093C600B3958B /* [email protected] in Resources */,
82E931EC17A093C600B3958B /* login-button-small.png in Resources */,
60C0B47417A1DF7A00DC0F92 /* GoogleMaps.bundle in Resources */,
60C0B47617A1E44A00DC0F92 /* GoogleMaps.bundle in Resources */,
82E9317317A079C600B3958B /* InfoPlist.strings in Resources */,
82E931F317A093D500B3958B /* icon.png in Resources */,
82E931EF17A093C600B3958B /* Default.png in Resources */,
Expand Down
Binary file not shown.
15 changes: 7 additions & 8 deletions Ubiquity/NewMessageViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -119,23 +119,22 @@ - (void) showPicker: (id) sender
}

- (void) setupMap {

AppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
CLLocationCoordinate2D currentCoordinate = appDelegate.currentLocation.coordinate;

GMSCameraPosition *camera = [GMSCameraPosition cameraWithLatitude:-33.86
longitude:151.20
zoom:6];
GMSCameraPosition *camera = [GMSCameraPosition cameraWithTarget:currentCoordinate zoom:6];
mapView = [GMSMapView mapWithFrame:CGRectZero camera:camera];
mapView.myLocationEnabled = YES;
self.view = mapView;

// Creates a marker in the center of the map.
GMSMarker *marker = [[GMSMarker alloc] init];
marker.position = CLLocationCoordinate2DMake(-33.86, 151.20);
marker.title = @"Sydney";
marker.snippet = @"Australia";
marker.position = currentCoordinate;
marker.title = @"Here";
marker.snippet = @"My location";
marker.map = mapView;



}

//ANYWALL
Expand Down

0 comments on commit ff8c424

Please sign in to comment.