diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..368e4ee --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..13c4629 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..39b4e24 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..5e5e2a7 --- /dev/null +++ b/README.md @@ -0,0 +1,64 @@ +# Google Maps Directions API - polyline drawer helper + +## What is it? +It's small library written in Kotlin to utilize Google Directions API calls +and convert response to PolylineOptions, ready to add to GoogleMap. + +## Why should I use it? +Well, you don't have to. But if you already reading this - +consider using it if you don't want to parse nested jsons by yourself. + +## How do I use it? + +### Add dependency + +That's simple. First - add dependency to your build.gradle: + +You must also provide google maps core dependency: + +```groovy +implementation : "com.google.android.gms:play-services-maps:11.8.0" +``` + +### Create instance of DirectionsApiClient: + +```kotlin +class AnotherBoringMapActivity : Activity(){ + fun createClient() { + directionsApiClient = DirectionsApiClient( + apiKey = getString(R.string.google_directions_key)) + } +} +``` + +### Request route between points +```kotlin +class AnotherBoringMapActivity : Activity(){ + fun requestRoute(from : LatLng, to: LatLng){ + directionsApiClient.getRoutePolylines(origin = from, dest = to) { + //do something with list of PolylineOptions + //remember, that you are not on main thread here + } + } +} +``` + +### Customize request! +You can add some customization to Directions API request, just look at TransitOptions class. +You can specify transit mode, and what to avoid during route planning. + +### Write your own parser! +Yeah! That's possible! Just implement **Converter>** and you are ready to go! + +### I still don't know hot to use it +Look at example in this repo, in **app** directory. + +## I want to improve this library! +Sure! Pull requests are welcome! Any reasonable extension will be added. + +## Tools used: +* [Google Maps API](https://developers.google.com/maps/) +* [Kotlin Coroutines](https://kotlinlang.org/docs/reference/coroutines.html) +* [OkHttp](https://github.com/square/okhttp) +* [Retrofit](http://square.github.io/retrofit/) +* [Retrofit coroutines extensions](https://github.com/gildor/kotlin-coroutines-retrofit) diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..d77f574 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/* +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..ce0dd91 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,33 @@ +apply plugin: 'com.android.application' + +apply plugin: 'kotlin-android' + +apply plugin: 'kotlin-android-extensions' + +android { + compileSdkVersion 27 + buildToolsVersion "27.0.3" + defaultConfig { + applicationId "me.rozkmin.googlemapsdraw" + minSdkVersion 19 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation supportDependencies.values() + implementation mapsDependencies.googleMapsCore + + implementation project(":gmapspolyline") + implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml new file mode 100644 index 0000000..2bd4265 --- /dev/null +++ b/app/src/debug/res/values/google_maps_api.xml @@ -0,0 +1,22 @@ + + + YOUR_KEY_HERE + DIRECTIONS_KEY_HERE + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..b8c1320 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/me/rozkmin/googlemapsdraw/MapsActivity.kt b/app/src/main/java/me/rozkmin/googlemapsdraw/MapsActivity.kt new file mode 100644 index 0000000..cd5fc75 --- /dev/null +++ b/app/src/main/java/me/rozkmin/googlemapsdraw/MapsActivity.kt @@ -0,0 +1,84 @@ +package me.rozkmin.googlemapsdraw + +import android.support.v7.app.AppCompatActivity +import android.os.Bundle + +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.Marker +import com.google.android.gms.maps.model.MarkerOptions +import com.google.android.gms.maps.model.Polyline +import me.rozkmin.gmapspolyline.AVOID +import me.rozkmin.gmapspolyline.DirectionsApiClient +import me.rozkmin.gmapspolyline.MODE +import me.rozkmin.gmapspolyline.TransitOptions + +class MapsActivity : AppCompatActivity(), OnMapReadyCallback { + + private lateinit var googleMap: GoogleMap + private lateinit var directionsApiClient: DirectionsApiClient + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_maps) + + val mapFragment = supportFragmentManager + .findFragmentById(R.id.map) as SupportMapFragment + mapFragment.getMapAsync(this) + + directionsApiClient = DirectionsApiClient( + apiKey = getString(R.string.google_directions_key), + logHttp = true) + } + + override fun onMapReady(googleMap: GoogleMap) { + this.googleMap = googleMap + + val krk = LatLng(50.052, 19.944) + this.googleMap.addMarker( + MarkerOptions() + .position(krk) + .draggable(false) + .title("Marker in Kraków")) + + this.googleMap.addMarker( + MarkerOptions() + .position(krk) + .draggable(true) + .title("Drag me") + ) + + this.googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(krk, 13f)) + + this.googleMap.setOnMarkerDragListener(object : GoogleMap.OnMarkerDragListener { + override fun onMarkerDragEnd(marker: Marker) { + getPolylineToRoute(marker.position, krk) + } + + override fun onMarkerDragStart(p0: Marker?) {} + + override fun onMarkerDrag(p0: Marker?) {} + }) + } + + private val mutableList: MutableList = mutableListOf() + + fun getPolylineToRoute(from: LatLng, to: LatLng) { + mutableList.forEach { it.remove() } + mutableList.clear() + + val transitOptions = TransitOptions(mode = MODE.WALKING, whatToAvoidArray = arrayOf(AVOID.FERRIES, AVOID.HIGHWAYS)) + + directionsApiClient.getRoutePolylines(origin = from, dest = to, options = transitOptions) { + runOnUiThread { + it.forEach { + //you can do additional polyline customization here + mutableList.add(googleMap.addPolyline(it)) + } + } + } + } +} diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..1cd2a36 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml new file mode 100644 index 0000000..face739 --- /dev/null +++ b/app/src/main/res/layout/activity_maps.xml @@ -0,0 +1,8 @@ + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..00f9eaa --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..00f9eaa --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..5507303 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..4e526c9 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..8fab6a3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..6bc7fcd Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..2c38c71 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..1eecc0e Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..ec87dce Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..072467e Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..05ca079 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..6f67f21 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..78a6b7a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..8bac0f2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..0327e13 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..68ebe33 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..bacd3e7 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/app/src/main/res/values/google_maps_api.xml b/app/src/main/res/values/google_maps_api.xml new file mode 100644 index 0000000..8a9c59b --- /dev/null +++ b/app/src/main/res/values/google_maps_api.xml @@ -0,0 +1,21 @@ + + + YOUR_KEY_HERE + DIRECTIONS_KEY_HERE + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..12a6b9f --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + GoogleMaps Draw + Map + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/release/res/values/google_maps_api.xml b/app/src/release/res/values/google_maps_api.xml new file mode 100644 index 0000000..8a9c59b --- /dev/null +++ b/app/src/release/res/values/google_maps_api.xml @@ -0,0 +1,21 @@ + + + YOUR_KEY_HERE + DIRECTIONS_KEY_HERE + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4ff3913 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +apply from: 'dependencies.gradle' +buildscript { + ext.android_plugin_version = '2.3.3' + ext.kotlin_version = '1.2.21' + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.0.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/dependencies.gradle b/dependencies.gradle new file mode 100644 index 0000000..0a9cb79 --- /dev/null +++ b/dependencies.gradle @@ -0,0 +1,66 @@ +ext { + + def SupportLibrary = '27.0.2' + def FirebaseVersion = '11.6.2' + def ConstraintVersion = '1.0.2' + def RxAndroidVersion = '2.0.1' + def RxJavaVersion = '2.1.3' + def RxKotlinVersion = '2.1.0' + def RetrofitVersion = '2.3.0' + def OkHttpVersion = '3.9.0' + def GlideVersion = '4.1.1' + def DaggerVersion = '2.11' + def MapMeVersion = '1.0.4' + + supportDependencies = [ + design : "com.android.support:design:${SupportLibrary}", + recyclerView: "com.android.support:recyclerview-v7:${SupportLibrary}", + cardView : "com.android.support:cardview-v7:${SupportLibrary}", + appCompat : "com.android.support:appcompat-v7:${SupportLibrary}", + support : "com.android.support:support-v4:${SupportLibrary}", + constraint : "com.android.support.constraint:constraint-layout:${ConstraintVersion}" + ] + + dataBinding = [ + kapt: "com.android.databinding:compiler:${android_plugin_version}" + ] + + kotlinDependencies = [ + reflect: "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}", + stdlib : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlin_version}" + ] + + rxJavaDependencies = [ + rxJava : "io.reactivex.rxjava2:rxjava:${RxJavaVersion}", + rxKotlin : "io.reactivex.rxjava2:rxkotlin:${RxKotlinVersion}", + rxAndroid: "io.reactivex.rxjava2:rxandroid:${RxAndroidVersion}" + ] + + retrofitDependencies = [ + retrofit : "com.squareup.retrofit2:retrofit:${RetrofitVersion}", + retrofitGsonConverter: "com.squareup.retrofit2:converter-gson:${RetrofitVersion}", + retrofitRxJavaAdapter: "com.squareup.retrofit2:adapter-rxjava2:${RetrofitVersion}", + couroutinesAdapter : "ru.gildor.coroutines:kotlin-coroutines-retrofit:0.9.0", + okHttp3 : "com.squareup.okhttp3:okhttp:${OkHttpVersion}", + okHttp3Logging : "com.squareup.okhttp3:logging-interceptor:${OkHttpVersion}" + ] + + mapsDependencies = [ + mapMe : "nz.co.trademe.mapme:mapme:${MapMeVersion}", + googleMaps : "nz.co.trademe.mapme:googlemaps:${MapMeVersion}", + googleMapsCore: "com.google.android.gms:play-services-maps:11.8.0", + drawRoute : "com.github.ar-android:DrawRouteMaps:1.0.0" + ] + + imageDependencies = [ + compile: "com.github.bumptech.glide:glide:${GlideVersion}", + kapt : "com.github.bumptech.glide:compiler:${GlideVersion}" + ] + + daggerDependencies = [ + daggerKapt : "com.google.dagger:dagger-compiler:${DaggerVersion}", + daggerCompile : "com.google.dagger:dagger:${DaggerVersion}", + daggerProvided: "org.glassfish:javax.annotation:10.0-b28" + ] + +} \ No newline at end of file diff --git a/gmapspolyline/.gitignore b/gmapspolyline/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/gmapspolyline/.gitignore @@ -0,0 +1 @@ +/build diff --git a/gmapspolyline/build.gradle b/gmapspolyline/build.gradle new file mode 100644 index 0000000..61ee1f4 --- /dev/null +++ b/gmapspolyline/build.gradle @@ -0,0 +1,40 @@ +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 19 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + api mapsDependencies.googleMapsCore + compile retrofitDependencies.values() + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() +} +kotlin { + experimental { + coroutines "enable" + } +} diff --git a/gmapspolyline/proguard-rules.pro b/gmapspolyline/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/gmapspolyline/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/gmapspolyline/src/main/AndroidManifest.xml b/gmapspolyline/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1272c61 --- /dev/null +++ b/gmapspolyline/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/Converter.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/Converter.kt new file mode 100644 index 0000000..4f59bf0 --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/Converter.kt @@ -0,0 +1,8 @@ +package me.rozkmin.gmapspolyline + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +interface Converter { + fun convert(from: FROM) : TO +} \ No newline at end of file diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApi.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApi.kt new file mode 100644 index 0000000..3e3dd7b --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApi.kt @@ -0,0 +1,31 @@ +package me.rozkmin.gmapspolyline + +import com.google.gson.annotations.SerializedName +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Url + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +interface DirectionsApi { + @GET + fun getGeocodeDirectionsResponse(@Url requestOptions : String) : Call +} + +data class GeocodedResponse(val routes: List = listOf()) + +data class RouteElement(val legs: List) + +data class Leg(val steps: List) + +data class Step( + @SerializedName("start_location") + val start: LatLngStep, + @SerializedName("end_location") + val end: LatLngStep, + val polyline: Poly) + +data class Poly(val points: String = "") + +data class LatLngStep(val lat: Double, val lng: Double) \ No newline at end of file diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApiClient.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApiClient.kt new file mode 100644 index 0000000..dbd0f2d --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/DirectionsApiClient.kt @@ -0,0 +1,80 @@ +package me.rozkmin.gmapspolyline + +import android.util.Log +import com.google.android.gms.maps.model.LatLng +import com.google.android.gms.maps.model.PolylineOptions +import kotlinx.coroutines.experimental.launch +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import ru.gildor.coroutines.retrofit.awaitResponse + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +class DirectionsApiClient( + private val apiKey: String, + logHttp: Boolean = false, + private val polylineConverter: Converter> = PolylineConverter()) { + + companion object { + val TAG: String = DirectionsApiClient::class.java.canonicalName + } + + private val googleMapsApi: DirectionsApi + + init { + val client = OkHttpClient.Builder() + .apply { + if (logHttp) { + val httpLoggingInterceptor = HttpLoggingInterceptor(HttpLoggingInterceptor.Logger { p0 -> Log.d(TAG, p0) }) + httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY + addInterceptor(httpLoggingInterceptor) + } + } + .build() + + val retrofit = Retrofit.Builder() + .baseUrl("https://maps.googleapis.com/maps/api/directions/") + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build() + + googleMapsApi = retrofit.create(DirectionsApi::class.java) + } + + fun getRoutePolylines(origin: LatLng, dest: LatLng, + options: TransitOptions = TransitOptions(), + status: (STATE, STATUS) -> Unit = { _, _ -> }, + polylines: (List) -> Unit) { + + status(STATE.START, STATUS.NONE) + + launch { + status(STATE.LOADING, STATUS.NONE) + val data = googleMapsApi.getGeocodeDirectionsResponse(getUrl(origin, dest, options)).awaitResponse() + + if (data.isSuccessful) { + polylines(polylineConverter.convert(data.body())) + status(STATE.END, STATUS.SUCCESS) + } else { + status(STATE.END, STATUS.ERROR) + } + } + } + + private fun getUrl(origin: LatLng, dest: LatLng, transitOptions: TransitOptions): String = StringBuilder().apply { + append("json?") + append("origin=" + origin.latitude + "," + origin.longitude) + append("&destination=" + dest.latitude + "," + dest.longitude) + append("&sensor=${transitOptions.sensor}") + append("&mode=${transitOptions.mode.type}") + + if (transitOptions.hasWhatToAvoid()) { + append("&avoid=${transitOptions.whatToAvoid()}") + } + append("&key=$apiKey") + }.toString() + +} \ No newline at end of file diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/PolylineConverter.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/PolylineConverter.kt new file mode 100644 index 0000000..34e6036 --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/PolylineConverter.kt @@ -0,0 +1,25 @@ +package me.rozkmin.gmapspolyline + +import com.google.android.gms.maps.model.LatLng +import com.google.android.gms.maps.model.PolylineOptions + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +class PolylineConverter : Converter> { + override fun convert(from: GeocodedResponse?): List { + val polylineMutableList = mutableListOf() + from?.apply { + routes.forEach { + it.legs.forEach { + polylineMutableList.addAll(it.steps.map { + PolylineOptions() + .add(LatLng(it.start.lat, it.start.lng)) + .add(LatLng(it.end.lat, it.end.lng)) + }) + } + } + } + return polylineMutableList.toList() + } +} \ No newline at end of file diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/RequestCoroutineState.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/RequestCoroutineState.kt new file mode 100644 index 0000000..47f8137 --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/RequestCoroutineState.kt @@ -0,0 +1,12 @@ +package me.rozkmin.gmapspolyline + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +enum class STATE { + START, LOADING, END +} + +enum class STATUS { + SUCCESS, ERROR, NONE +} \ No newline at end of file diff --git a/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/TransitOptions.kt b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/TransitOptions.kt new file mode 100644 index 0000000..cd77c9c --- /dev/null +++ b/gmapspolyline/src/main/java/me/rozkmin/gmapspolyline/TransitOptions.kt @@ -0,0 +1,36 @@ +package me.rozkmin.gmapspolyline + +/** + * Created by jaroslawmichalik on 23.02.2018 + */ +class TransitOptions( + val sensor: Boolean = false, + val mode: MODE = MODE.DRIVING, + private val whatToAvoidArray: Array = arrayOf()) { + + fun hasWhatToAvoid() = whatToAvoidArray.isNotEmpty() + + fun whatToAvoid(): String { + val stringBuilder = StringBuilder() + for (a in whatToAvoidArray){ + stringBuilder.append(a.thing) + stringBuilder.append("|") + } + if(stringBuilder.isNotEmpty()) stringBuilder.deleteCharAt(stringBuilder.lastIndex) + + return stringBuilder.toString() + } +} + +enum class MODE(val type: String) { + WALKING("walking"), + DRIVING("driving"), + BICYCLING("bicycling"), + TRANSIT("transit") +} + +enum class AVOID(val thing: String) { + TOLLS("tolls"), + HIGHWAYS("highways"), + FERRIES("ferries") +} \ No newline at end of file diff --git a/gmapspolyline/src/main/res/values/strings.xml b/gmapspolyline/src/main/res/values/strings.xml new file mode 100644 index 0000000..86aa7d1 --- /dev/null +++ b/gmapspolyline/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + GMapsPolyLine + diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# 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 +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f3417cf --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Feb 23 20:10:23 CET 2018 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..9eb1fa0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app', ':gmapspolyline'