From bbedee407b7845762d6730f09da3c39a6dd5b2ee Mon Sep 17 00:00:00 2001
From: papazock <papazock@windowslive.com>
Date: Wed, 24 Sep 2014 00:06:05 +0300
Subject: [PATCH] Map Again :)

---
 .idea/libraries/support_v4_20_0_0.xml         |  2 +-
 app/app.iml                                   | 29 ++++++++--
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              | 54 ++++++++++---------
 .../cinemetroproject/cinemetro/Line3.java     |  4 +-
 .../cinemetro/MapActivity.java                |  5 +-
 app/src/main/res/layout/activity_map.xml      |  9 ++--
 7 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/.idea/libraries/support_v4_20_0_0.xml b/.idea/libraries/support_v4_20_0_0.xml
index 7e78b4e..3d6dac0 100644
--- a/.idea/libraries/support_v4_20_0_0.xml
+++ b/.idea/libraries/support_v4_20_0_0.xml
@@ -2,8 +2,8 @@
   <library name="support-v4-20.0.0">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/libs/internal_impl-20.0.0.jar!/" />
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/20.0.0/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/app/app.iml b/app/app.iml
index 70d651e..608c166 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="CineMetroWithGit" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="CineMetro" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -13,6 +13,7 @@
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -37,26 +38,44 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
diff --git a/app/build.gradle b/app/build.gradle
index 7f99ad0..3a6ce83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,6 +32,6 @@ dependencies {
     // You must install or update the Support Repository through the SDK manager to use this dependency.
     compile 'com.android.support:appcompat-v7:20.0.0'
     compile 'com.android.support:support-v4:20.0.0'
-    compile 'com.google.android.gms:play-services:5.2.08'
+    compile 'com.google.android.gms:play-services:5.+'
    // compile 'com.google.android.gms:play-services:5.0.77'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ee8bfe..de333cd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cinemetroproject.cinemetro" >
+    package="cinemetroproject.cinemetro">
 
-    <permission android:name="cinemetroproject.cinemetro.permission.MAPS_RECEIVE"
-        android:protectionLevel="signature"/>
-    <uses-permission android:name="cinemetroproject.cinemetro.permission.MAPS_RECEIVE"/>
+    <permission
+        android:name="cinemetroproject.cinemetro.permission.MAPS_RECEIVE"
+        android:protectionLevel="signature" />
+
+    <uses-permission android:name="cinemetroproject.cinemetro.permission.MAPS_RECEIVE" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -20,14 +22,18 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
+
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
 
         <activity
             android:name=".MainMenu"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTask"
-            android:theme="@style/AppTheme" >
+            android:theme="@style/AppTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -37,7 +43,7 @@
         <activity
             android:name=".LinesActivity"
             android:label="@string/title_activity_lines"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -45,7 +51,7 @@
         <activity
             android:name=".AboutActivity"
             android:label="About"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -53,7 +59,7 @@
         <activity
             android:name=".ProfileActivity"
             android:label="@string/title_activity_profile"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -61,7 +67,7 @@
         <activity
             android:name=".TestDB"
             android:label="TestDb"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -69,7 +75,7 @@
         <activity
             android:name=".LogIn"
             android:label="@string/title_activity_log_in"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -77,7 +83,7 @@
         <activity
             android:name=".SignUp"
             android:label="@string/title_activity_sign_up"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
@@ -85,7 +91,7 @@
         <activity
             android:name=".ViewStation"
             android:label="ViewStation"
-            android:parentActivityName=".LinesActivity" >
+            android:parentActivityName=".LinesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.LinesActivity" />
@@ -93,7 +99,7 @@
         <activity
             android:name=".RateActivity"
             android:label="Rate"
-            android:parentActivityName=".ViewStation" >
+            android:parentActivityName=".ViewStation">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.ViewStation" />
@@ -101,28 +107,25 @@
         <activity
             android:name=".ViewCinema"
             android:label="ViewCinema"
-            android:parentActivityName=".LinesActivity" >
+            android:parentActivityName=".LinesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.LinesActivity" />
         </activity>
         <activity
             android:name=".Line1"
-            android:label="line1">
-            </activity>
-        <activity
-            android:name=".Line2">
+            android:label="line1"></activity>
+        <activity android:name=".Line2">
 
-            </activity>
-        <activity
-            android:name=".Line3">
+        </activity>
+        <activity android:name=".Line3">
 
-            </activity>
+        </activity>
 
         <activity
             android:name=".Timeline"
             android:label="Timeline"
-            android:parentActivityName=".LinesActivity" >
+            android:parentActivityName=".LinesActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.LinesActivity" />
@@ -130,11 +133,12 @@
         <activity
             android:name=".MapActivity"
             android:label="@string/title_activity_map"
-            android:parentActivityName=".MainMenu" >
+            android:parentActivityName=".MainMenu">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="cinemetroproject.cinemetro.MainMenu" />
         </activity>
+
         <meta-data
             android:name="com.google.android.maps.v2.API_KEY"
             android:value="AIzaSyAI-hr5NpFX-qr_JE_TmKZHiKrKpHwtAhs" />
diff --git a/app/src/main/java/cinemetroproject/cinemetro/Line3.java b/app/src/main/java/cinemetroproject/cinemetro/Line3.java
index acbace3..dc7c439 100644
--- a/app/src/main/java/cinemetroproject/cinemetro/Line3.java
+++ b/app/src/main/java/cinemetroproject/cinemetro/Line3.java
@@ -80,8 +80,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         public void onClick(View view) {
 
 
-            Intent intent = new Intent(Line3.this, Timeline.class);
+           // Intent intent = new Intent(Line3.this, Timeline.class);
             //intent.putExtra("button_id", view.getId());
-            Line3.this.startActivity(intent);
+          //  Line3.this.startActivity(intent);
         }};
 }
diff --git a/app/src/main/java/cinemetroproject/cinemetro/MapActivity.java b/app/src/main/java/cinemetroproject/cinemetro/MapActivity.java
index dca860d..2a93739 100644
--- a/app/src/main/java/cinemetroproject/cinemetro/MapActivity.java
+++ b/app/src/main/java/cinemetroproject/cinemetro/MapActivity.java
@@ -1,16 +1,18 @@
 package cinemetroproject.cinemetro;
 
+import android.app.Activity;
 import android.app.FragmentTransaction;
 import android.support.v7.app.ActionBarActivity;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.WindowManager;
 
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.MapFragment;
 
 
-public class MapActivity extends ActionBarActivity {
+public class MapActivity extends Activity {
 
 
     private GoogleMap mΜap;
@@ -18,6 +20,7 @@ public class MapActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         setContentView(R.layout.activity_map);
         mΜap = ((MapFragment) getFragmentManager().findFragmentById(R.id.map)).getMap();
 
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index f519594..27669cb 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -1,20 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="cinemetroproject.cinemetro.MapActivity">
 
 
 
-        <fragment
+        <fragment xmlns:android="http://schemas.android.com/apk/res/android"
             android:id="@+id/map"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            class="com.google.android.gms.maps.MapFragment" />
+            android:name="com.google.android.gms.maps.MapFragment"/>
 
 
 </RelativeLayout>