From 712ec5fb71b7d13ead212ceef9120500462f4d54 Mon Sep 17 00:00:00 2001
From: Kyle Madsen <kyle.mdsn@gmail.com>
Date: Thu, 22 Sep 2022 10:26:13 -0700
Subject: [PATCH] add method chaining

---
 extension-androidauto/api/extension-androidauto.api         | 6 +++---
 extension-androidauto/api/metalava.txt                      | 6 +++---
 .../com/mapbox/maps/extension/androidauto/MapboxCarMap.kt   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extension-androidauto/api/extension-androidauto.api b/extension-androidauto/api/extension-androidauto.api
index 4055fc2f4d..2bbf5f99ee 100644
--- a/extension-androidauto/api/extension-androidauto.api
+++ b/extension-androidauto/api/extension-androidauto.api
@@ -7,7 +7,7 @@ public class com/mapbox/maps/extension/androidauto/DefaultMapboxCarMapGestureHan
 
 public final class com/mapbox/maps/extension/androidauto/MapboxCarMap {
 	public fun <init> ()V
-	public final fun clearObservers ()V
+	public final fun clearObservers ()Lcom/mapbox/maps/extension/androidauto/MapboxCarMap;
 	public final fun getCarContext ()Landroidx/car/app/CarContext;
 	public final fun getCarMapSurface ()Lcom/mapbox/maps/extension/androidauto/MapboxCarMapSurface;
 	public final fun getEdgeInsets ()Lcom/mapbox/maps/EdgeInsets;
@@ -15,9 +15,9 @@ public final class com/mapbox/maps/extension/androidauto/MapboxCarMap {
 	public final fun getVisibleArea ()Landroid/graphics/Rect;
 	public final fun prepareSurfaceCallback (Landroidx/car/app/CarContext;Lcom/mapbox/maps/MapInitOptions;)Landroidx/car/app/SurfaceCallback;
 	public final fun registerObserver (Lcom/mapbox/maps/extension/androidauto/MapboxCarMapObserver;)Lcom/mapbox/maps/extension/androidauto/MapboxCarMap;
-	public final fun setGestureHandler (Lcom/mapbox/maps/extension/androidauto/MapboxCarMapGestureHandler;)V
+	public final fun setGestureHandler (Lcom/mapbox/maps/extension/androidauto/MapboxCarMapGestureHandler;)Lcom/mapbox/maps/extension/androidauto/MapboxCarMap;
 	public final fun setup (Landroidx/car/app/CarContext;Lcom/mapbox/maps/MapInitOptions;)Lcom/mapbox/maps/extension/androidauto/MapboxCarMap;
-	public final fun unregisterObserver (Lcom/mapbox/maps/extension/androidauto/MapboxCarMapObserver;)V
+	public final fun unregisterObserver (Lcom/mapbox/maps/extension/androidauto/MapboxCarMapObserver;)Lcom/mapbox/maps/extension/androidauto/MapboxCarMap;
 }
 
 public final class com/mapbox/maps/extension/androidauto/MapboxCarMapEx {
diff --git a/extension-androidauto/api/metalava.txt b/extension-androidauto/api/metalava.txt
index 34a0cfb852..f4dd3f0ae0 100644
--- a/extension-androidauto/api/metalava.txt
+++ b/extension-androidauto/api/metalava.txt
@@ -7,7 +7,7 @@ package com.mapbox.maps.extension.androidauto {
 
   @com.mapbox.maps.MapboxExperimental public final class MapboxCarMap {
     ctor public MapboxCarMap();
-    method public void clearObservers();
+    method public com.mapbox.maps.extension.androidauto.MapboxCarMap clearObservers();
     method public androidx.car.app.CarContext getCarContext();
     method public com.mapbox.maps.extension.androidauto.MapboxCarMapSurface? getCarMapSurface();
     method public com.mapbox.maps.EdgeInsets? getEdgeInsets();
@@ -15,9 +15,9 @@ package com.mapbox.maps.extension.androidauto {
     method public android.graphics.Rect? getVisibleArea();
     method @com.mapbox.maps.MapboxExperimental public androidx.car.app.SurfaceCallback prepareSurfaceCallback(androidx.car.app.CarContext carContext, com.mapbox.maps.MapInitOptions mapInitOptions);
     method public com.mapbox.maps.extension.androidauto.MapboxCarMap registerObserver(com.mapbox.maps.extension.androidauto.MapboxCarMapObserver mapboxCarMapObserver);
-    method public void setGestureHandler(com.mapbox.maps.extension.androidauto.MapboxCarMapGestureHandler? gestureHandler);
+    method public com.mapbox.maps.extension.androidauto.MapboxCarMap setGestureHandler(com.mapbox.maps.extension.androidauto.MapboxCarMapGestureHandler? gestureHandler);
     method public com.mapbox.maps.extension.androidauto.MapboxCarMap setup(androidx.car.app.CarContext carContext, com.mapbox.maps.MapInitOptions mapInitOptions);
-    method public void unregisterObserver(com.mapbox.maps.extension.androidauto.MapboxCarMapObserver mapboxCarMapObserver);
+    method public com.mapbox.maps.extension.androidauto.MapboxCarMap unregisterObserver(com.mapbox.maps.extension.androidauto.MapboxCarMapObserver mapboxCarMapObserver);
     property public final androidx.car.app.CarContext carContext;
     property public final com.mapbox.maps.extension.androidauto.MapboxCarMapSurface? carMapSurface;
     property public final com.mapbox.maps.EdgeInsets? edgeInsets;
diff --git a/extension-androidauto/src/main/java/com/mapbox/maps/extension/androidauto/MapboxCarMap.kt b/extension-androidauto/src/main/java/com/mapbox/maps/extension/androidauto/MapboxCarMap.kt
index 55fe9160a3..ce51ea68c5 100644
--- a/extension-androidauto/src/main/java/com/mapbox/maps/extension/androidauto/MapboxCarMap.kt
+++ b/extension-androidauto/src/main/java/com/mapbox/maps/extension/androidauto/MapboxCarMap.kt
@@ -128,14 +128,14 @@ class MapboxCarMap {
   /**
    * @param mapboxCarMapObserver the instance used in [registerObserver]
    */
-  fun unregisterObserver(mapboxCarMapObserver: MapboxCarMapObserver) {
+  fun unregisterObserver(mapboxCarMapObserver: MapboxCarMapObserver) = apply {
     carMapSurfaceOwner.unregisterObserver(mapboxCarMapObserver)
   }
 
   /**
    * Optional function to clear all observers registered through [registerObserver]
    */
-  fun clearObservers() {
+  fun clearObservers() = apply {
     carMapSurfaceOwner.clearObservers()
   }
 
@@ -145,7 +145,7 @@ class MapboxCarMap {
    * interface, or override the [DefaultMapboxCarMapGestureHandler], or set to null to disable
    * gesture handling.
    */
-  fun setGestureHandler(gestureHandler: MapboxCarMapGestureHandler?) {
+  fun setGestureHandler(gestureHandler: MapboxCarMapGestureHandler?) = apply {
     carMapSurfaceOwner.gestureHandler = gestureHandler
   }
 }
\ No newline at end of file