From 5054a8121c72f7d5efe58ace678fe3e0497962d7 Mon Sep 17 00:00:00 2001 From: Cyrus Bakhtiari-Haftlang Date: Fri, 20 Dec 2019 14:32:26 +0100 Subject: [PATCH] attach now accepts a nullable `View` as it actually always have used it safely --- .../nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt | 8 +++----- mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt b/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt index c881100..d4d379c 100644 --- a/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt +++ b/googlemaps/src/main/java/nz/co/trademe/mapme/googlemaps/GoogleMapMeAdapter.kt @@ -3,9 +3,7 @@ package nz.co.trademe.mapme.googlemaps import android.content.Context import com.google.android.gms.maps.GoogleMap import nz.co.trademe.mapme.MapMeAdapter -import nz.co.trademe.mapme.annotations.MapAnnotation -import nz.co.trademe.mapme.annotations.OnInfoWindowClickListener - -abstract class GoogleMapMeAdapter(context: Context) : MapMeAdapter(context, GoogleMapAnnotationFactory()){ -} +abstract class GoogleMapMeAdapter( + context: Context +) : MapMeAdapter(context, GoogleMapAnnotationFactory()) \ No newline at end of file diff --git a/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt b/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt index fa1e572..8cf79f2 100644 --- a/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt +++ b/mapme/src/main/java/nz/co/trademe/mapme/MapMeAdapter.kt @@ -35,7 +35,7 @@ abstract class MapMeAdapter(var context: Context, var factory: Annotati abstract fun getItemCount(): Int - fun attach(mapView: View, map: MapType) { + fun attach(mapView: View?, map: MapType) { this.map = map this.mapView = mapView this.factory.setOnMarkerClickListener(map, { marker -> notifyAnnotatedMarkerClicked(marker) }) @@ -516,7 +516,7 @@ abstract class MapMeAdapter(var context: Context, var factory: Annotati } @VisibleForTesting - open internal fun triggerUpdateProcessor(runnable: Runnable) { + internal open fun triggerUpdateProcessor(runnable: Runnable) { mapView?.post(runnable) }