fix(streetview): add instruction banner, center map on Sydney, and sync camera tracking in SplitStreetView demo

Author: dkhawk

ApiDemos/project/common-ui/src/main/res/layout/split_street_view_panorama_and_map_demo.xml

@@ -31,24 +31,37 @@
         app:layout_constraintTop_toTopOf="parent"
         app:title="@string/split_street_view_panorama_and_map_demo_label" />
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/instructions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorSurfaceVariant"
+        android:textColor="?attr/colorOnSurfaceVariant"
+        android:padding="8dp"
+        android:gravity="center"
+        android:text="@string/split_street_view_instructions"
+        app:layout_constraintTop_toBottomOf="@id/topAppBar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/streetviewpanorama"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:name="com.google.android.gms.maps.SupportStreetViewPanoramaFragment"
-        app:layout_constraintTop_toBottomOf="@id/topAppBar"
+        app:layout_constraintTop_toBottomOf="@id/instructions"
+        app:layout_constraintBottom_toTopOf="@id/map"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/map"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:name="com.google.android.gms.maps.SupportMapFragment"
         app:layout_constraintTop_toBottomOf="@id/streetviewpanorama"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

ApiDemos/project/common-ui/src/main/res/values/strings.xml

@@ -208,6 +208,7 @@
     <string name="request_position">Position</string>
     <string name="split_street_view_panorama_and_map_demo_description">Demonstrates how to show a Street View panorama and map.</string>
     <string name="split_street_view_panorama_and_map_demo_label">Street View Panorama and Map</string>
+    <string name="split_street_view_instructions">Long-press &amp; drag Pegman on the map to jump Street View. Tap arrows in Street View to walk.</string>
     <string name="street_view_panorama_basic_demo_description">Standard Street View Panorama using a Fragment.</string>
     <string name="street_view_panorama_basic_demo_label">Street View Panorama</string>
     <string name="street_view_panorama_events_demo_description">Standard Street View Panorama with event handling.</string>

ApiDemos/project/java-app/src/main/java/com/example/mapdemo/SplitStreetViewPanoramaAndMapDemoActivity.java

@@ -15,6 +15,7 @@
 
 package com.example.mapdemo;
 
+import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnMarkerDragListener;
 import com.google.android.gms.maps.OnMapReadyCallback;
@@ -45,7 +46,7 @@ public class SplitStreetViewPanoramaAndMapDemoActivity extends SamplesBaseActivi
     private static final LatLng SYDNEY = new LatLng(-33.87365, 151.20689);
 
     private StreetViewPanorama streetViewPanorama;
-
+    private GoogleMap map;
     private Marker marker;
 
     @Override
@@ -82,10 +83,12 @@ public void onStreetViewPanoramaReady(StreetViewPanorama panorama) {
                 (SupportMapFragment) getSupportFragmentManager().findFragmentById(com.example.common_ui.R.id.map);
         mapFragment.getMapAsync(new OnMapReadyCallback() {
             @Override
-            public void onMapReady(GoogleMap map) {
-                map.setOnMarkerDragListener(SplitStreetViewPanoramaAndMapDemoActivity.this);
+            public void onMapReady(GoogleMap googleMap) {
+                map = googleMap;
+                googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(markerPosition, 16f));
+                googleMap.setOnMarkerDragListener(SplitStreetViewPanoramaAndMapDemoActivity.this);
                 // Creates a draggable marker. Long press to drag.
-                marker = map.addMarker(new MarkerOptions()
+                marker = googleMap.addMarker(new MarkerOptions()
                         .position(markerPosition)
                         .icon(BitmapDescriptorFactory.fromResource(com.example.common_ui.R.drawable.pegman))
                         .draggable(true));
@@ -104,6 +107,9 @@ protected void onSaveInstanceState(Bundle outState) {
     public void onStreetViewPanoramaChange(StreetViewPanoramaLocation location) {
         if (location != null) {
             marker.setPosition(location.position);
+            if (map != null) {
+                map.animateCamera(CameraUpdateFactory.newLatLng(location.position));
+            }
         }
     }
 
@@ -114,6 +120,9 @@ public void onMarkerDragStart(Marker marker) {
     @Override
     public void onMarkerDragEnd(Marker marker) {
         streetViewPanorama.setPosition(marker.getPosition(), 150);
+        if (map != null) {
+            map.animateCamera(CameraUpdateFactory.newLatLng(marker.getPosition()));
+        }
     }
 
     @Override

ApiDemos/project/kotlin-app/src/main/java/com/example/kotlindemos/SplitStreetViewPanoramaAndMapDemoActivity.kt

@@ -18,6 +18,8 @@ import android.view.View
 import androidx.core.os.BundleCompat
 import com.example.common_ui.R
 
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
 import com.google.android.gms.maps.GoogleMap.OnMarkerDragListener
 import com.google.android.gms.maps.StreetViewPanorama
 import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaChangeListener
@@ -31,6 +33,7 @@ import com.google.android.gms.maps.model.*
 class SplitStreetViewPanoramaAndMapDemoActivity : SamplesBaseActivity(),
     OnMarkerDragListener, OnStreetViewPanoramaChangeListener {
     var streetViewPanorama: StreetViewPanorama? = null
+    var map: GoogleMap? = null
     var marker: Marker? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,10 +56,12 @@ class SplitStreetViewPanoramaAndMapDemoActivity : SamplesBaseActivity(),
         }
         val mapFragment =
             supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment?
-        mapFragment?.getMapAsync { map ->
-            map.setOnMarkerDragListener(this@SplitStreetViewPanoramaAndMapDemoActivity)
+        mapFragment?.getMapAsync { googleMap ->
+            map = googleMap
+            googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(markerPosition, 16f))
+            googleMap.setOnMarkerDragListener(this@SplitStreetViewPanoramaAndMapDemoActivity)
             // Creates a draggable marker. Long press to drag.
-            marker = map.addMarker(
+            marker = googleMap.addMarker(
                 MarkerOptions()
                     .position(markerPosition)
                     .icon(BitmapDescriptorFactory.fromResource(R.drawable.pegman))
@@ -76,11 +81,13 @@ class SplitStreetViewPanoramaAndMapDemoActivity : SamplesBaseActivity(),
 
     override fun onStreetViewPanoramaChange(location: StreetViewPanoramaLocation) {
         marker?.position = location.position
+        map?.animateCamera(CameraUpdateFactory.newLatLng(location.position))
     }
 
     override fun onMarkerDragStart(marker: Marker) {}
     override fun onMarkerDragEnd(marker: Marker) {
         streetViewPanorama?.setPosition(marker.position, 150)
+        map?.animateCamera(CameraUpdateFactory.newLatLng(marker.position))
     }
 
     override fun onMarkerDrag(marker: Marker) {}