From 1d1605d3862157c8eed4453630ef2a905d2f5c0a Mon Sep 17 00:00:00 2001
From: chan24 <aakaschan24@gmail.com>
Date: Fri, 14 Apr 2017 22:23:09 +0530
Subject: [PATCH] map
---
.idea/misc.xml | 29 +--------
.idea/modules.xml | 9 ---
.idea/runConfigurations.xml | 12 ----
.idea/vcs.xml | 6 --
app/build.gradle | 2 +
app/src/main/AndroidManifest.xml | 12 ++++
.../chan24/smartplanner/LoginActivity.java | 9 ++-
.../chan24/smartplanner/MapsActivity.java | 60 ++++++++++++++-----
.../example/chan24/smartplanner/UserArea.java | 36 +++++++++++
app/src/main/res/layout/activity_login.xml | 10 ++++
app/src/main/res/layout/activity_maps.xml | 2 +-
.../main/res/layout/activity_user_area.xml | 9 +++
12 files changed, 124 insertions(+), 72 deletions(-)
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/runConfigurations.xml
delete mode 100644 .idea/vcs.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..c0842f8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,32 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
- <component name="NullableNotNullManager">
- <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
- <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
- <option name="myNullables">
- <value>
- <list size="4">
- <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
- <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
- <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
- <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
- </list>
- </value>
- </option>
- <option name="myNotNulls">
- <value>
- <list size="4">
- <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
- <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
- <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
- <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
- </list>
- </value>
- </option>
- </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
@@ -37,7 +10,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" default="true" assert-keyword="false" jdk-15="false">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 280fece..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/SmartPlanner.iml" filepath="$PROJECT_DIR$/SmartPlanner.iml" />
- <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RunConfigurationProducerService">
- <option name="ignoredProducers">
- <set>
- <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
- <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
- <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
- </set>
- </option>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 74d6bb5..3d4c521 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,5 +27,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.1.0'
compile 'com.android.volley:volley:1.0.0'
compile 'com.google.android.gms:play-services:10.0.1'
+ compile 'com.android.support:support-annotations:25.1.0'
+ compile 'com.google.android.gms:play-services-maps:10.0.1'
testCompile 'junit:junit:4.12'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1feaaa1..d6956c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,16 @@
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.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="com.google.android.providers.gsf.permissions.READ_GServices" />
+
+ <uses-feature
+ android:glEsVersion="0x0020000"
+ android:required="true" />
<application
android:allowBackup="true"
@@ -35,6 +44,9 @@
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_maps_key" />
+ <meta-data
+ android:name="com.google.android.gsm.version"
+ android:value="@integer/google_play_services_version" />
<activity
android:name=".MapsActivity"
diff --git a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
index e9e1bfb..9517207 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
@@ -10,7 +10,6 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
-import org.w3c.dom.Text;
public class LoginActivity extends AppCompatActivity {
@@ -31,5 +30,13 @@ public class LoginActivity extends AppCompatActivity {
}
});
+ Button b =(Button)findViewById(R.id.button2);
+ b.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent i =new Intent(getApplicationContext(),UserArea.class);
+ startActivity(i);
+ }
+ });
}
}
diff --git a/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java b/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
index 78c1778..89ca509 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/MapsActivity.java
@@ -1,18 +1,26 @@
package com.example.chan24.smartplanner;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationManager;
+import android.location.LocationListener;
+import android.provider.Settings;
+import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.os.Bundle;
+import android.widget.Toast;
-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;
+ private LocationManager locationManager;
+ private LocationListener locationListener;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -24,23 +32,45 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
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
+ /*// 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));
+ mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));*/
+ if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+ return;
+ }
+ mMap.setMyLocationEnabled(true);
+ mMap.setTrafficEnabled(true);
+
+ locationManager = (LocationManager)getSystemService(Context.LOCATION_SERVICE);
+ locationListener = new LocationListener() {
+ @Override
+ public void onLocationChanged(Location location) {
+ Toast.makeText(getApplicationContext(),"long"+location.getLongitude()+"lat"+location.getLatitude(),Toast.LENGTH_LONG).show();
+ }
+
+ @Override
+ public void onStatusChanged(String provider, int status, Bundle extras) {
+
+ }
+
+ @Override
+ public void onProviderEnabled(String provider) {
+
+ }
+
+ @Override
+ public void onProviderDisabled(String provider) {
+ Intent i= new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+ startActivity(i);
+ }
+ };
+ locationManager.requestLocationUpdates("gps",5000,0,locationListener);
}
+
+
}
diff --git a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
index c16ba8d..d3d8c24 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/UserArea.java
@@ -1,7 +1,15 @@
package com.example.chan24.smartplanner;
+import android.app.Dialog;
+import android.content.Intent;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
public class UserArea extends AppCompatActivity {
@@ -9,5 +17,33 @@ public class UserArea extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_user_area);
+ if (googleServicesAvailable()){
+ Toast.makeText(this,"Perfect",Toast.LENGTH_SHORT).show();
+ }
+
+ Button b= (Button)findViewById(R.id.button3);
+ b.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent i =new Intent(getApplicationContext(),MapsActivity.class);
+ startActivity(i);
+ }
+ });
+ }
+
+ public boolean googleServicesAvailable(){
+ GoogleApiAvailability api = GoogleApiAvailability.getInstance();
+ int isAvailable = api.isGooglePlayServicesAvailable(this);
+ if (isAvailable == ConnectionResult.SUCCESS){
+ return true;
+ }
+ else if (api.isUserResolvableError(isAvailable)){
+ Dialog dialog =api.getErrorDialog(this,isAvailable,0);
+ dialog.show();
+ }
+ else{
+ Toast.makeText(this,"Cant connect to play services",Toast.LENGTH_LONG).show();
+ }
+ return false;
}
}
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b87895e..1158100 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -50,4 +50,14 @@
android:layout_marginTop="81dp"
android:id="@+id/reg"
android:textStyle="normal|bold" />
+
+ <Button
+ android:text="Button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/reg"
+ android:layout_alignEnd="@+id/login"
+ android:layout_marginTop="50dp"
+ android:id="@+id/button2" />
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 47d7f50..7f98416 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -4,5 +4,5 @@
android:id="@+id/map"
android:name="com.google.android.gms.maps.SupportMapFragment"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="350dp"
tools:context="com.example.chan24.smartplanner.MapsActivity" />
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 40c035d..d6511db 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -10,4 +10,13 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.example.chan24.smartplanner.UserArea">
+ <Button
+ android:text="Button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="120dp"
+ android:layout_marginTop="32dp"
+ android:id="@+id/button3" />
</RelativeLayout>
--
GitLab