Merge pull request apptreesoftware#91 from apptreesoftware/revert-60-…

…master Revert "Listener for backbuttonpressed"
elricym · Jul 20, 2018 · c5fe218 · c5fe218
2 parents e2c0131 + e788d34
commit c5fe218
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 228 deletions.
diff --git a/android/src/main/kotlin/com/apptreesoftware/mapview/MapActivity.kt b/android/src/main/kotlin/com/apptreesoftware/mapview/MapActivity.kt
@@ -19,223 +19,6 @@ import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.*
 
 class MapActivity : AppCompatActivity(),
-
-    OnMapReadyCallback {
-  var googleMap : GoogleMap? = null
-  var markerIdLookup = HashMap<String, Marker>()
-  val PermissionRequest = 1
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    setContentView(R.layout.map_fragment)
-    title = MapViewPlugin.mapTitle
-    val mapFragment = supportFragmentManager.findFragmentById(
-        R.id.map) as SupportMapFragment
-    mapFragment.getMapAsync(this)
-    MapViewPlugin.mapActivity = this
-  }
-
-  @SuppressLint("MissingPermission")
-  override fun onMapReady(map: GoogleMap) {
-    googleMap = map
-
-    map.setMapType(MapViewPlugin.mapViewType)
-
-    if (MapViewPlugin.showUserLocation) {
-      if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
-          != PackageManager.PERMISSION_GRANTED) {
-        val array = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION,
-                            Manifest.permission.ACCESS_COARSE_LOCATION)
-        ActivityCompat.requestPermissions(this, array, PermissionRequest)
-      } else {
-        map.isMyLocationEnabled = true
-        map.uiSettings.isMyLocationButtonEnabled = MapViewPlugin.showUserLocation
-        map.uiSettings.isIndoorLevelPickerEnabled = true
-      }
-    }
-
-    map.setOnMapClickListener { latLng ->
-        MapViewPlugin.mapTapped(latLng)
-    }
-    map.setOnMarkerClickListener { marker ->
-      MapViewPlugin.annotationTapped(marker.tag as String)
-      false
-    }
-    map.setOnCameraMoveListener {
-      val pos = map.cameraPosition
-      MapViewPlugin.cameraPositionChanged(pos)
-    }
-    map.setOnMyLocationChangeListener {
-      val loc = map.myLocation ?: return@setOnMyLocationChangeListener
-      MapViewPlugin.locationDidUpdate(loc)
-    }
-    map.setOnInfoWindowClickListener{ marker ->
-        MapViewPlugin.infoWindowTapped(marker.tag as String)
-    }
-    map.moveCamera(CameraUpdateFactory.newCameraPosition(
-        MapViewPlugin.initialCameraPosition))
-      MapViewPlugin.onMapReady()
-  }
-
-  override fun onBackPressed(){
-    MapViewPlugin.onBackButtonTapped()
-    super.onBackPressed()
-  }
-
-  override fun onCreateOptionsMenu(menu: Menu): Boolean {
-    MapViewPlugin.toolbarActions.forEach {
-      val item = menu.add(0, it.identifier, 0, it.title)
-      item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
-    }
-    return super.onCreateOptionsMenu(menu)
-  }
-
-
-  override fun onOptionsItemSelected(item: MenuItem): Boolean {
-      MapViewPlugin.handleToolbarAction(item.itemId)
-    return true
-  }
-
-  override fun onDestroy() {
-    super.onDestroy()
-    MapViewPlugin.mapActivity = null
-  }
-
-  val zoomLevel : Float get() {
-    return googleMap?.cameraPosition?.zoom ?: 0.0.toFloat()
-  }
-
-  val target : LatLng
-      get() = googleMap?.cameraPosition?.target ?: LatLng(0.0,
-                                                                                            0.0)
-
-  fun setCamera(target : LatLng, zoom : Float){
-    googleMap?.animateCamera(
-        CameraUpdateFactory.newLatLngZoom(target, zoom))
-  }
-
-  fun setAnnotations(annotations : List<MapAnnotation>) {
-    val map = this.googleMap ?: return
-    map.clear()
-    markerIdLookup.clear()
-    for (annotation in annotations) {
-      val marker = createMarkerForAnnotation(annotation, map)
-      markerIdLookup[annotation.identifier] = marker
-    }
-  }
-
-  fun addMarker(annotation : MapAnnotation) {
-    val map = this.googleMap ?: return
-    val existingMarker = markerIdLookup[annotation.identifier]
-    if (existingMarker != null) return
-    val marker = createMarkerForAnnotation(annotation, map)
-    markerIdLookup.put(annotation.identifier, marker)
-  }
-
-  fun removeMarker(annotation : MapAnnotation) {
-    this.googleMap ?: return
-    val existingMarker = markerIdLookup[annotation.identifier] ?: return
-    markerIdLookup.remove(annotation.identifier)
-    existingMarker.remove()
-  }
-
-  val visibleMarkers : List<String> get() {
-    val map = this.googleMap ?: return  emptyList()
-    val region = map.projection.visibleRegion
-    val visibleIds = ArrayList<String>()
-    for (marker in markerIdLookup.values) {
-      if (region.latLngBounds.contains(marker.position)) {
-        visibleIds.add(marker.tag as String)
-      }
-    }
-    return visibleIds
-  }
-
-  fun zoomToAnnotations(padding : Int) {
-    val map = this.googleMap ?: return
-    val bounds = LatLngBounds.Builder()
-    var count = 0
-    for (marker in markerIdLookup.values) {
-      bounds.include(marker.position)
-      count++
-    }
-
-    if(map.isMyLocationEnabled && map.myLocation != null) {
-      if (count == 0) {
-        map.animateCamera(CameraUpdateFactory.newLatLngZoom(
-            LatLng(map.myLocation.latitude,
-                                                     map.myLocation.longitude), 12.toFloat()))
-        return
-      }
-      bounds.include(LatLng(map.myLocation.latitude,
-                            map.myLocation.longitude))
-    }
-    try {
-      map.animateCamera(
-          CameraUpdateFactory.newLatLngBounds(bounds.build(), padding))
-    } catch (e : Exception) {}
-  }
-
-  fun zoomTo(annoationIds : List<String>, padding : Float) {
-    val map = this.googleMap ?: return
-    if (annoationIds.size == 1) {
-      val marker = markerIdLookup[annoationIds.first()] ?: return
-      map.animateCamera(
-          CameraUpdateFactory.newLatLngZoom(marker.position,
-                                            18.toFloat()))
-      return
-    }
-    val bounds = LatLngBounds.Builder()
-    for (id in annoationIds) {
-      val marker = markerIdLookup[id] ?: continue
-      bounds.include(marker.position)
-    }
-    try {
-      map.animateCamera(
-          CameraUpdateFactory.newLatLngBounds(bounds.build(),
-                                              padding.toInt()))
-    } catch (e : Exception) {}
-  }
-
-  fun createMarkerForAnnotation(annotation: MapAnnotation, map: GoogleMap) : Marker {
-    val marker : Marker
-    if (annotation is ClusterAnnotation) {
-      marker = map
-          .addMarker(MarkerOptions()
-                         .position(annotation.coordinate)
-                         .title(annotation.title)
-                         .icon(
-                             BitmapDescriptorFactory.defaultMarker(
-                                 annotation.colorHue)))
-      marker.tag = annotation.identifier
-    } else {
-      marker = map
-          .addMarker(MarkerOptions()
-                         .position(annotation.coordinate)
-                         .title(annotation.title)
-                         .icon(
-                             BitmapDescriptorFactory.defaultMarker(
-                                 annotation.colorHue)))
-      marker.tag = annotation.identifier
-    }
-    return marker
-  }
-
-  @SuppressLint("MissingPermission")
-  override fun onRequestPermissionsResult(requestCode: Int,
-                                          permissions: Array<out String>,
-                                          grantResults: IntArray) {
-    when(requestCode) {
-      PermissionRequest -> {
-        if ( grantResults[0] == PackageManager.PERMISSION_GRANTED ) {
-          this.googleMap?.isMyLocationEnabled = true
-          this.googleMap?.uiSettings?.isMyLocationButtonEnabled = true
-        }
-      }
-      else -> super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-    }
-  }
-
         OnMapReadyCallback {
     var googleMap: GoogleMap? = null
     var markerIdLookup = HashMap<String, Marker>()

diff --git a/android/src/main/kotlin/com/apptreesoftware/mapview/MapViewPlugin.kt b/android/src/main/kotlin/com/apptreesoftware/mapview/MapViewPlugin.kt
@@ -149,10 +149,6 @@ class MapViewPlugin(val activity: Activity) : MethodCallHandler {
             this.channel.invokeMethod("infoWindowTapped", id)
         }
 
-        fun onBackButtonTapped() {
-            this.channel.invokeMethod("backButtonTapped", null)
-        }
-
         fun getAssetFileDecriptor(asset: String): AssetFileDescriptor {
             val assetManager = registrar.context().getAssets()
             val key = registrar.lookupKeyForAsset(asset)

diff --git a/lib/map_view.dart b/lib/map_view.dart
@@ -45,8 +45,6 @@ class MapView {
       new StreamController.broadcast();
   StreamController<Marker> _infoWindowStreamController =
       new StreamController.broadcast();
-  StreamController<Null> _backPressedStreamController =
-      new StreamController.broadcast();
 
   Map<String, Marker> _annotations = {};
   Map<String, Polyline> _polylines = {};
@@ -264,8 +262,6 @@ class MapView {
 
   Stream<Marker> get onInfoWindowTapped => _infoWindowStreamController.stream;
 
-  Stream<Null> get onBackPressed => _backPressedStreamController.stream;
-
   Future<dynamic> _handleMethod(MethodCall call) async {
     switch (call.method) {
       case "onMapReady":
@@ -347,9 +343,6 @@ class MapView {
       case "onToolbarAction":
         _toolbarActionStreamController.add(call.arguments);
         break;
-      case "backButtonTapped":
-        _backPressedStreamController.add(null);
-        return new Future.value("");
     }
     return new Future.value("");
   }