diff --git a/CHANGELOG.md b/CHANGELOG.md index 46763dcbde5..c0d98a4fd4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Mapbox welcomes participation and contributions from everyone. - Fixed a rare issue where alternative route would not be vanished until deviation point for `MapboxRouteLineApi#setNavigationRoutes(routes, metadata)` when the route's geometry contained duplicate points. [#6399](https://github.com/mapbox/mapbox-navigation-android/pull/6399) - Introduced `ViewStyleCutomization.compassButtonParams` property to configure compass. [#6395](https://github.com/mapbox/mapbox-navigation-android/pull/6395) - Introduced `MapboxExtendableButtonParams.enabled` property to enable/disable a button. [#6395](https://github.com/mapbox/mapbox-navigation-android/pull/6395) +- Renamed `MapboxAudioGuidance.getInstance()` to `getRegisteredInstance`. Rename `unMute` to `unmute` for audio guidance classes. [#6445](https://github.com/mapbox/mapbox-navigation-android/pull/6445) ## Mapbox Navigation SDK 2.9.0-alpha.4 - 30 September, 2022 ### Changelog diff --git a/LICENSE.md b/LICENSE.md index 0ef0883ba29..d839956d18e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3761,12 +3761,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Activity Kotlin Extensions (Kotlin extensions for 'activity' artifact). -URL: [https://developer.android.com/jetpack/androidx/releases/activity#1.2.3](https://developer.android.com/jetpack/androidx/releases/activity#1.2.3) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android App Startup Runtime. URL: [https://developer.android.com/jetpack/androidx/releases/startup#1.1.1](https://developer.android.com/jetpack/androidx/releases/startup#1.1.1) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3803,24 +3797,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android DataStore (Android DataStore - contains the underlying store used by each serialization method along with components that require an Android dependency). -URL: [https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0](https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android DataStore Core (Android DataStore Core - contains the underlying store used by each serialization method). -URL: [https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0](https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android DB. -URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android for Cars App Library (Build navigation, parking, and charging apps for Android Auto). URL: [https://developer.android.com/jetpack/androidx/releases/car-app#1.1.0](https://developer.android.com/jetpack/androidx/releases/car-app#1.1.0) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3851,24 +3827,12 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Lifecycle Service. -URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Lifecycle ViewModel. URL: [https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the Android Lifecycle ViewModel Kotlin Extensions (Kotlin extensions for 'viewmodel' artifact). -URL: [https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Lifecycle ViewModel with SavedState (Android Lifecycle ViewModel). URL: [https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1](https://developer.android.com/jetpack/androidx/releases/lifecycle#2.3.1) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3887,48 +3851,18 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Preferences DataStore. -URL: [https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0](https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android Preferences DataStore Core (Android Preferences DataStore without the Android Dependencies). -URL: [https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0](https://developer.android.com/jetpack/androidx/releases/datastore#1.0.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Resources Library (The Resources Library is a static library that you can add to your Android application in order to use resource APIs that backport the latest APIs to older versions of the platform. Compatible on devices running API 14 or later.). URL: [https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1](https://developer.android.com/jetpack/androidx/releases/appcompat#1.3.1) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the Android Room-Common. -URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android Room-Runtime. -URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support AnimatedVectorDrawable. URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the Android Support CardView v7. -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support ExifInterface. URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3953,18 +3887,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Support Library Coordinator Layout (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android Support Library core utils (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support Library Cursor Adapter (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3977,12 +3899,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Support Library Document File (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support Library Drawer Layout (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -3990,7 +3906,7 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== Mapbox Navigation uses portions of the Android Support Library fragment (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [https://developer.android.com/jetpack/androidx/releases/fragment#1.4.0](https://developer.android.com/jetpack/androidx/releases/fragment#1.4.0) +URL: [https://developer.android.com/jetpack/androidx/releases/fragment#1.3.6](https://developer.android.com/jetpack/androidx/releases/fragment#1.3.6) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== @@ -4007,36 +3923,12 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Support Library Local Broadcast Manager (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android Support Library Print (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support Library View Pager (The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs. Compatible on devices running API 14 or later.). URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the Android Support RecyclerView v7. -URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android Support SQLite - Framework Implementation (The implementation of Support SQLite library using the framework code.). -URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Android Support VectorDrawable. URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -4049,58 +3941,18 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Android Transition Support Library. -URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Android WorkManager Runtime (Android WorkManager runtime library). -URL: [https://developer.android.com/jetpack/androidx/releases/work#2.7.1](https://developer.android.com/jetpack/androidx/releases/work#2.7.1) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the AndroidSVG (SVG rendering library for Android.). -URL: [https://github.com/BigBadaboom/androidsvg](https://github.com/BigBadaboom/androidsvg) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the AndroidX Futures (Androidx implementation of Guava's ListenableFuture). URL: [https://developer.android.com/topic/libraries/architecture/index.html](https://developer.android.com/topic/libraries/architecture/index.html) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the AndroidX Widget ViewPager2. -URL: [https://developer.android.com/jetpack/androidx](https://developer.android.com/jetpack/androidx) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the auto-value-gson-runtime. -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the autotransient (A transient annotation for AutoValue extensions.). -URL: [https://github.com/ZacSweers/AutoTransient/](https://github.com/ZacSweers/AutoTransient/) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Collections Kotlin Extensions (Kotlin extensions for 'collection' artifact). URL: [https://developer.android.com/jetpack/androidx/releases/collection#1.2.0](https://developer.android.com/jetpack/androidx/releases/collection#1.2.0) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the Converter: Gson. -License: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Core Kotlin Extensions (Kotlin extensions for 'core' artifact). URL: [https://developer.android.com/jetpack/androidx/releases/core#1.7.0](https://developer.android.com/jetpack/androidx/releases/core#1.7.0) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -4113,12 +3965,6 @@ License: [The Apache Software License, Version 2.0](http://www.apache.org/licens =========================================================================== -Mapbox Navigation uses portions of the Fragment Kotlin Extensions (Kotlin extensions for 'fragment' artifact). -URL: [https://developer.android.com/jetpack/androidx/releases/fragment#1.4.0](https://developer.android.com/jetpack/androidx/releases/fragment#1.4.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Glide (A fast and efficient image loading library for Android focused on smooth scrolling.). URL: [https://github.com/bumptech/glide](https://github.com/bumptech/glide) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -4241,18 +4087,6 @@ License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos) =========================================================================== -Mapbox Navigation uses portions of the Mapbox Android Core SDK. -URL: [https://github.com/mapbox/mapbox-sdk](https://github.com/mapbox/mapbox-sdk) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Android Gestures Library. -URL: [https://github.com/mapbox/mapbox-gestures-android](https://github.com/mapbox/mapbox-gestures-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - Mapbox Navigation uses portions of the Mapbox Android Telemetry Core (Mapbox Android Core Library). URL: [https://github.com/mapbox/mapbox-events-android](https://github.com/mapbox/mapbox-events-android) License: [MIT](https://mit-license.org) @@ -4277,12 +4111,6 @@ License: [BSD](https://opensource.org/licenses/BSD-2-Clause) =========================================================================== -Mapbox Navigation uses portions of the Mapbox Hybrid Router (Artifact that provides the default implementation of the routing engine implementation that alternates between offbaord and onboard data (online/offline)). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - Mapbox Navigation uses portions of the Mapbox Java SDK. URL: [https://github.com/mapbox/mapbox-java](https://github.com/mapbox/mapbox-java) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -4301,60 +4129,6 @@ License: [BSD](https://opensource.org/licenses/BSD-2-Clause) =========================================================================== -Mapbox Navigation uses portions of the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Maps SDK Base. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Base (Artifact that provides the set of interface definitions and DTOs used in the modular Navigation SDK). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Metrics (Artifact that provides the default implementation of the metrics integration). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Native (Common multi-platform navigation logic). -URL: [https://github.com/mapbox/mapbox-navigation-native](https://github.com/mapbox/mapbox-navigation-native) -License: [Mapbox Terms of Service](https://www.mapbox.com/tos) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Native wrapper (Artifact that provides the native capabilities of the SDK). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Notification (Artifact that provides the default implementation of the navigation notification). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation SDK (Artifact that groups all of the Navigation SDK features). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - -Mapbox Navigation uses portions of the Mapbox Navigation Utils (Artifact that provides basic navigation utilities). -URL: [https://github.com/mapbox/mapbox-navigation-android](https://github.com/mapbox/mapbox-navigation-android) -License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos/) - -=========================================================================== - Mapbox Navigation uses portions of the Mapbox Search Native SDK for Android. URL: [https://github.com/mapbox/mapbox-search-android](https://github.com/mapbox/mapbox-search-android) License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos) @@ -4373,30 +4147,12 @@ License: [Mapbox Terms of Service](https://www.mapbox.com/legal/tos) =========================================================================== -Mapbox Navigation uses portions of the Mapbox Telemetry for Android (Mapbox Android Telemetry Library). -URL: [https://github.com/mapbox/mapbox-events-android](https://github.com/mapbox/mapbox-events-android) -License: [MIT](https://mit-license.org) - -=========================================================================== - -Mapbox Navigation uses portions of the Material Components for Android (Material Components for Android is a static library that you can add to your Android application in order to use APIs that provide implementations of the Material Design specification. Compatible on devices running API 14 or later.). -URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the okhttp (Square’s meticulous HTTP client for Java and Kotlin.). URL: [https://square.github.io/okhttp/](https://square.github.io/okhttp/) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the okhttp-logging-interceptor (Square’s meticulous HTTP client for Java and Kotlin.). -URL: [https://square.github.io/okhttp/](https://square.github.io/okhttp/) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - Mapbox Navigation uses portions of the Okio (A modern I/O API for Java). URL: [https://github.com/square/okio/](https://github.com/square/okio/) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) @@ -4409,118 +4165,18 @@ License: [The Apache License, Version 2.0](http://www.apache.org/licenses/LICENS =========================================================================== -Mapbox Navigation uses portions of the Retrofit. -License: [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the SavedState Kotlin Extensions (Kotlin extensions for 'savedstate' artifact). -URL: [https://developer.android.com/jetpack/androidx/releases/savedstate#1.1.0](https://developer.android.com/jetpack/androidx/releases/savedstate#1.1.0) -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - -Mapbox Navigation uses portions of the Telemetry for the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - Mapbox Navigation uses portions of the The android auto extension for the Mapbox Maps SDK for Android. URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) License: [BSD](https://opensource.org/licenses/BSD-2-Clause) =========================================================================== -Mapbox Navigation uses portions of the The annotation module for the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The attribution module for the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The camera animation module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The compass module for the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The gestures module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The location component module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The logo module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The map lifecycle module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The map localization module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The map overlay module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The scalebar module for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The style extension for the Mapbox Maps SDK for Android. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - -Mapbox Navigation uses portions of the The viewport module for the Mapbox Maps SDK. -URL: [https://github.com/mapbox/mapbox-maps-android](https://github.com/mapbox/mapbox-maps-android) -License: [BSD](https://opensource.org/licenses/BSD-2-Clause) - -=========================================================================== - Mapbox Navigation uses portions of the VersionedParcelable (Provides a stable but relatively compact binary serialization format that can be passed across processes or persisted safely.). URL: [http://developer.android.com/tools/extras/support-library.html](http://developer.android.com/tools/extras/support-library.html) License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) =========================================================================== -Mapbox Navigation uses portions of the viewbinding. -License: [The Apache Software License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt) - -=========================================================================== - #### Navigation UI App SDK module diff --git a/libnavui-androidauto/build.gradle b/libnavui-androidauto/build.gradle index ed3127ea644..a7b1e6cd2b3 100644 --- a/libnavui-androidauto/build.gradle +++ b/libnavui-androidauto/build.gradle @@ -40,8 +40,10 @@ dependencies { // This defines the minimum version of Navigation which is included in this SDK. To upgrade the // Navigation versions, you can specify a newer version in your downstream build.gradle. - releaseApi("com.mapbox.navigation:android:2.9.0-alpha.4") - debugApi project(":libnavigation-android") + // TODO reset to a specific version when the release is ready (and make license) + api project(":libnavigation-android") +// releaseApi("com.mapbox.navigation:android:2.9.0-beta.1") +// debugApi project(":libnavigation-android") // Search is currently in beta so it is not included in this SDK. The functionality of search // is included behind this library's api. diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/speedlimit/CarSpeedLimitRenderer.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/speedlimit/CarSpeedLimitRenderer.kt index 94f8e2995a6..0a6fe5bd5d0 100644 --- a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/speedlimit/CarSpeedLimitRenderer.kt +++ b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/car/navigation/speedlimit/CarSpeedLimitRenderer.kt @@ -76,7 +76,7 @@ internal constructor( val signFormat = speedLimitOptions.forcedSignFormat ?: locationMatcherResult.speedLimit?.speedLimitSign val threshold = speedLimitOptions.warningThreshold - when (distanceFormatterOptions?.unitType) { + when (distanceFormatterOptions!!.unitType) { UnitType.IMPERIAL -> { val speedLimit = locationMatcherResult.speedLimit?.speedKmph?.let { speedLimitKmph -> diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt index 388b14b91f1..aedb314587c 100644 --- a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt +++ b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/AppAudioGuidanceUi.kt @@ -19,7 +19,7 @@ fun Fragment.attachAudioGuidance( mapboxSoundButton: MapboxSoundButton ) { val lifecycleOwner = viewLifecycleOwner - val flow = MapboxAudioGuidance.getInstance().stateFlow() + val flow = MapboxAudioGuidance.getRegisteredInstance().stateFlow() lifecycleOwner.lifecycleScope.launch { lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { flow.collect { state -> @@ -33,7 +33,7 @@ fun Fragment.attachAudioGuidance( } } mapboxSoundButton.setOnClickListener { - MapboxAudioGuidance.getInstance().toggle() + MapboxAudioGuidance.getRegisteredInstance().toggle() } } @@ -45,7 +45,7 @@ fun Lifecycle.muteAudioGuidance() { addObserver(object : DefaultLifecycleObserver { lateinit var initialState: MapboxAudioGuidanceState override fun onResume(owner: LifecycleOwner) { - with(MapboxAudioGuidance.getInstance()) { + with(MapboxAudioGuidance.getRegisteredInstance()) { initialState = stateFlow().value mute() } @@ -53,7 +53,7 @@ fun Lifecycle.muteAudioGuidance() { override fun onPause(owner: LifecycleOwner) { if (!initialState.isMuted) { - MapboxAudioGuidance.getInstance().unMute() + MapboxAudioGuidance.getRegisteredInstance().unmute() } } }) diff --git a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/CarAudioGuidanceUi.kt b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/CarAudioGuidanceUi.kt index fdd81f34305..6a89ec2a719 100644 --- a/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/CarAudioGuidanceUi.kt +++ b/libnavui-androidauto/src/main/java/com/mapbox/androidauto/navigation/audioguidance/CarAudioGuidanceUi.kt @@ -28,7 +28,7 @@ class CarAudioGuidanceUi : MapboxActionProvider.ScreenActionProvider { * Attach this to the screen while navigating. */ private fun buildSoundButtonAction(screen: Screen): Action { - val audioGuidance = MapboxAudioGuidance.getInstance() + val audioGuidance = MapboxAudioGuidance.getRegisteredInstance() val state = audioGuidance.stateFlow().value return if (!state.isMuted) { buildIconAction(screen, R.drawable.mapbox_car_ic_volume_on) { @@ -36,7 +36,7 @@ class CarAudioGuidanceUi : MapboxActionProvider.ScreenActionProvider { } } else { buildIconAction(screen, R.drawable.mapbox_car_ic_volume_off) { - audioGuidance.unMute() + audioGuidance.unmute() } } } @@ -45,7 +45,7 @@ class CarAudioGuidanceUi : MapboxActionProvider.ScreenActionProvider { screen.lifecycle.apply { coroutineScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { - MapboxAudioGuidance.getInstance().stateFlow() + MapboxAudioGuidance.getRegisteredInstance().stateFlow() .distinctUntilChanged { old, new -> old.isMuted == new.isMuted && old.isPlayable == new.isPlayable } diff --git a/libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateController.kt b/libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateController.kt index 4d48fdaefeb..c5e88b3c1b9 100644 --- a/libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateController.kt +++ b/libnavui-app/src/main/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateController.kt @@ -46,7 +46,7 @@ class AudioGuidanceStateController( override fun onAttached(mapboxNavigation: MapboxNavigation) { super.onAttached(mapboxNavigation) - val audioGuidance = MapboxAudioGuidance.getInstance() + val audioGuidance = MapboxAudioGuidance.getRegisteredInstance() audioGuidance.stateFlow().observe { if (it.isMuted != store.state.value.audio.isMuted) { val newState = AudioGuidanceState(it.isMuted) @@ -58,7 +58,7 @@ class AudioGuidanceStateController( if (it.isMuted) { audioGuidance.mute() } else { - audioGuidance.unMute() + audioGuidance.unmute() } } } diff --git a/libnavui-app/src/test/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateControllerTest.kt b/libnavui-app/src/test/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateControllerTest.kt index a9c9132bb4d..cb5f8520a06 100644 --- a/libnavui-app/src/test/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateControllerTest.kt +++ b/libnavui-app/src/test/java/com/mapbox/navigation/ui/app/internal/controller/AudioGuidanceStateControllerTest.kt @@ -44,7 +44,7 @@ class AudioGuidanceStateControllerTest { mockAudioGuidance = mockk(relaxed = true) { every { stateFlow() } returns audioGuidanceState } - every { MapboxAudioGuidance.getInstance() } returns mockAudioGuidance + every { MapboxAudioGuidance.getRegisteredInstance() } returns mockAudioGuidance testStore = spyk(TestStore()) } diff --git a/libnavui-voice/api/current.txt b/libnavui-voice/api/current.txt index b1683029b86..d5fb8d5ef23 100644 --- a/libnavui-voice/api/current.txt +++ b/libnavui-voice/api/current.txt @@ -23,19 +23,19 @@ package com.mapbox.navigation.ui.voice.api { public final class MapboxAudioGuidance implements com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver { method public static com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance create(); - method public static com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance getInstance(); + method public static com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance getRegisteredInstance(); method public void mute(); method public void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation); method public void onDetached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation); method public kotlinx.coroutines.flow.StateFlow stateFlow(); method public void toggle(); - method public void unMute(); + method public void unmute(); field public static final com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance.Companion Companion; } public static final class MapboxAudioGuidance.Companion { method public com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance create(); - method public com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance getInstance(); + method public com.mapbox.navigation.ui.voice.api.MapboxAudioGuidance getRegisteredInstance(); } public final class MapboxAudioGuidanceState { @@ -199,26 +199,26 @@ package com.mapbox.navigation.ui.voice.view { method public int getMuteIconResId(); method public String? getMuteText(); method public androidx.appcompat.widget.AppCompatTextView getTextView(); - method public int getUnMuteIconResId(); - method public String? getUnMuteText(); + method public int getUnmuteIconResId(); + method public String? getUnmuteText(); method @UiThread public void mute(); method @UiThread public void muteAndExtend(long duration = 2000L); method @UiThread public void muteAndExtend(); method public void setMuteIconResId(int); method public void setMuteText(String?); - method public void setUnMuteIconResId(int); - method public void setUnMuteText(String?); - method @UiThread public void unMute(); - method @UiThread public void unMuteAndExtend(long duration = 2000L); - method @UiThread public void unMuteAndExtend(); + method public void setUnmuteIconResId(int); + method public void setUnmuteText(String?); + method @UiThread public void unmute(); + method @UiThread public void unmuteAndExtend(long duration = 2000L); + method @UiThread public void unmuteAndExtend(); method public void updateStyle(@StyleRes int style); property public final androidx.constraintlayout.widget.ConstraintLayout containerView; property public final androidx.appcompat.widget.AppCompatImageView iconImage; property public final int muteIconResId; property public final String? muteText; property public final androidx.appcompat.widget.AppCompatTextView textView; - property public final int unMuteIconResId; - property public final String? unMuteText; + property public final int unmuteIconResId; + property public final String? unmuteText; } public final class MapboxSoundButton extends androidx.constraintlayout.widget.ConstraintLayout { diff --git a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/api/MapboxAudioGuidance.kt b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/api/MapboxAudioGuidance.kt index ff75a7914b2..d131dd9918e 100644 --- a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/api/MapboxAudioGuidance.kt +++ b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/api/MapboxAudioGuidance.kt @@ -78,7 +78,7 @@ internal constructor( * In order to enable voice guidance, you must call [MapboxNavigation.startTripSession] * and set a route for active guidance through [MapboxNavigation.setRoutes]. * - * You can also control audio guidance by calling [mute], [unMute] or [toggle] + * You can also control audio guidance by calling [mute], [unmute] or [toggle] */ fun stateFlow(): StateFlow = internalStateFlow @@ -94,7 +94,7 @@ internal constructor( /** * Explicit call to unmute the audio guidance state. */ - fun unMute() { + fun unmute() { scope.launch { setMutedState(false) } @@ -106,7 +106,7 @@ internal constructor( fun toggle() { scope.launch { if (mutedStateFlow.value) { - unMute() + unmute() } else { mute() } @@ -209,7 +209,7 @@ internal constructor( * Get the registered instance or create one and register it to [MapboxNavigationApp]. */ @JvmStatic - fun getInstance(): MapboxAudioGuidance = MapboxNavigationApp + fun getRegisteredInstance(): MapboxAudioGuidance = MapboxNavigationApp .getObservers(MapboxAudioGuidance::class) .firstOrNull() ?: create().also { MapboxNavigationApp.registerObserver(it) } } diff --git a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponent.kt b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponent.kt index 72e351445e1..bead4112805 100644 --- a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponent.kt +++ b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponent.kt @@ -38,7 +38,7 @@ internal class MapboxAudioComponentContract( } override fun unMute() { - audioGuidance.unMute() + audioGuidance.unmute() } } @@ -52,7 +52,8 @@ class AudioGuidanceButtonComponent( init { this.contractProvider = contractProvider ?: Provider { - MapboxAudioComponentContract(coroutineScope, MapboxAudioGuidance.getInstance()) + val mapboxAudioGuidance = MapboxAudioGuidance.getRegisteredInstance() + MapboxAudioComponentContract(coroutineScope, mapboxAudioGuidance) } } @@ -64,7 +65,7 @@ class AudioGuidanceButtonComponent( if (it) { audioGuidanceButton.mute() } else { - audioGuidanceButton.unMute() + audioGuidanceButton.unmute() } } diff --git a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/view/MapboxAudioGuidanceButton.kt b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/view/MapboxAudioGuidanceButton.kt index 6586f16fa3b..f5b53643d83 100644 --- a/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/view/MapboxAudioGuidanceButton.kt +++ b/libnavui-voice/src/main/java/com/mapbox/navigation/ui/voice/view/MapboxAudioGuidanceButton.kt @@ -58,7 +58,7 @@ class MapboxAudioGuidanceButton : FrameLayout { * Icon Drawable Resource Id for UNMUTE audio guidance. */ @DrawableRes - var unMuteIconResId: Int = 0 + var unmuteIconResId: Int = 0 /** * Extended mode Text for MUTE audio guidance. @@ -68,15 +68,15 @@ class MapboxAudioGuidanceButton : FrameLayout { /** * Extended mode Text for UNMUTE audio guidance. */ - var unMuteText: String? = null + var unmuteText: String? = null /** - * Default button that allows user to mute and un-mute audio guidance. + * Default button that allows user to mute and unmute audio guidance. */ constructor(context: Context) : this(context, null) /** - * Default button that allows user to mute and un-mute audio guidance. + * Default button that allows user to mute and unmute audio guidance. */ constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) @@ -125,8 +125,8 @@ class MapboxAudioGuidanceButton : FrameLayout { * @param state new camera state */ @UiThread - fun unMute() { - iconImage.setImageResource(unMuteIconResId) + fun unmute() { + iconImage.setImageResource(unmuteIconResId) } /** @@ -148,18 +148,18 @@ class MapboxAudioGuidanceButton : FrameLayout { /** * Update this button to represent audio guidance state in un-muted state. - * Extend button for the [duration] and show [unMuteText]. + * Extend button for the [duration] and show [unmuteText]. * This method does nothing if button is already in given state. * * @param duration duration in milliseconds. Defaults to [EXTEND_DURATION]. */ @UiThread @JvmOverloads - fun unMuteAndExtend(duration: Long = EXTEND_DURATION) { - iconImage.setImageResource(unMuteIconResId) + fun unmuteAndExtend(duration: Long = EXTEND_DURATION) { + iconImage.setImageResource(unmuteIconResId) - if (unMuteText != null && !helper.isAnimationRunning) { - helper.showTextAndExtend(unMuteText!!, duration) + if (unmuteText != null && !helper.isAnimationRunning) { + helper.showTextAndExtend(unmuteText!!, duration) } } @@ -182,7 +182,7 @@ class MapboxAudioGuidanceButton : FrameLayout { R.styleable.MapboxAudioGuidanceButton_audioGuidanceButtonMuteIcon, R.drawable.mapbox_ic_sound_off ) - unMuteIconResId = typedArray.getResourceId( + unmuteIconResId = typedArray.getResourceId( R.styleable.MapboxAudioGuidanceButton_audioGuidanceButtonUnmuteIcon, R.drawable.mapbox_ic_sound_on ) @@ -206,7 +206,7 @@ class MapboxAudioGuidanceButton : FrameLayout { } muteText = typedArray.getString(R.styleable.MapboxAudioGuidanceButton_audioGuidanceButtonMuteText) - unMuteText = + unmuteText = typedArray.getString( R.styleable.MapboxAudioGuidanceButton_audioGuidanceButtonUnmuteText ) diff --git a/libnavui-voice/src/test/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponentTest.kt b/libnavui-voice/src/test/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponentTest.kt index c49a06b793b..cb76c33475f 100644 --- a/libnavui-voice/src/test/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponentTest.kt +++ b/libnavui-voice/src/test/java/com/mapbox/navigation/ui/voice/internal/ui/AudioGuidanceButtonComponentTest.kt @@ -68,7 +68,7 @@ class AudioGuidanceButtonComponentTest { testContract.isMuted.value = true verifyOrder { - button.unMute() + button.unmute() button.mute() } } @@ -110,7 +110,7 @@ class AudioGuidanceButtonComponentTest { val mockAudioGuidance = mockk { every { stateFlow() } returns testState every { mute() } returns Unit - every { unMute() } returns Unit + every { unmute() } returns Unit every { toggle() } returns Unit } every { diff --git a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/testing/JavaInterfaceChecker.java b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/testing/JavaInterfaceChecker.java index 2cb5dfa0947..0ffe86a4bdf 100644 --- a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/testing/JavaInterfaceChecker.java +++ b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/testing/JavaInterfaceChecker.java @@ -10,9 +10,9 @@ class JavaInterfaceChecker { void MapboxAudioGuidance( CoroutineScope coroutineScope ) { - MapboxAudioGuidance sut = MapboxAudioGuidance.getInstance(); + MapboxAudioGuidance sut = MapboxAudioGuidance.getRegisteredInstance(); sut.mute(); - sut.unMute(); + sut.unmute(); sut.toggle(); MapboxNavigationApp.registerObserver(sut); MapboxNavigationApp.unregisterObserver(sut); diff --git a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/DropInButtonsActivity.kt b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/DropInButtonsActivity.kt index b455f174639..640c18ff3e1 100644 --- a/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/DropInButtonsActivity.kt +++ b/qa-test-app/src/main/java/com/mapbox/navigation/qa_test_app/view/DropInButtonsActivity.kt @@ -46,8 +46,8 @@ class DropInButtonsActivity : BaseNavigationActivity() { binding.audioButton.mute() binding.circleAudioButton.mute() } else { - binding.audioButton.unMute() - binding.circleAudioButton.unMute() + binding.audioButton.unmute() + binding.circleAudioButton.unmute() } } } @@ -71,7 +71,7 @@ class DropInButtonsActivity : BaseNavigationActivity() { if (muted.value == true) { muted.value = false - button.unMuteAndExtend() + button.unmuteAndExtend() } else { muted.value = true button.muteAndExtend()