week8 done

Week_08_Location_services_and_maps/MyLocation2_copy/app/build.gradle → Week_08_Location_services_and_maps/MapGetStarted/app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "27.0.1"
     defaultConfig {
-        applicationId "com.example.yang.mylocation"
+        applicationId "com.example.jianhuayang.mapgetstarted"
         minSdkVersion 15
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -20,11 +20,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile fileTree(dir: 'libs', include: ['*.jar'])
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.google.android.gms:play-services:9.6.1'
+    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.google.android.gms:play-services-maps:11.0.4'
     testCompile 'junit:junit:4.12'
 }

Week_08_Location_services_and_maps/MyLocation_copy/app/proguard-rules.pro → Week_08_Location_services_and_maps/MapGetStarted/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /home/yang/Android/Sdk/tools/proguard/proguard-android.txt
+# in /Users/jianhuayang/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

Week_08_Location_services_and_maps/MyLocation2_copy/app/src/androidTest/java/com/example/yang/mylocation/ExampleInstrumentedTest.java → Week_08_Location_services_and_maps/MapGetStarted/app/src/androidTest/java/com/example/jianhuayang/mapgetstarted/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.example.yang.mylocation;
+package com.example.jianhuayang.mapgetstarted;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.example.yang.mylocation", appContext.getPackageName());
+        assertEquals("com.example.jianhuayang.mapgetstarted", appContext.getPackageName());
     }
 }

Week_08_Location_services_and_maps/MapGetStarted/app/src/debug/res/values/google_maps_api.xml

@@ -0,0 +1,24 @@
+<resources>
+    <!--
+    TODO: Before you run your application, you need a Google Maps API key.
+
+    To get one, follow this link, follow the directions and press "Create" at the end:
+
+    https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=A0:F3:D9:27:98:E3:65:AA:C6:AA:C5:9F:97:D7:96:B3:22:0B:2D:08%3Bcom.example.jianhuayang.mapgetstarted
+
+    You can also add your credentials to an existing key, using these values:
+
+    Package name:
+    A0:F3:D9:27:98:E3:65:AA:C6:AA:C5:9F:97:D7:96:B3:22:0B:2D:08
+
+    SHA-1 certificate fingerprint:
+    A0:F3:D9:27:98:E3:65:AA:C6:AA:C5:9F:97:D7:96:B3:22:0B:2D:08
+
+    Alternatively, follow the directions here:
+    https://developers.google.com/maps/documentation/android/start#get-key
+
+    Once you have your key (it starts with "AIza"), replace the "google_maps_key"
+    string in this file.
+    -->
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyCNU7coBzk_IPcSCdjmT_ozRXZVZ54qSj8</string>
+</resources>

Week_08_Location_services_and_maps/MapGetStarted/app/src/main/AndroidManifest.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.jianhuayang.mapgetstarted">
+
+    <!--
+         The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
+         Google Maps Android API v2, but you must specify either coarse or fine
+         location permissions for the 'MyLocation' functionality. 
+    -->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <!--
+             The API key for Google Maps-based APIs is defined as a string resource.
+             (See the file "res/values/google_maps_api.xml").
+             Note that the API key is linked to the encryption key used to sign the APK.
+             You need a different API key for each encryption key, including the release key that is used to
+             sign the APK for publishing.
+             You can define the keys for the debug and release targets in src/debug/ and src/release/. 
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key"/>
+
+        <activity
+            android:name=".MapsActivity"
+            android:label="@string/title_activity_maps">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

Week_08_Location_services_and_maps/MapGetStarted/app/src/main/java/com/example/jianhuayang/mapgetstarted/MapsActivity.java

@@ -0,0 +1,46 @@
+package com.example.jianhuayang.mapgetstarted;
+
+import android.support.v4.app.FragmentActivity;
+import android.os.Bundle;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+public class MapsActivity extends FragmentActivity implements OnMapReadyCallback {
+
+    private GoogleMap mMap;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_maps);
+        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
+                .findFragmentById(R.id.map);
+        mapFragment.getMapAsync(this);
+    }
+
+
+    /**
+     * Manipulates the map once available.
+     * This callback is triggered when the map is ready to be used.
+     * This is where we can add markers or lines, add listeners or move the camera. In this case,
+     * we just add a marker near Sydney, Australia.
+     * If Google Play services is not installed on the device, the user will be prompted to install
+     * it inside the SupportMapFragment. This method will only be triggered once the user has
+     * installed Google Play services and returned to the app.
+     */
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+        mMap = googleMap;
+
+        // Add a marker in Sydney and move the camera
+        LatLng sydney = new LatLng(-34, 151);
+        mMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
+        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
+    }
+}

Week_08_Location_services_and_maps/MapGetStarted/app/src/main/res/layout/activity_maps.xml

@@ -0,0 +1,8 @@
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:map="http://schemas.android.com/apk/res-auto"
+          xmlns:tools="http://schemas.android.com/tools"
+          android:id="@+id/map"
+          android:name="com.google.android.gms.maps.SupportMapFragment"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          tools:context="com.example.jianhuayang.mapgetstarted.MapsActivity"/>

Week_08_Location_services_and_maps/MyLocation2_copy/app/src/main/res/values/strings.xml → Week_08_Location_services_and_maps/MapGetStarted/app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">My Location</string>
+    <string name="app_name">Map Get Started</string>
     <string name="title_activity_maps">Map</string>
 </resources>

Week_08_Location_services_and_maps/MyLocation2_copy/app/src/test/java/com/example/yang/mylocation/ExampleUnitTest.java → Week_08_Location_services_and_maps/MapGetStarted/app/src/test/java/com/example/jianhuayang/mapgetstarted/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.example.yang.mylocation;
+package com.example.jianhuayang.mapgetstarted;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public class ExampleUnitTest {
     public void addition_isCorrect() throws Exception {
         assertEquals(4, 2 + 2);
     }
-}
+}

Week_08_Location_services_and_maps/MyLocation_copy/build.gradle → Week_08_Location_services_and_maps/MapGetStarted/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

Week_08_Location_services_and_maps/MyLocation2_copy/gradle/wrapper/gradle-wrapper.properties → Week_08_Location_services_and_maps/MapGetStarted/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Nov 22 13:10:32 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

Week_08_Location_services_and_maps/MyLocation/app/build.gradle

@@ -2,9 +2,9 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    buildToolsVersion "27.0.1"
     defaultConfig {
-        applicationId "com.example.yang.mylocation"
+        applicationId "com.example.jianhuayang.mylocation"
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
@@ -25,6 +25,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-    compile 'com.google.android.gms:play-services:9.6.1'
+    compile 'com.google.android.gms:play-services-location:11.0.4'
 }

Week_08_Location_services_and_maps/MyLocation/app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # By default, the flags in this file are appended to flags specified
-# in /home/yang/Android/Sdk/tools/proguard/proguard-android.txt
+# in /Users/jianhuayang/Library/Android/sdk/tools/proguard/proguard-android.txt
 # You can edit the include path and order by changing the proguardFiles
 # directive in build.gradle.
 #
@@ -15,3 +15,11 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

Week_08_Location_services_and_maps/MyLocation/app/src/androidTest/java/com/example/yang/mylocation/ExampleInstrumentedTest.java → Week_08_Location_services_and_maps/MyLocation/app/src/androidTest/java/com/example/jianhuayang/mylocation/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.example.yang.mylocation;
+package com.example.jianhuayang.mylocation;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.example.yang.mylocation", appContext.getPackageName());
+        assertEquals("com.example.jianhuayang.mylocation", appContext.getPackageName());
     }
 }

Week_08_Location_services_and_maps/MyLocation/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.yang.mylocation">
+          package="com.example.jianhuayang.mylocation">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
@@ -9,6 +9,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
@@ -20,4 +21,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>