Ad

Android Project/PersonalTutorService/app/build.gradle

@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 'Google Inc.:Google APIs:23'
     buildToolsVersion '21.1.2'
+    useLibrary 'org.apache.http.legacy'
     defaultConfig {
         applicationId "edu.uta.cse.personaltutorservice"
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
+        multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -20,15 +22,16 @@ android {
     productFlavors {
     }
 }
-
+apply plugin: 'com.android.application'
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-
-
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.google.code.gson:gson:2.6.1'
     compile 'com.google.maps:google-maps-services:0.1.11'
+    compile 'com.android.support:appcompat-v7:24.0.0-alpha1'
+    compile 'com.google.android.gms:play-services:8.4.0'
+    compile 'com.google.android.gms:play-services-ads:8.4.0'
+    compile 'com.android.support:design:23.2.1'
     compile 'com.android.support:support-v4:21.0.3'
     compile 'com.android.support:cardview-v7:21.+'
     compile 'com.android.support:recyclerview-v7:21.+'

Android Project/PersonalTutorService/app/src/androidTest/java/edu/uta/cse/personaltutorservice/ApplicationTest.java

@@ -3,7 +3,7 @@
 import android.app.Application;
 import android.test.AndroidTestRunner;
 import android.test.ApplicationTestCase;
-import android.support.test.runner.*;
+
 
 
 

Android Project/PersonalTutorService/app/src/debug/res/values/google_maps_api.xml

@@ -0,0 +1,21 @@
+<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=21:54:F9:41:02:AB:20:CC:58:1C:A8:06:35:5A:3C:FA:49:2D:0B:1E%3Bedu.uta.cse.personaltutorservice
+
+    You can also add your credentials to an existing key, using this line:
+    21:54:F9:41:02:AB:20:CC:58:1C:A8:06:35:5A:3C:FA:49:2D:0B:1E;edu.uta.cse.personaltutorservice
+
+    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">
+        AIzaSyBBTe4rX8CaFTRqU53UcgKbuaKMlCZpFqY
+    </string>
+</resources>

Android Project/PersonalTutorService/app/src/main/AndroidManifest.xml

@@ -6,14 +6,21 @@
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
+    <!--
+         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:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".LoginActivity"
+            android:name=".Activities.LoginActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,21 +29,41 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".RegisterActivity"
+            android:name=".Activities.RegisterActivity"
             android:label="@string/title_activity_register"
-            android:parentActivityName=".LoginActivity">
+            android:parentActivityName=".Activities.LoginActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.uta.cse.personaltutorservice.LoginActivity" />
+                android:value=".Activities.LoginActivity" />
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".Activities.MainActivity"
             android:label="@string/title_activity_main"
-            android:parentActivityName=".LoginActivity">
+            android:parentActivityName=".Activities.LoginActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".Activities.LoginActivity" />
+        </activity>
+        <!--
+             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=".Activities.NearbyTutorsActivity"
+            android:label="@string/title_activity_nearby_tutors">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="edu.uta.cse.personaltutorservice.LoginActivity" />
+                android:value=".Activities.LoginActivity" />
         </activity>
+        <activity android:name=".Activities.SubjectProfileActivity"></activity>
     </application>
 
 </manifest>