Bump navigation-sample to NavSDK 7.0.

Author: cwoodwar6

navigation-sample/app/build.gradle

@@ -21,22 +21,22 @@ apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 ext {
     androidxLifecycleVersion = "2.6.2"
     glideVersion = "4.13.2"
-    navSdkVersion = "6.3.0"
+    navSdkVersion = "7.0.0"
 }
 
 android {
     namespace 'com.example.navigationapidemo'
-    compileSdkVersion 34
+    compileSdk 36
 
     buildFeatures {
         buildConfig true
     }
 
     defaultConfig {
         applicationId "com.example.navigationapidemo"
-        // Navigation SDK supports a minimum of SDK 23.
-        minSdkVersion 23
-        targetSdkVersion 34
+        // Navigation SDK supports a minimum of SDK 24.
+        minSdkVersion 24
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         // Set this to the languages you actually use, otherwise you'll include resource strings
@@ -93,7 +93,7 @@ dependencies {
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
     // And dependencies.
-    api "androidx.appcompat:appcompat:1.6.1"
+    api "androidx.appcompat:appcompat:1.7.1"
     api "androidx.cardview:cardview:1.0.0"
     api "androidx.constraintlayout:constraintlayout:2.1.4"
     api "androidx.customview:customview:1.1.0"
@@ -114,7 +114,7 @@ dependencies {
     api "joda-time:joda-time:2.10.14"
     // Also include the Google Places SDK, which is used by this example, but
     // isn't required by the Navigation SDK.
-    api "com.google.android.libraries.places:places:2.5.0"
+    api "com.google.android.libraries.places:places:4.0.0"
     api "com.google.android.material:material:1.12.0"
     api 'org.jetbrains.kotlin:kotlin-reflect:2.1.10'
     api 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'

navigation-sample/app/src/main/AndroidManifest.xml

@@ -273,15 +273,16 @@ internal object CustomizationPanelsDelegate {
   }
 
   fun Navigator.logDebugInfo() {
-    if (currentRouteSegment != null) {
-      val stringifiedCurrentRouteSegment =
+    currentRouteSegment?.let {
+      Log.i(
+        TAG,
         MoreObjects.toStringHelper("RouteSegment")
-          .add("Destination LatLng", currentRouteSegment.destinationLatLng)
-          .add("Destination Waypoint", currentRouteSegment.destinationWaypoint)
-          .add("Traffic Data", currentRouteSegment.trafficData)
-          .add("List<LatLng> for segment", currentRouteSegment.latLngs)
-          .toString()
-      Log.i(TAG, stringifiedCurrentRouteSegment)
+          .add("Destination LatLng", it.destinationLatLng)
+          .add("Destination Waypoint", it.destinationWaypoint)
+          .add("Traffic Data", it.trafficData)
+          .add("List<LatLng> for segment", it.latLngs)
+          .toString(),
+      )
     }
 
     val stringifiedTraveledRoute =
@@ -290,14 +291,15 @@ internal object CustomizationPanelsDelegate {
         .toString()
     Log.i(TAG, stringifiedTraveledRoute)
 
-    if (currentTimeAndDistance != null) {
-      val stringifiedCurrentTimeAndDistance =
-        MoreObjects.toStringHelper(currentTimeAndDistance)
-          .add("Delay severity", currentTimeAndDistance.delaySeverity)
-          .add("Meters", currentTimeAndDistance.meters)
-          .add("Seconds", currentTimeAndDistance.seconds)
-          .toString()
-      Log.i(TAG, stringifiedCurrentTimeAndDistance)
+    currentTimeAndDistance?.let {
+      Log.i(
+        TAG,
+        MoreObjects.toStringHelper(it)
+          .add("Delay severity", it.delaySeverity)
+          .add("Meters", it.meters)
+          .add("Seconds", it.seconds)
+          .toString(),
+      )
     }
   }
 

navigation-sample/app/src/main/java/com/example/navigationapidemo/CustomizationPanelsDelegate.kt

@@ -0,0 +1,99 @@
+package com.example.navigationapidemo
+
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.google.auto.value.AutoValue
+
+/** Utility to support Edge-To-Edge mode for devices running Android V+. */
+object EdgeToEdgeUtil {
+  /**
+   * Configuration to set up margins for {@link View}s supporting Edge-To-Edge mode with Android V+.
+   */
+  data class EdgeToEdgeMarginConfig(
+    /** The {@link View} the margins need to be applied to. */
+    val view: View,
+
+    /** If the top margin should be applied, {@code false} otherwise. */
+    val shouldSetTopMargin: Boolean = true,
+
+    /** If the bottom margin should be applied, {@code false} otherwise. */
+    val shouldSetBottomMargin: Boolean = true,
+
+    /** If the left margin should be applied, {@code false} otherwise. */
+    val shouldSetLeftMargin: Boolean = true,
+
+    /** If the right margin should be applied, {@code false} otherwise. */
+    val shouldSetRightMargin: Boolean = true,
+  )
+
+  /**
+   * Edge-To-Edge mode is enabled by default on devices running Android V and above. As a result,
+   * margins should be set for devices targeting Android V and higher so that they are not hidden
+   * behind the system bars and remain accessible.
+   *
+   * <p>Note: The margins are applied when the edge-to-edge is enabled and because we are not
+   * manually enabling it, they'll be applied only for Android V+ devices.
+   *
+   * @param edgeToEdgeMarginConfig, the configuration that requires to set margins.
+   */
+  fun setMarginForEdgeToEdgeSupport(edgeToEdgeMarginConfig: EdgeToEdgeMarginConfig): Unit {
+    applyMargins(listOf(edgeToEdgeMarginConfig))
+  }
+
+  /**
+   * Edge-To-Edge mode is enabled by default on devices running Android V and above. As a result,
+   * margins should be set for devices targeting Android V and higher so that they are not hidden
+   * behind the system bars and remain accessible.
+   *
+   * <p>Note: The margins are applied when the edge-to-edge is enabled and because we are not
+   * manually enabling it, they'll be applied only for Android V+ devices.
+   *
+   * @param edgeToEdgeMarginConfigs, the list of configurations that requires to set margins.
+   */
+  fun setMarginForEdgeToEdgeSupport(edgeToEdgeMarginConfigs: List<EdgeToEdgeMarginConfig>): Unit {
+    applyMargins(edgeToEdgeMarginConfigs)
+  }
+
+  /**
+   * Applies margins for the provided configs.
+   *
+   * <p>A callback is provided to the window inset listener to adjust margins, ensuring that views
+   * are not obscured by the system bars.
+   *
+   * <p>Note: The callbacks are only invoked when the edge-to-edge is enabled and because we are not
+   * manually enabling it, they'll be invoked for Android V+ devices.
+   *
+   * @param edgeToEdgeMarginConfigs, the list of configurations that requires to set margins.
+   */
+  fun applyMargins(edgeToEdgeMarginConfigs: List<EdgeToEdgeMarginConfig>): Unit {
+    for (edgeToEdgeMarginConfig in edgeToEdgeMarginConfigs) {
+      ViewCompat.setOnApplyWindowInsetsListener(
+        edgeToEdgeMarginConfig.view,
+        { v, windowInsets ->
+          val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+          // Apply the insets as a margin to the view.
+          val mlp = v.layoutParams as MarginLayoutParams
+          if (edgeToEdgeMarginConfig.shouldSetLeftMargin) {
+            mlp.leftMargin = insets.left
+          }
+          if (edgeToEdgeMarginConfig.shouldSetRightMargin) {
+            mlp.rightMargin = insets.right
+          }
+          if (edgeToEdgeMarginConfig.shouldSetTopMargin) {
+            mlp.topMargin = insets.top
+          }
+          if (edgeToEdgeMarginConfig.shouldSetBottomMargin) {
+            mlp.bottomMargin = insets.bottom
+          }
+          v.layoutParams = mlp
+
+          // Return the window insets to keep passing down to descendant views.
+          windowInsets
+        },
+      )
+    }
+  }
+}

navigation-sample/app/src/main/java/com/example/navigationapidemo/EdgeToEdgeUtil.kt

@@ -22,12 +22,21 @@ import android.widget.AdapterView.OnItemClickListener
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import androidx.appcompat.app.AppCompatActivity
+import com.example.navigationapidemo.EdgeToEdgeUtil.EdgeToEdgeMarginConfig
 
 /** Main activity that lets the user choose a demo to launch. */
 class MainActivity : AppCompatActivity() {
   public override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.main)
+
+    // Margins are only set if the edge-to-edge mode is enabled, it's enabled by default for Android
+    // V+ devices.
+    // No margins are set for pre-Android V devices.
+    EdgeToEdgeUtil.setMarginForEdgeToEdgeSupport(
+      listOf(EdgeToEdgeMarginConfig(view = findViewById(R.id.main_layout_container)))
+    )
+
     val listAdapter = ArrayAdapter(this, android.R.layout.simple_list_item_1, DEMOS.keys.toList())
     val listView = findViewById<ListView>(R.id.list_view)
     listView.adapter = listAdapter

navigation-sample/app/src/main/java/com/example/navigationapidemo/MainActivity.kt

@@ -28,6 +28,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import com.example.navigationapidemo.CustomizationPanelsDelegate.logDebugInfo
+import com.example.navigationapidemo.EdgeToEdgeUtil.EdgeToEdgeMarginConfig
 import com.google.android.libraries.navigation.NavigationApi
 import com.google.android.libraries.navigation.NavigationApi.NavigatorListener
 import com.google.android.libraries.navigation.Navigator
@@ -37,6 +38,7 @@ import com.google.android.libraries.navigation.SupportNavigationFragment
 import com.google.android.libraries.navigation.Waypoint
 import com.google.android.libraries.navigation.Waypoint.UnsupportedPlaceIdException
 import com.google.android.libraries.places.api.model.Place
+import com.google.android.libraries.places.api.model.PlaceTypes
 import java.lang.Exception
 
 /**
@@ -59,6 +61,13 @@ class NavFragmentActivity : AppCompatActivity() {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_nav_fragment)
 
+    // Margins are only set if the edge-to-edge mode is enabled, it's enabled by default for Android
+    // V+ devices.
+    // No margins are set for pre-Android V devices.
+    EdgeToEdgeUtil.setMarginForEdgeToEdgeSupport(
+      listOf(EdgeToEdgeMarginConfig(view = findViewById(R.id.nav_fragment_layout_container)))
+    )
+
     // Obtain a reference to the NavigationFragment
     navFragment =
       supportFragmentManager.findFragmentById(R.id.navigation_fragment) as SupportNavigationFragment
@@ -145,21 +154,21 @@ class NavFragmentActivity : AppCompatActivity() {
     )
 
     withMapAsync {
-        CustomizationPanelsDelegate.setUpCameraPerspectiveSpinner(
-          this@NavFragmentActivity,
-          map::followMyLocation,
-        )
-        // The logic below simply helps keep the UI in tune with the underlying SDK
-        // state.
-        CustomizationPanelsDelegate.registerOnCameraFollowLocationCallback(
-          this@NavFragmentActivity,
-          map,
-        )
+      CustomizationPanelsDelegate.setUpCameraPerspectiveSpinner(
+        this@NavFragmentActivity,
+        map::followMyLocation,
+      )
+      // The logic below simply helps keep the UI in tune with the underlying SDK
+      // state.
+      CustomizationPanelsDelegate.registerOnCameraFollowLocationCallback(
+        this@NavFragmentActivity,
+        map,
+      )
 
-        CustomizationPanelsDelegate.registerOnNavigationUiChangedListener(
-          this@NavFragmentActivity,
-          navFragment::addOnNavigationUiChangedListener,
-        )
+      CustomizationPanelsDelegate.registerOnNavigationUiChangedListener(
+        this@NavFragmentActivity,
+        navFragment::addOnNavigationUiChangedListener,
+      )
     }
   }
 
@@ -205,7 +214,7 @@ class NavFragmentActivity : AppCompatActivity() {
    */
   private fun navigateToPlace(place: Place) {
     val waypoint: Waypoint? =
-      if (place.types?.contains(Place.Type.GEOCODE) == true) {
+      if (place.placeTypes?.contains(PlaceTypes.GEOCODE) == true) {
         // An example of setting a destination via Lat-Lng.
         // Note: Setting LatLng destinations can result in poor routing quality/ETA calculation.
         // Wherever possible you should use a Place ID to describe the destination accurately.