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
356d6b65
Commit
356d6b65
authored
May 28, 2017
by
Mrunzzz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mapfragment integration
parent
affee3de
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
291 additions
and
0 deletions
+291
-0
.idea/modules.xml
.idea/modules.xml
+2
-0
app/build.gradle
app/build.gradle
+2
-0
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+9
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
...c/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
+3
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
.../ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
+1
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
...va/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
+65
-0
app/src/main/res/layout/fragment_map.xml
app/src/main/res/layout/fragment_map.xml
+16
-0
app/src/main/res/raw/style_json.json
app/src/main/res/raw/style_json.json
+191
-0
gradle.properties
gradle.properties
+2
-0
No files found.
.idea/modules.xml
View file @
356d6b65
...
@@ -2,10 +2,12 @@
...
@@ -2,10 +2,12 @@
<project
version=
"4"
>
<project
version=
"4"
>
<component
name=
"ProjectModuleManager"
>
<component
name=
"ProjectModuleManager"
>
<modules>
<modules>
<module
fileurl=
"file://$PROJECT_DIR$/IITB-App.iml"
filepath=
"$PROJECT_DIR$/IITB-App.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/IITB-App.iml"
filepath=
"$PROJECT_DIR$/IITB-App.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/IITB-App.iml"
filepath=
"$PROJECT_DIR$/IITB-App.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/IITBApp.iml"
filepath=
"$PROJECT_DIR$/IITBApp.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/IITBApp.iml"
filepath=
"$PROJECT_DIR$/IITBApp.iml"
/>
<module
fileurl=
"file://D:\IITB-App\IITBApp.iml"
filepath=
"D:\IITB-App\IITBApp.iml"
/>
<module
fileurl=
"file://D:\IITB-App\IITBApp.iml"
filepath=
"D:\IITB-App\IITBApp.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/app/app.iml"
filepath=
"$PROJECT_DIR$/app/app.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/app/app.iml"
filepath=
"$PROJECT_DIR$/app/app.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/app/app.iml"
filepath=
"$PROJECT_DIR$/app/app.iml"
/>
</modules>
</modules>
</component>
</component>
</project>
</project>
\ No newline at end of file
app/build.gradle
View file @
356d6b65
...
@@ -11,6 +11,7 @@ android {
...
@@ -11,6 +11,7 @@ android {
versionCode
1
versionCode
1
versionName
"1.0"
versionName
"1.0"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
resValue
"string"
,
"google_maps_key"
,
(
project
.
findProperty
(
"GOOGLE_MAPS_API_KEY"
)
?:
""
)
}
}
buildTypes
{
buildTypes
{
release
{
release
{
...
@@ -29,6 +30,7 @@ dependencies {
...
@@ -29,6 +30,7 @@ dependencies {
compile
'net.openid:appauth:0.2.0'
compile
'net.openid:appauth:0.2.0'
testCompile
'junit:junit:4.12'
testCompile
'junit:junit:4.12'
compile
'com.android.support:design:25.3.1'
compile
'com.android.support:design:25.3.1'
compile
'com.google.android.gms:play-services-maps:10.2.6'
compile
'com.android.support.constraint:constraint-layout:1.0.2'
compile
'com.android.support.constraint:constraint-layout:1.0.2'
compile
'com.android.support:support-v4:25.3.1'
compile
'com.android.support:support-v4:25.3.1'
}
}
app/src/main/AndroidManifest.xml
View file @
356d6b65
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"in.ac.iitb.gymkhana.iitbapp"
>
package=
"in.ac.iitb.gymkhana.iitbapp"
>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<application
android:allowBackup=
"true"
android:icon=
"@mipmap/ic_launcher"
<application
android:allowBackup=
"true"
android:icon=
"@mipmap/ic_launcher"
android:label=
"@string/app_name"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:label=
"@string/app_name"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
>
android:supportsRtl=
"true"
android:theme=
"@style/AppTheme"
>
<meta-data
android:name=
"com.google.android.gms.version"
android:value=
"@integer/google_play_services_version"
/>
<!-- The API key for Google Maps-based APIs. -->
<meta-data
android:name=
"com.google.android.geo.API_KEY"
android:value=
"@string/google_maps_key"
/>
<activity
android:name=
".MainActivity"
android:label=
"@string/app_name"
<activity
android:name=
".MainActivity"
android:label=
"@string/app_name"
android:theme=
"@style/AppTheme.NoActionBar"
>
android:theme=
"@style/AppTheme.NoActionBar"
>
<intent-filter>
<intent-filter>
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @
356d6b65
...
@@ -17,6 +17,7 @@ import android.view.MenuItem;
...
@@ -17,6 +17,7 @@ import android.view.MenuItem;
import
android.view.View
;
import
android.view.View
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.MapFragment
;
public
class
MainActivity
extends
AppCompatActivity
public
class
MainActivity
extends
AppCompatActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
implements
NavigationView
.
OnNavigationItemSelectedListener
{
...
@@ -103,6 +104,8 @@ public class MainActivity extends AppCompatActivity
...
@@ -103,6 +104,8 @@ public class MainActivity extends AppCompatActivity
}
else
if
(
id
==
R
.
id
.
nav_timetable
)
{
}
else
if
(
id
==
R
.
id
.
nav_timetable
)
{
}
else
if
(
id
==
R
.
id
.
nav_map
)
{
}
else
if
(
id
==
R
.
id
.
nav_map
)
{
MapFragment
mapFragment
=
new
MapFragment
();
updateFragment
(
mapFragment
);
}
else
if
(
id
==
R
.
id
.
nav_contacts
)
{
}
else
if
(
id
==
R
.
id
.
nav_contacts
)
{
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
View file @
356d6b65
...
@@ -9,6 +9,7 @@ import android.view.ViewGroup;
...
@@ -9,6 +9,7 @@ import android.view.ViewGroup;
import
in.ac.iitb.gymkhana.iitbapp.R
;
import
in.ac.iitb.gymkhana.iitbapp.R
;
/**
/**
* A simple {@link Fragment} subclass.
* A simple {@link Fragment} subclass.
*/
*/
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/MapFragment.java
0 → 100644
View file @
356d6b65
package
in.ac.iitb.gymkhana.iitbapp.fragments
;
import
android.content.res.Resources
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
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.MapStyleOptions
;
import
com.google.android.gms.maps.model.MarkerOptions
;
import
in.ac.iitb.gymkhana.iitbapp.R
;
public
class
MapFragment
extends
Fragment
implements
OnMapReadyCallback
{
SupportMapFragment
gMapFragment
;
GoogleMap
gMap
=
null
;
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
// Inflate the layout for this fragment
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_map
,
container
,
false
);
gMapFragment
=
(
SupportMapFragment
)
this
.
getChildFragmentManager
().
findFragmentById
(
R
.
id
.
viewMap
);
gMapFragment
.
getMapAsync
(
this
);
return
view
;
}
@Override
public
void
onMapReady
(
GoogleMap
googleMap
)
{
try
{
// Customise the styling of the base map using a JSON object defined
// in a raw resource file.
boolean
success
=
googleMap
.
setMapStyle
(
MapStyleOptions
.
loadRawResourceStyle
(
getContext
(),
R
.
raw
.
style_json
));
if
(!
success
)
{
Log
.
e
(
"TAG"
,
"Style parsing failed."
);
}
}
catch
(
Resources
.
NotFoundException
e
)
{
Log
.
e
(
"TAG"
,
"Can't find style. Error: "
,
e
);
}
// Position the map's camera near Mumbai
LatLng
iitb
=
new
LatLng
(
19.1334
,
72.9133
);
googleMap
.
addMarker
(
new
MarkerOptions
().
position
(
iitb
)
.
title
(
"Marker in IITB"
));
googleMap
.
moveCamera
(
CameraUpdateFactory
.
newLatLng
(
iitb
));
}
}
app/src/main/res/layout/fragment_map.xml
0 → 100644
View file @
356d6b65
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
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"
xmlns:map=
"http://schemas.android.com/apk/res-auto"
tools:context=
"in.ac.iitb.gymkhana.iitbapp.fragments.MapFragment"
>
<fragment
android:id=
"@+id/viewMap"
android:layout_width=
"match_parent"
android:name=
"com.google.android.gms.maps.SupportMapFragment"
android:layout_height=
"match_parent"
map:cameraZoom=
"18"
/>
</FrameLayout>
\ No newline at end of file
app/src/main/res/raw/style_json.json
0 → 100644
View file @
356d6b65
[
{
"featureType"
:
"all"
,
"elementType"
:
"geometry"
,
"stylers"
:
[
{
"color"
:
"#242f3e"
}
]
},
{
"featureType"
:
"all"
,
"elementType"
:
"labels.text.stroke"
,
"stylers"
:
[
{
"lightness"
:
-80
}
]
},
{
"featureType"
:
"administrative"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#746855"
}
]
},
{
"featureType"
:
"administrative.locality"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#d59563"
}
]
},
{
"featureType"
:
"poi"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#d59563"
}
]
},
{
"featureType"
:
"poi.park"
,
"elementType"
:
"geometry"
,
"stylers"
:
[
{
"color"
:
"#263c3f"
}
]
},
{
"featureType"
:
"poi.park"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#6b9a76"
}
]
},
{
"featureType"
:
"road"
,
"elementType"
:
"geometry.fill"
,
"stylers"
:
[
{
"color"
:
"#2b3544"
}
]
},
{
"featureType"
:
"road"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#9ca5b3"
}
]
},
{
"featureType"
:
"road.arterial"
,
"elementType"
:
"geometry.fill"
,
"stylers"
:
[
{
"color"
:
"#38414e"
}
]
},
{
"featureType"
:
"road.arterial"
,
"elementType"
:
"geometry.stroke"
,
"stylers"
:
[
{
"color"
:
"#212a37"
}
]
},
{
"featureType"
:
"road.highway"
,
"elementType"
:
"geometry.fill"
,
"stylers"
:
[
{
"color"
:
"#746855"
}
]
},
{
"featureType"
:
"road.highway"
,
"elementType"
:
"geometry.stroke"
,
"stylers"
:
[
{
"color"
:
"#1f2835"
}
]
},
{
"featureType"
:
"road.highway"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#f3d19c"
}
]
},
{
"featureType"
:
"road.local"
,
"elementType"
:
"geometry.fill"
,
"stylers"
:
[
{
"color"
:
"#38414e"
}
]
},
{
"featureType"
:
"road.local"
,
"elementType"
:
"geometry.stroke"
,
"stylers"
:
[
{
"color"
:
"#212a37"
}
]
},
{
"featureType"
:
"transit"
,
"elementType"
:
"geometry"
,
"stylers"
:
[
{
"color"
:
"#2f3948"
}
]
},
{
"featureType"
:
"transit.station"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#d59563"
}
]
},
{
"featureType"
:
"water"
,
"elementType"
:
"geometry"
,
"stylers"
:
[
{
"color"
:
"#17263c"
}
]
},
{
"featureType"
:
"water"
,
"elementType"
:
"labels.text.fill"
,
"stylers"
:
[
{
"color"
:
"#515c6d"
}
]
},
{
"featureType"
:
"water"
,
"elementType"
:
"labels.text.stroke"
,
"stylers"
:
[
{
"lightness"
:
-20
}
]
}
]
gradle.properties
View file @
356d6b65
...
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
...
@@ -15,3 +15,5 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# org.gradle.parallel=true
GOOGLE_MAPS_API_KEY
=
AIzaSyB72DhM4E1NW0F-_SLnYtYYvz0rT9kne-U
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