Skip to content

Commit

Permalink
Corrects typo: messager to messenger (#472)
Browse files Browse the repository at this point in the history
  • Loading branch information
@pjleonard37
pjleonard37 committed Apr 4, 2024
1 parent 08e74d1 commit eda5b51
Show file tree
Hide file tree
Showing 27 changed files with 559 additions and 557 deletions.
18 changes: 9 additions & 9 deletions android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/AnnotationController.kt
View file
Expand Up @@ -3,7 +3,7 @@ package com.mapbox.maps.mapbox_maps.annotation
import com.mapbox.maps.MapView
import com.mapbox.maps.mapbox_maps.pigeons.*
import com.mapbox.maps.mapbox_maps.pigeons.OnPointAnnotationClickListener
import com.mapbox.maps.mapbox_maps.pigeons._PointAnnotationMessager
import com.mapbox.maps.mapbox_maps.pigeons._PointAnnotationMessenger
import com.mapbox.maps.plugin.annotation.AnnotationConfig
import com.mapbox.maps.plugin.annotation.AnnotationManager
import com.mapbox.maps.plugin.annotation.annotations
Expand Down Expand Up @@ -99,26 +99,26 @@ class AnnotationController(private val mapView: MapView) :
onCircleAnnotationClickListener = OnCircleAnnotationClickListener(messenger)
onPolygonAnnotationClickListener = OnPolygonAnnotationClickListener(messenger)
onPolylineAnnotationController = OnPolylineAnnotationClickListener(messenger)
_PointAnnotationMessager.setUp(messenger, pointAnnotationController)
_CircleAnnotationMessager.setUp(
_PointAnnotationMessenger.setUp(messenger, pointAnnotationController)
_CircleAnnotationMessenger.setUp(
messenger,
circleAnnotationController
)
_PolylineAnnotationMessager.setUp(
_PolylineAnnotationMessenger.setUp(
messenger,
polylineAnnotationController
)
_PolygonAnnotationMessager.setUp(
_PolygonAnnotationMessenger.setUp(
messenger,
polygonAnnotationController
)
}

fun dispose(messenger: BinaryMessenger) {
_PointAnnotationMessager.setUp(messenger, null)
_CircleAnnotationMessager.setUp(messenger, null)
_PolylineAnnotationMessager.setUp(messenger, null)
_PolygonAnnotationMessager.setUp(messenger, null)
_PointAnnotationMessenger.setUp(messenger, null)
_CircleAnnotationMessenger.setUp(messenger, null)
_PolylineAnnotationMessenger.setUp(messenger, null)
_PolygonAnnotationMessenger.setUp(messenger, null)
}

override fun getManager(managerId: String): AnnotationManager<*, *, *, *, *, *, *> {
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/CircleAnnotationController.kt
View file
Expand Up @@ -12,7 +12,7 @@ import toFLTCirclePitchAlignment
import toFLTCirclePitchScale
import toFLTCircleTranslateAnchor

class CircleAnnotationController(private val delegate: ControllerDelegate) : _CircleAnnotationMessager {
class CircleAnnotationController(private val delegate: ControllerDelegate) : _CircleAnnotationMessenger {
private val annotationMap = mutableMapOf<String, com.mapbox.maps.plugin.annotation.generated.CircleAnnotation>()
private val managerCreateAnnotationMap = mutableMapOf<String, MutableList<String>>()

Expand Down
2 changes: 1 addition & 1 deletion android/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PointAnnotationController.kt
View file
Expand Up @@ -35,7 +35,7 @@ import toTextTransform
import toTextTranslateAnchor
import java.io.ByteArrayOutputStream

class PointAnnotationController(private val delegate: ControllerDelegate) : _PointAnnotationMessager {
class PointAnnotationController(private val delegate: ControllerDelegate) : _PointAnnotationMessenger {
private val annotationMap = mutableMapOf<String, com.mapbox.maps.plugin.annotation.generated.PointAnnotation>()
private val managerCreateAnnotationMap = mutableMapOf<String, MutableList<String>>()

Expand Down
2 changes: 1 addition & 1 deletion ...oid/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolygonAnnotationController.kt
View file
Expand Up @@ -9,7 +9,7 @@ import com.mapbox.maps.plugin.annotation.generated.PolygonAnnotationManager
import toFLTFillTranslateAnchor
import toFillTranslateAnchor

class PolygonAnnotationController(private val delegate: ControllerDelegate) : _PolygonAnnotationMessager {
class PolygonAnnotationController(private val delegate: ControllerDelegate) : _PolygonAnnotationMessenger {
private val annotationMap = mutableMapOf<String, com.mapbox.maps.plugin.annotation.generated.PolygonAnnotation>()
private val managerCreateAnnotationMap = mutableMapOf<String, MutableList<String>>()

Expand Down
2 changes: 1 addition & 1 deletion ...id/src/main/kotlin/com/mapbox/maps/mapbox_maps/annotation/PolylineAnnotationController.kt
View file
Expand Up @@ -13,7 +13,7 @@ import toLineCap
import toLineJoin
import toLineTranslateAnchor

class PolylineAnnotationController(private val delegate: ControllerDelegate) : _PolylineAnnotationMessager {
class PolylineAnnotationController(private val delegate: ControllerDelegate) : _PolylineAnnotationMessenger {
private val annotationMap = mutableMapOf<String, com.mapbox.maps.plugin.annotation.generated.PolylineAnnotation>()
private val managerCreateAnnotationMap = mutableMapOf<String, MutableList<String>>()

Expand Down
42 changes: 21 additions & 21 deletions ..._maps/pigeons/CircleAnnotationMessager.kt → ...maps/pigeons/CircleAnnotationMessenger.kt
View file
Expand Up @@ -233,7 +233,7 @@ class OnCircleAnnotationClickListener(private val binaryMessenger: BinaryMesseng
}
}
@Suppress("UNCHECKED_CAST")
private object _CircleAnnotationMessagerCodec : StandardMessageCodec() {
private object _CircleAnnotationMessengerCodec : StandardMessageCodec() {
override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
return when (type) {
128.toByte() -> {
Expand Down Expand Up @@ -283,7 +283,7 @@ private object _CircleAnnotationMessagerCodec : StandardMessageCodec() {
}

/** Generated interface from Pigeon that represents a handler of messages from Flutter. */
interface _CircleAnnotationMessager {
interface _CircleAnnotationMessenger {
fun create(managerId: String, annotationOption: CircleAnnotationOptions, callback: (Result<CircleAnnotation>) -> Unit)
fun createMulti(managerId: String, annotationOptions: List<CircleAnnotationOptions>, callback: (Result<List<CircleAnnotation>>) -> Unit)
fun update(managerId: String, annotation: CircleAnnotation, callback: (Result<Unit>) -> Unit)
Expand All @@ -301,15 +301,15 @@ interface _CircleAnnotationMessager {
fun getCircleTranslateAnchor(managerId: String, callback: (Result<CircleTranslateAnchor?>) -> Unit)

companion object {
/** The codec used by _CircleAnnotationMessager. */
/** The codec used by _CircleAnnotationMessenger. */
val codec: MessageCodec<Any?> by lazy {
_CircleAnnotationMessagerCodec
_CircleAnnotationMessengerCodec
}
/** Sets up an instance of `_CircleAnnotationMessager` to handle messages through the `binaryMessenger`. */
/** Sets up an instance of `_CircleAnnotationMessenger` to handle messages through the `binaryMessenger`. */
@Suppress("UNCHECKED_CAST")
fun setUp(binaryMessenger: BinaryMessenger, api: _CircleAnnotationMessager?) {
fun setUp(binaryMessenger: BinaryMessenger, api: _CircleAnnotationMessenger?) {
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.create", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.create", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -330,7 +330,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.createMulti", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.createMulti", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -351,7 +351,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.update", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.update", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -371,7 +371,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.delete", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.delete", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -391,7 +391,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.deleteAll", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.deleteAll", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -410,7 +410,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.setCircleEmissiveStrength", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.setCircleEmissiveStrength", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -430,7 +430,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.getCircleEmissiveStrength", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.getCircleEmissiveStrength", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -450,7 +450,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.setCirclePitchAlignment", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.setCirclePitchAlignment", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -470,7 +470,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.getCirclePitchAlignment", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.getCirclePitchAlignment", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -490,7 +490,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.setCirclePitchScale", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.setCirclePitchScale", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -510,7 +510,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.getCirclePitchScale", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.getCirclePitchScale", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -530,7 +530,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.setCircleTranslate", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.setCircleTranslate", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -550,7 +550,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.getCircleTranslate", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.getCircleTranslate", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -570,7 +570,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.setCircleTranslateAnchor", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.setCircleTranslateAnchor", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand All @@ -590,7 +590,7 @@ interface _CircleAnnotationMessager {
}
}
run {
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessager.getCircleTranslateAnchor", codec)
val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.mapbox_maps_flutter._CircleAnnotationMessenger.getCircleTranslateAnchor", codec)
if (api != null) {
channel.setMessageHandler { message, reply ->
val args = message as List<Any?>
Expand Down

0 comments on commit eda5b51

Please sign in to comment.