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
756d9335
Commit
756d9335
authored
Jan 16, 2018
by
Owais Chunawala
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add location FAB functionality
parent
c2d729ee
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
310 additions
and
7 deletions
+310
-7
app/build.gradle
app/build.gradle
+3
-2
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MapFragment.java
...ava/in/ac/iitb/gymkhana/iitbapp/fragment/MapFragment.java
+300
-3
app/src/main/res/layout/fragment_map.xml
app/src/main/res/layout/fragment_map.xml
+1
-1
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+4
-0
gradle.properties
gradle.properties
+2
-1
No files found.
app/build.gradle
View file @
756d9335
...
@@ -41,15 +41,16 @@ dependencies {
...
@@ -41,15 +41,16 @@ dependencies {
compile
"net.openid:appauth:${appAuthVersion}"
compile
"net.openid:appauth:${appAuthVersion}"
testCompile
"junit:junit:4.12"
testCompile
"junit:junit:4.12"
compile
"com.android.support:design:${supportLibVersion}"
compile
"com.android.support:design:${supportLibVersion}"
compile
"com.google.android.gms:play-services-maps:${playServicesVersion}"
compile
"com.android.support:support-v4:${supportLibVersion}"
compile
"com.android.support:support-v4:${supportLibVersion}"
compile
"com.jakewharton:butterknife:${butterKnifeVersion}"
compile
"com.jakewharton:butterknife:${butterKnifeVersion}"
compile
"com.google.android.gms:play-services-gcm:
${playServicesVersion}
"
compile
"com.google.android.gms:play-services-gcm:
11.6.2
"
annotationProcessor
"com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
annotationProcessor
"com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
compile
"com.squareup.retrofit2:retrofit:${retrofitVersion}"
compile
"com.squareup.retrofit2:retrofit:${retrofitVersion}"
compile
"com.squareup.retrofit2:converter-gson:${retrofitVersion}"
compile
"com.squareup.retrofit2:converter-gson:${retrofitVersion}"
compile
"com.squareup.okhttp3:okhttp:${okhttpVersion}"
compile
"com.squareup.okhttp3:okhttp:${okhttpVersion}"
compile
"com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
compile
"com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
compile
"com.squareup.picasso:picasso:${picassoVersion}"
compile
"com.squareup.picasso:picasso:${picassoVersion}"
compile
'com.google.android.gms:play-services-maps:11.6.2'
compile
'com.google.android.gms:play-services-location:11.6.2'
}
}
apply
plugin:
'com.google.gms.google-services'
apply
plugin:
'com.google.gms.google-services'
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/MapFragment.java
View file @
756d9335
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/fragment_map.xml
View file @
756d9335
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<!--TODO: Change colours-->
<!--TODO: Change colours-->
<android.support.design.widget.FloatingActionButton
<android.support.design.widget.FloatingActionButton
android:id=
"@+id/location"
android:id=
"@+id/location
_button
"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom|end"
android:layout_gravity=
"bottom|end"
...
...
app/src/main/res/values/strings.xml
View file @
756d9335
...
@@ -8,4 +8,8 @@
...
@@ -8,4 +8,8 @@
<!-- TODO: Remove or change this placeholder text -->
<!-- TODO: Remove or change this placeholder text -->
<string
name=
"hello_blank_fragment"
>
Hello blank fragment
</string>
<string
name=
"hello_blank_fragment"
>
Hello blank fragment
</string>
<string
name=
"Cancel"
>
Cancel
</string>
<string
name=
"gps_network_not_enabled"
>
Location is not enabled. Please turn on your location from the settings.
</string>
<string
name=
"open_location_settings"
>
Open Location Settings
</string>
</resources>
</resources>
gradle.properties
View file @
756d9335
...
@@ -17,4 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
...
@@ -17,4 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
# org.gradle.parallel=true
# org.gradle.parallel=true
# TODO Replace Key and put in local:properties
# TODO Replace Key and put in local:properties
GOOGLE_MAPS_API_KEY
=
AIzaSyB72DhM4E1NW0F-_SLnYtYYvz0rT9kne-U
#GOOGLE_MAPS_API_KEY=AIzaSyB72DhM4E1NW0F-_SLnYtYYvz0rT9kne-U
GOOGLE_MAPS_API_KEY
=
AIzaSyC31o6h06Z36V8M0lXgkGj4Y1cmNRVV9s0
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