diff --git a/map-sample/app/build.gradle b/map-sample/app/build.gradle index fda21b7..166471a 100755 --- a/map-sample/app/build.gradle +++ b/map-sample/app/build.gradle @@ -21,12 +21,12 @@ apply plugin: 'org.jetbrains.kotlin.android' ext { androidxLifecycleVersion = "2.6.2" glideVersion = "4.13.2" - navSdkVersion = "6.0.0" + navSdkVersion = "6.2.0" } android { namespace 'com.example.mapdemo' - compileSdkVersion 33 + compileSdkVersion 34 buildFeatures { buildConfig true @@ -38,7 +38,7 @@ android { minSdkVersion 23 // This example targets SDK 30 so that there's no need to explicitly include permissions // flows in the app. - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" // Set this to the languages you actually use, otherwise you'll include resource strings @@ -90,7 +90,7 @@ dependencies { // Add LeakCanary to debugImplementation because LeakCanary should only run // in debug builds. - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' // And dependencies. api "androidx.appcompat:appcompat:1.6.1" @@ -103,7 +103,8 @@ dependencies { api "androidx.mediarouter:mediarouter:1.4.0" api "androidx.preference:preference:1.2.1" api "androidx.recyclerview:recyclerview:1.3.1" - api "androidx.transition:transition:1.4.1" + api "androidx.transition:transition:1.5.1" + api "androidx.viewpager2:viewpager2:1.0.0" api "androidx.window:window:1.1.0" api "com.github.bumptech.glide:glide:${glideVersion}" api "com.google.android.datatransport:transport-api:3.0.0" @@ -112,8 +113,8 @@ dependencies { api 'com.google.errorprone:error_prone_annotations:2.11.0' api "joda-time:joda-time:2.10.14" api "com.google.android.material:material:1.5.0" - api 'org.jetbrains.kotlin:kotlin-reflect:2.0.0' - api 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0' + api 'org.jetbrains.kotlin:kotlin-reflect:2.1.10' + api 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10' annotationProcessor "androidx.annotation:annotation:1.7.0" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" diff --git a/map-sample/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java index b3fab51..b4ccb9f 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java @@ -1,11 +1,11 @@ /* - * Copyright (C) 2012 The Android Open Source Project + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.CheckBox; import android.widget.CompoundButton; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java index a9f6c1b..8be90d4 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java @@ -18,10 +18,10 @@ import android.content.res.Resources; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java index b1660ce..b3193f7 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java @@ -18,12 +18,12 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.widget.CompoundButton; import android.widget.SeekBar; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java index e2a7bc6..e7bd64d 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java @@ -20,12 +20,12 @@ import android.graphics.Point; import android.location.Location; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnCircleClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java index 73cd324..a0dc5d7 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java @@ -18,8 +18,8 @@ import android.content.res.Resources; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener; import com.google.android.gms.maps.GoogleMap.OnMapClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java index fbe0e7f..0f32ee9 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java index aa9da27..547d724 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java @@ -17,13 +17,13 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentPagerAdapter; -import androidx.appcompat.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import androidx.viewpager.widget.ViewPager; import com.google.android.gms.maps.SupportMapFragment; import com.google.android.libraries.navigation.SupportNavigationFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MapStylingDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MapStylingDemoActivity.java index 27beefe..8a1a4e3 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MapStylingDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MapStylingDemoActivity.java @@ -18,9 +18,9 @@ import android.content.res.Resources; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MarkerAnchorsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MarkerAnchorsDemoActivity.java index 149e993..6b0968e 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MarkerAnchorsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MarkerAnchorsDemoActivity.java @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java index 216bfaa..b311994 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java @@ -21,7 +21,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import androidx.appcompat.app.AppCompatActivity; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; import android.util.Log; @@ -37,6 +36,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.InfoWindowAdapter; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MultiMapWithNavDrawerDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MultiMapWithNavDrawerDemoActivity.java index 7d24a60..fb957db 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MultiMapWithNavDrawerDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MultiMapWithNavDrawerDemoActivity.java @@ -17,8 +17,8 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.MapView; import com.google.android.libraries.navigation.NavigationView; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java index 99013f5..9b09800 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java @@ -20,11 +20,11 @@ import android.content.pm.PackageManager; import android.location.Location; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.Toast; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/PermissionUtils.java b/map-sample/app/src/main/java/com/example/mapdemo/PermissionUtils.java index 555d861..d088c30 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/PermissionUtils.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/PermissionUtils.java @@ -22,10 +22,10 @@ import android.content.DialogInterface; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.fragment.app.DialogFragment; -import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; +import androidx.fragment.app.DialogFragment; /** Utility class for access to runtime permissions. */ public abstract class PermissionUtils { diff --git a/map-sample/app/src/main/java/com/example/mapdemo/PolygonControlFragmentPagerAdapter.java b/map-sample/app/src/main/java/com/example/mapdemo/PolygonControlFragmentPagerAdapter.java index 784feb2..f7c23b9 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/PolygonControlFragmentPagerAdapter.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/PolygonControlFragmentPagerAdapter.java @@ -16,10 +16,10 @@ package com.example.mapdemo; +import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; -import android.view.ViewGroup; import java.util.HashMap; import java.util.Map; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java index 2b9dd20..3d94939 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java @@ -18,8 +18,8 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.RadioGroup; +import androidx.appcompat.app.AppCompatActivity; import androidx.viewpager.widget.ViewPager; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/PolylineControlFragmentPagerAdapter.java b/map-sample/app/src/main/java/com/example/mapdemo/PolylineControlFragmentPagerAdapter.java index cce9104..1e7e7dc 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/PolylineControlFragmentPagerAdapter.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/PolylineControlFragmentPagerAdapter.java @@ -16,10 +16,10 @@ package com.example.mapdemo; +import android.view.ViewGroup; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; -import android.view.ViewGroup; import java.util.HashMap; import java.util.Map; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java index e10a06c..37bad68 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java @@ -18,8 +18,8 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.RadioGroup; +import androidx.appcompat.app.AppCompatActivity; import androidx.viewpager.widget.ViewPager; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java index a8e4ab2..ba4e02c 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java @@ -19,8 +19,8 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.appcompat.app.AppCompatActivity; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java index 2f2f1f1..25676f3 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.fragment.app.FragmentActivity; import android.view.View; import android.widget.CheckBox; import android.widget.ImageView; +import androidx.fragment.app.FragmentActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.SnapshotReadyCallback; import com.google.android.gms.maps.OnMapReadyCallback; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewLatLngAnywhereDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewLatLngAnywhereDemoActivity.java index 17291fe..ec07669 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewLatLngAnywhereDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewLatLngAnywhereDemoActivity.java @@ -17,7 +17,6 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.KeyEvent; import android.view.View; import android.widget.AdapterView; @@ -31,6 +30,7 @@ import android.widget.TextView.OnEditorActionListener; import android.widget.Toast; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.StreetViewPanorama; import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaChangeListener; import com.google.android.gms.maps.SupportStreetViewPanoramaFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaAnywhereDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaAnywhereDemoActivity.java index e05a350..c28de6c 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaAnywhereDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaAnywhereDemoActivity.java @@ -17,7 +17,6 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.util.Pair; import android.view.KeyEvent; import android.view.View; @@ -30,6 +29,7 @@ import android.widget.TextView.OnEditorActionListener; import android.widget.Toast; import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.StreetViewPanorama; import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaChangeListener; import com.google.android.gms.maps.SupportStreetViewPanoramaFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java index 9148585..d8607a1 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java @@ -19,8 +19,8 @@ import android.content.res.Resources; import android.graphics.Point; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.OnStreetViewPanoramaReadyCallback; import com.google.android.gms.maps.StreetViewPanorama; import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaCameraChangeListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java index 12a758e..039192c 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.SeekBar; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.StreetViewPanorama; import com.google.android.gms.maps.SupportStreetViewPanoramaFragment; import com.google.android.gms.maps.model.LatLng; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java index 75ececa..257526b 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java @@ -17,10 +17,10 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.StreetViewPanorama; import com.google.android.gms.maps.SupportStreetViewPanoramaFragment; import com.google.android.gms.maps.model.LatLng; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java index 6ec2bc8..035d2ea 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java @@ -17,8 +17,8 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.ViewGroup.LayoutParams; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.StreetViewPanoramaOptions; import com.google.android.gms.maps.StreetViewPanoramaView; import com.google.android.gms.maps.model.LatLng; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java index 32c0129..531f59c 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java @@ -18,8 +18,8 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnCircleClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java index 6b5a62c..b1b4035 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java @@ -17,9 +17,9 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java index 77a4b1b..cbb1447 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayDemoActivity.java @@ -17,11 +17,11 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayOnStyledMapDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayOnStyledMapDemoActivity.java index c6cd5b7..30235cf 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayOnStyledMapDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/TileOverlayOnStyledMapDemoActivity.java @@ -17,11 +17,11 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/ToolbarDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/ToolbarDemoActivity.java index 1a028f0..7a3a5ce 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/ToolbarDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/ToolbarDemoActivity.java @@ -18,9 +18,9 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnMapLongClickListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/TopStylesDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/TopStylesDemoActivity.java index 857c6e9..e1cb414 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/TopStylesDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/TopStylesDemoActivity.java @@ -17,7 +17,6 @@ package com.example.mapdemo; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; @@ -25,6 +24,7 @@ import android.widget.CheckBox; import android.widget.Spinner; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.SupportMapFragment; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java index 313ada5..2004e80 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/UiSettingsDemoActivity.java @@ -19,10 +19,10 @@ import android.Manifest; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.widget.CheckBox; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java index ce1fb1e..d9b4e0e 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/VisibleRegionDemoActivity.java @@ -20,12 +20,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import androidx.appcompat.app.AppCompatActivity; import android.view.View; import android.view.animation.Interpolator; import android.view.animation.OvershootInterpolator; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener; diff --git a/map-sample/app/src/main/java/com/example/mapdemo/ZIndexDemoActivity.java b/map-sample/app/src/main/java/com/example/mapdemo/ZIndexDemoActivity.java index 1f488c8..716c643 100644 --- a/map-sample/app/src/main/java/com/example/mapdemo/ZIndexDemoActivity.java +++ b/map-sample/app/src/main/java/com/example/mapdemo/ZIndexDemoActivity.java @@ -18,7 +18,6 @@ import android.graphics.Color; import android.os.Bundle; -import androidx.appcompat.app.AppCompatActivity; import android.view.KeyEvent; import android.view.View; import android.view.WindowManager.LayoutParams; @@ -29,6 +28,7 @@ import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import com.example.mapdemo.OnMapAndViewReadyListener.OnGlobalLayoutAndMapReadyListener; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; diff --git a/map-sample/build.gradle b/map-sample/build.gradle index 9b378bd..29fd0fa 100755 --- a/map-sample/build.gradle +++ b/map-sample/build.gradle @@ -22,7 +22,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.0' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" // NOTE: Do not place your application dependencies here; they belong @@ -31,7 +31,7 @@ buildscript { } plugins { - id 'org.jetbrains.kotlin.android' version '2.0.0' apply false + id 'org.jetbrains.kotlin.android' version '2.1.10' apply false } allprojects { diff --git a/map-sample/gradle.properties b/map-sample/gradle.properties index df3d293..6b16434 100755 --- a/map-sample/gradle.properties +++ b/map-sample/gradle.properties @@ -1,3 +1,2 @@ android.useAndroidX=true -android.enableJetifier=true org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/map-sample/gradle/wrapper/gradle-wrapper.jar b/map-sample/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100755 Binary files a/map-sample/gradle/wrapper/gradle-wrapper.jar and b/map-sample/gradle/wrapper/gradle-wrapper.jar differ diff --git a/map-sample/gradle/wrapper/gradle-wrapper.properties b/map-sample/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..df97d72 100755 --- a/map-sample/gradle/wrapper/gradle-wrapper.properties +++ b/map-sample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/navigation-sample/README.md b/navigation-sample/README.md index 9683eab..f830f8a 100755 --- a/navigation-sample/README.md +++ b/navigation-sample/README.md @@ -25,8 +25,6 @@ Android Studio project. to keep the key out of version control systems. - In the **Gradle Scripts folder**, open the `gradle.properties` file and add - the following if they are not already present: - 1. `android.useAndroidX=true` - 2. `android.enableJetifier=true` + the following if not already present: `android.useAndroidX=true` - Build and run the sample application. diff --git a/navigation-sample/app/build.gradle b/navigation-sample/app/build.gradle index 3fe223a..509f3ef 100755 --- a/navigation-sample/app/build.gradle +++ b/navigation-sample/app/build.gradle @@ -21,12 +21,12 @@ apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' ext { androidxLifecycleVersion = "2.6.2" glideVersion = "4.13.2" - navSdkVersion = "6.0.0" + navSdkVersion = "6.2.0" } android { namespace 'com.example.navigationapidemo' - compileSdkVersion 33 + compileSdkVersion 34 buildFeatures { buildConfig true @@ -36,7 +36,7 @@ android { applicationId "com.example.navigationapidemo" // Navigation SDK supports a minimum of SDK 23. minSdkVersion 23 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName "1.0" // Set this to the languages you actually use, otherwise you'll include resource strings @@ -90,7 +90,7 @@ dependencies { // Add LeakCanary to debugImplementation because LeakCanary should only run // in debug builds. - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14' // And dependencies. api "androidx.appcompat:appcompat:1.6.1" @@ -104,7 +104,8 @@ dependencies { api "androidx.preference:preference:1.2.1" api "androidx.recyclerview:recyclerview:1.3.1" api "androidx.tracing:tracing:1.1.0" - api "androidx.transition:transition:1.4.1" + api "androidx.transition:transition:1.5.1" + api "androidx.viewpager2:viewpager2:1.0.0" api "androidx.window:window:1.1.0" api "com.github.bumptech.glide:glide:${glideVersion}" api "com.google.android.datatransport:transport-api:3.0.0" @@ -115,8 +116,8 @@ dependencies { // isn't required by the Navigation SDK. api "com.google.android.libraries.places:places:2.5.0" api "com.google.android.material:material:1.5.0" - api 'org.jetbrains.kotlin:kotlin-reflect:2.0.0' - api 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0' + api 'org.jetbrains.kotlin:kotlin-reflect:2.1.10' + api 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10' api 'com.google.guava:guava:31.0.1-android' annotationProcessor "androidx.annotation:annotation:1.7.0" diff --git a/navigation-sample/build.gradle b/navigation-sample/build.gradle index 9b378bd..29fd0fa 100755 --- a/navigation-sample/build.gradle +++ b/navigation-sample/build.gradle @@ -22,7 +22,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.0' + classpath 'com.android.tools.build:gradle:8.7.3' classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" // NOTE: Do not place your application dependencies here; they belong @@ -31,7 +31,7 @@ buildscript { } plugins { - id 'org.jetbrains.kotlin.android' version '2.0.0' apply false + id 'org.jetbrains.kotlin.android' version '2.1.10' apply false } allprojects { diff --git a/navigation-sample/gradle.properties b/navigation-sample/gradle.properties index df3d293..6b16434 100755 --- a/navigation-sample/gradle.properties +++ b/navigation-sample/gradle.properties @@ -1,3 +1,2 @@ android.useAndroidX=true -android.enableJetifier=true org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 \ No newline at end of file diff --git a/navigation-sample/gradle/wrapper/gradle-wrapper.jar b/navigation-sample/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100755 Binary files a/navigation-sample/gradle/wrapper/gradle-wrapper.jar and b/navigation-sample/gradle/wrapper/gradle-wrapper.jar differ diff --git a/navigation-sample/gradle/wrapper/gradle-wrapper.properties b/navigation-sample/gradle/wrapper/gradle-wrapper.properties index 3fa8f86..df97d72 100755 --- a/navigation-sample/gradle/wrapper/gradle-wrapper.properties +++ b/navigation-sample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME