Merge pull request #7 from bmun/4_mapsFragment

#4 Map functionality
bmun · Jan 31, 2015 · 2132cbb · 2132cbb
2 parents 3d4b683 + 4aaf357
commit 2132cbb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.bmun.bmundelegate" >
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true"/>
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
@@ -18,6 +27,10 @@
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="AIzaSyDnLt_FEWLO0GjQRAkVwgLc3KWgRbPXkhA"/>
     </application>
 
+
 </manifest>
diff --git a/app/src/main/java/org/bmun/bmundelegate/MapFragment.java b/app/src/main/java/org/bmun/bmundelegate/MapFragment.java
@@ -18,7 +18,7 @@ public MapFragment() {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.content_container, container, false);
+        View rootView = inflater.inflate(R.layout.map_fragment, container, false);
         return rootView;
     }
 

diff --git a/app/src/main/res/layout/map_fragment.xml b/app/src/main/res/layout/map_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="+@id/map_fragment"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <fragment
+        android:id="@+id/map"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="com.google.android.gms.maps.MapFragment"/>
+</LinearLayout>