Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
de9f686e
Commit
de9f686e
authored
Jun 28, 2017
by
Sajal Narang
Committed by
GitHub
Jun 28, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #18 from Mrunzzz/mapUpdate
Map getLocation and SetBounds
parents
22ff3399
90b30c9e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
54 additions
and
6 deletions
+54
-6
.idea/misc.xml
.idea/misc.xml
+1
-1
.idea/vcs.xml
.idea/vcs.xml
+6
-0
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
...c/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
+6
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
...va/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
+39
-3
build.gradle
build.gradle
+1
-1
No files found.
.idea/misc.xml
View file @
de9f686e
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
</value>
</value>
</option>
</option>
</component>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
default=
"true"
project-jdk-name=
"
JDK
"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_7"
default=
"true"
project-jdk-name=
"
1.8
"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
</component>
<component
name=
"ProjectType"
>
<component
name=
"ProjectType"
>
...
...
.idea/vcs.xml
0 → 100644
View file @
de9f686e
<?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
app/src/main/AndroidManifest.xml
View file @
de9f686e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
package=
"in.ac.iitb.gymkhana.iitbapp"
>
package=
"in.ac.iitb.gymkhana.iitbapp"
>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<application
<application
android:allowBackup=
"true"
android:allowBackup=
"true"
android:icon=
"@mipmap/ic_launcher"
android:icon=
"@mipmap/ic_launcher"
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @
de9f686e
package
in.ac.iitb.gymkhana.iitbapp
;
package
in.ac.iitb.gymkhana.iitbapp
;
import
android.Manifest
;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.design.widget.NavigationView
;
import
android.support.design.widget.NavigationView
;
import
android.support.design.widget.Snackbar
;
import
android.support.design.widget.Snackbar
;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.content.ContextCompat
;
import
android.support.v4.view.GravityCompat
;
import
android.support.v4.view.GravityCompat
;
import
android.support.v4.widget.DrawerLayout
;
import
android.support.v4.widget.DrawerLayout
;
import
android.support.v7.app.ActionBarDrawerToggle
;
import
android.support.v7.app.ActionBarDrawerToggle
;
...
@@ -15,6 +19,7 @@ import android.support.v7.widget.Toolbar;
...
@@ -15,6 +19,7 @@ import android.support.v7.widget.Toolbar;
import
android.view.Menu
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.Toast
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.AboutFragment
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.AboutFragment
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.CMSFragment
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.CMSFragment
;
...
@@ -47,6 +52,7 @@ public class MainActivity extends AppCompatActivity
...
@@ -47,6 +52,7 @@ public class MainActivity extends AppCompatActivity
NavigationView
navigationView
=
(
NavigationView
)
findViewById
(
R
.
id
.
nav_view
);
NavigationView
navigationView
=
(
NavigationView
)
findViewById
(
R
.
id
.
nav_view
);
navigationView
.
setNavigationItemSelectedListener
(
this
);
navigationView
.
setNavigationItemSelectedListener
(
this
);
}
}
@Override
@Override
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
View file @
de9f686e
package
in.ac.iitb.gymkhana.iitbapp.fragments
;
package
in.ac.iitb.gymkhana.iitbapp.fragments
;
import
android.Manifest
;
import
android.content.pm.PackageManager
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.content.ContextCompat
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.widget.Toast
;
import
com.google.android.gms.maps.CameraUpdateFactory
;
import
com.google.android.gms.maps.CameraUpdateFactory
;
import
com.google.android.gms.maps.GoogleMap
;
import
com.google.android.gms.maps.GoogleMap
;
import
com.google.android.gms.maps.OnMapReadyCallback
;
import
com.google.android.gms.maps.OnMapReadyCallback
;
import
com.google.android.gms.maps.SupportMapFragment
;
import
com.google.android.gms.maps.SupportMapFragment
;
import
com.google.android.gms.maps.model.LatLng
;
import
com.google.android.gms.maps.model.LatLng
;
import
com.google.android.gms.maps.model.LatLngBounds
;
import
com.google.android.gms.maps.model.MarkerOptions
;
import
com.google.android.gms.maps.model.MarkerOptions
;
import
in.ac.iitb.gymkhana.iitbapp.R
;
import
in.ac.iitb.gymkhana.iitbapp.R
;
...
@@ -18,7 +23,7 @@ import in.ac.iitb.gymkhana.iitbapp.R;
...
@@ -18,7 +23,7 @@ import in.ac.iitb.gymkhana.iitbapp.R;
public
class
MapFragment
extends
Fragment
implements
OnMapReadyCallback
{
public
class
MapFragment
extends
Fragment
implements
OnMapReadyCallback
{
SupportMapFragment
gMapFragment
;
SupportMapFragment
gMapFragment
;
GoogleMap
g
Map
=
null
;
GoogleMap
g
oogleMap
;
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
Bundle
savedInstanceState
)
{
...
@@ -32,12 +37,43 @@ public class MapFragment extends Fragment implements OnMapReadyCallback {
...
@@ -32,12 +37,43 @@ public class MapFragment extends Fragment implements OnMapReadyCallback {
}
}
@Override
@Override
public
void
onMapReady
(
GoogleMap
g
oogle
Map
)
{
public
void
onMapReady
(
GoogleMap
gMap
)
{
googleMap
=
gMap
;
if
(
ContextCompat
.
checkSelfPermission
(
getActivity
(),
Manifest
.
permission
.
ACCESS_FINE_LOCATION
)
==
PackageManager
.
PERMISSION_GRANTED
)
{
googleMap
.
setMyLocationEnabled
(
true
);
googleMap
.
getUiSettings
().
setMyLocationButtonEnabled
(
true
);
googleMap
.
getUiSettings
().
setZoomGesturesEnabled
(
true
);
}
else
{
requestPermissions
(
new
String
[]{
Manifest
.
permission
.
ACCESS_FINE_LOCATION
},
0
);
}
LatLngBounds
iitbBounds
=
new
LatLngBounds
(
new
LatLng
(
19.1249000
,
72.9046000
),
new
LatLng
(
19.143522
,
72.920000
));
googleMap
.
setLatLngBoundsForCameraTarget
(
iitbBounds
);
googleMap
.
setMaxZoomPreference
(
30
);
googleMap
.
setMinZoomPreference
((
float
)
14.5
);
// Position the map's camera near Mumbai
// Position the map's camera near Mumbai
LatLng
iitb
=
new
LatLng
(
19.1334
,
72.9133
);
LatLng
iitb
=
new
LatLng
(
19.1334
,
72.9133
);
googleMap
.
addMarker
(
new
MarkerOptions
().
position
(
iitb
)
googleMap
.
addMarker
(
new
MarkerOptions
().
position
(
iitb
)
.
title
(
"Marker in IITB"
));
.
title
(
"Marker in IITB"
));
googleMap
.
moveCamera
(
CameraUpdateFactory
.
newLatLng
(
iitb
));
googleMap
.
moveCamera
(
CameraUpdateFactory
.
newLatLng
(
iitb
));
}
}
}
public
void
onRequestPermissionsResult
(
int
requestCode
,
\ No newline at end of file
String
[]
permissions
,
int
[]
grantResults
)
{
if
(
grantResults
[
0
]==
PackageManager
.
PERMISSION_GRANTED
)
{
googleMap
.
setMyLocationEnabled
(
true
);
googleMap
.
getUiSettings
().
setMyLocationButtonEnabled
(
true
);
googleMap
.
getUiSettings
().
setZoomGesturesEnabled
(
true
);
}
else
{
Toast
toast
=
Toast
.
makeText
(
getActivity
(),
"Need Permission"
,
Toast
.
LENGTH_SHORT
);
toast
.
show
();
}
}}
build.gradle
View file @
de9f686e
...
@@ -7,7 +7,7 @@ buildscript {
...
@@ -7,7 +7,7 @@ buildscript {
jcenter
()
jcenter
()
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.0.0-alpha
2
'
classpath
'com.android.tools.build:gradle:3.0.0-alpha
3
'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// in the individual module build.gradle files
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment