Skip to content

Map Again :) #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vaenpara wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Map Again :) #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/libraries/support_v4_20_0_0.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 24 additions & 5 deletions app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
54 changes: 29 additions & 25 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand All @@ -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" />

Expand All @@ -37,104 +43,102 @@
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
</activity>
<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" />
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/cinemetroproject/cinemetro/Line3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}};
}
5 changes: 4 additions & 1 deletion app/src/main/java/cinemetroproject/cinemetro/MapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
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;

@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();

Expand Down
9 changes: 3 additions & 6 deletions app/src/main/res/layout/activity_map.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>