Skip to content

Commit 7bf7b7f

Browse files
dzinadgithub-actions[bot]
dzinad
authored and
github-actions[bot]
committed
fix updateApi
GitOrigin-RevId: 9f4c478ba3de4404edee273d520f8c2a4db07920
1 parent fdb3a6f commit 7bf7b7f

File tree

17 files changed

+56
-51
lines changed

17 files changed

+56
-51
lines changed

‎tripdata/src/main/java/com/mapbox/navigation/tripdata/shield/RoadShieldDownloader.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import com.mapbox.bindgen.ExpectedFactory.createValue
66
import com.mapbox.common.ResourceLoadStatus
77
import com.mapbox.navigation.base.internal.utils.toByteArray
88
import com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory
9-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
109
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
10+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
1111
import com.mapbox.navigation.ui.utils.internal.resource.load
1212

1313
internal object RoadShieldDownloader {

‎tripdata/src/test/java/com/mapbox/navigation/tripdata/shield/RoadShieldDownloaderTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import com.mapbox.common.ResourceLoadResult
99
import com.mapbox.common.ResourceLoadStatus
1010
import com.mapbox.navigation.testing.toDataRef
1111
import com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory
12-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoadCallback
13-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
12+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadCallback
1413
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
14+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
1515
import io.mockk.every
1616
import io.mockk.mockk
1717
import io.mockk.mockkObject

‎ui-base/api/current.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,13 @@ package com.mapbox.navigation.ui.base.util {
7373
}
7474

7575
}
76+
77+
package com.mapbox.navigation.ui.base.util.internal.resource {
78+
79+
@RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public final class ResourceLoaderFactory {
80+
method public com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader getInstance();
81+
field public static final com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory INSTANCE;
82+
}
83+
84+
}
85+

‎ui-base/src/main/java/com/mapbox/navigation/ui/base/util/internal/resource/ResourceLoaderFactory.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.mapbox.navigation.ui.base.util.internal.resource
33
import androidx.annotation.RestrictTo
44
import com.mapbox.common.ReachabilityFactory
55
import com.mapbox.navigation.base.internal.tilestore.NavigationTileStoreOwner
6-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
76
import com.mapbox.navigation.ui.utils.internal.resource.DefaultResourceLoader
7+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
88

99
/**
1010
* Factory for accessing ResourceLoader instance.

‎ui-maps/api/current.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ package com.mapbox.navigation.ui.maps.camera {
154154
@UiThread public final class NavigationCamera {
155155
ctor public NavigationCamera(com.mapbox.maps.MapboxMap mapboxMap, com.mapbox.maps.plugin.animation.CameraAnimationsPlugin cameraPlugin, com.mapbox.navigation.ui.maps.camera.data.ViewportDataSource viewportDataSource, com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraStateTransition stateTransition = com.mapbox.navigation.ui.maps.camera.transition.MapboxNavigationCameraStateTransition(mapboxMap, cameraPlugin));
156156
ctor @com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI public NavigationCamera(com.mapbox.maps.MapboxMap mapboxMap, com.mapbox.maps.plugin.animation.CameraAnimationsPlugin cameraPlugin, com.mapbox.navigation.ui.maps.camera.data.ViewportDataSource viewportDataSource, com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraStateTransition stateTransition = com.mapbox.navigation.ui.maps.camera.transition.MapboxNavigationCameraStateTransition(mapboxMap, cameraPlugin), com.mapbox.navigation.ui.maps.camera.transition.UpdateFrameAnimatorsOptions updateFrameAnimatorsOptions);
157-
ctor @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public NavigationCamera(com.mapbox.maps.MapboxMap mapboxMap, com.mapbox.maps.plugin.animation.CameraAnimationsPlugin cameraPlugin, com.mapbox.navigation.ui.maps.camera.data.ViewportDataSource viewportDataSource, com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraStateTransitionProvider transitionProvider, com.mapbox.navigation.ui.maps.internal.camera.SimplifiedUpdateFrameTransitionProvider simplifiedUpdateFrameTransitionProvider = com.mapbox.navigation.ui.maps.camera.transition.DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin));
158157
method public com.mapbox.navigation.ui.maps.camera.data.debugger.MapboxNavigationViewportDataSourceDebugger? getDebugger();
159158
method public com.mapbox.navigation.ui.maps.camera.state.NavigationCameraState getState();
160159
method public void registerNavigationCameraStateChangeObserver(com.mapbox.navigation.ui.maps.camera.state.NavigationCameraStateChangedObserver navigationCameraStateChangedObserver);

‎ui-maps/src/main/java/com/mapbox/navigation/ui/maps/camera/NavigationCamera.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.mapbox.navigation.ui.maps.camera
22

33
import android.os.SystemClock
4-
import androidx.annotation.RestrictTo
54
import androidx.annotation.UiThread
65
import androidx.annotation.VisibleForTesting
76
import com.mapbox.geojson.Point
@@ -172,14 +171,12 @@ internal constructor(
172171
)
173172

174173
@OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
175-
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
176-
constructor(
174+
internal constructor(
177175
mapboxMap: MapboxMap,
178176
cameraPlugin: CameraAnimationsPlugin,
179177
viewportDataSource: ViewportDataSource,
180178
transitionProvider: NavigationCameraStateTransitionProvider,
181-
simplifiedUpdateFrameTransitionProvider: SimplifiedUpdateFrameTransitionProvider =
182-
DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin),
179+
simplifiedUpdateFrameTransitionProvider: SimplifiedUpdateFrameTransitionProvider,
183180
) : this(
184181
mapboxMap,
185182
cameraPlugin,

‎ui-maps/src/main/java/com/mapbox/navigation/ui/maps/internal/camera/NavigationCameraFactory.kt‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.mapbox.navigation.ui.maps.internal.camera
2+
3+
import androidx.annotation.RestrictTo
4+
import com.mapbox.maps.MapboxMap
5+
import com.mapbox.maps.plugin.animation.CameraAnimationsPlugin
6+
import com.mapbox.navigation.ui.maps.camera.NavigationCamera
7+
import com.mapbox.navigation.ui.maps.camera.data.ViewportDataSource
8+
import com.mapbox.navigation.ui.maps.camera.transition.DefaultSimplifiedUpdateFrameTransitionProvider
9+
import com.mapbox.navigation.ui.maps.camera.transition.NavigationCameraStateTransitionProvider
10+
11+
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
12+
object NavigationCameraFactory {
13+
14+
fun create(
15+
mapboxMap: MapboxMap,
16+
cameraPlugin: CameraAnimationsPlugin,
17+
viewportDataSource: ViewportDataSource,
18+
transitionProvider: NavigationCameraStateTransitionProvider,
19+
simplifiedUpdateFrameTransitionProvider: SimplifiedUpdateFrameTransitionProvider =
20+
DefaultSimplifiedUpdateFrameTransitionProvider(cameraPlugin),
21+
): NavigationCamera {
22+
return NavigationCamera(
23+
mapboxMap,
24+
cameraPlugin,
25+
viewportDataSource,
26+
transitionProvider,
27+
simplifiedUpdateFrameTransitionProvider,
28+
)
29+
}
30+
}

‎ui-maps/src/test/java/com/mapbox/navigation/ui/maps/guidance/junction/api/MapboxJunctionApiTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ import com.mapbox.navigation.testing.MainCoroutineRule
1717
import com.mapbox.navigation.testing.toDataRef
1818
import com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer
1919
import com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory
20-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoadCallback
21-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
2220
import com.mapbox.navigation.ui.maps.guidance.junction.JunctionAction
2321
import com.mapbox.navigation.ui.maps.guidance.junction.JunctionProcessor
2422
import com.mapbox.navigation.ui.maps.guidance.junction.JunctionResult
2523
import com.mapbox.navigation.ui.maps.guidance.junction.model.JunctionError
2624
import com.mapbox.navigation.ui.maps.guidance.junction.model.JunctionValue
2725
import com.mapbox.navigation.ui.maps.guidance.junction.model.JunctionViewData
2826
import com.mapbox.navigation.ui.maps.guidance.junction.model.JunctionViewFormat
27+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadCallback
2928
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
29+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
3030
import io.mockk.clearAllMocks
3131
import io.mockk.every
3232
import io.mockk.mockk

‎ui-maps/src/test/java/com/mapbox/navigation/ui/maps/guidance/restarea/api/MapboxRestAreaApiTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import com.mapbox.navigation.testing.MainCoroutineRule
1818
import com.mapbox.navigation.testing.toDataRef
1919
import com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer
2020
import com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory
21-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoadCallback
22-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
2321
import com.mapbox.navigation.ui.maps.guidance.restarea.RestAreaAction
2422
import com.mapbox.navigation.ui.maps.guidance.restarea.RestAreaProcessor
2523
import com.mapbox.navigation.ui.maps.guidance.restarea.RestAreaResult
2624
import com.mapbox.navigation.ui.maps.guidance.restarea.model.RestAreaGuideMapError
2725
import com.mapbox.navigation.ui.maps.guidance.restarea.model.RestAreaGuideMapValue
2826
import com.mapbox.navigation.ui.utils.internal.SvgUtil
27+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadCallback
2928
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
29+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
3030
import io.mockk.clearAllMocks
3131
import io.mockk.every
3232
import io.mockk.mockk

‎ui-maps/src/test/java/com/mapbox/navigation/ui/maps/guidance/signboard/api/MapboxSignboardApiTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import com.mapbox.navigation.testing.MainCoroutineRule
1212
import com.mapbox.navigation.testing.toDataRef
1313
import com.mapbox.navigation.ui.base.util.MapboxNavigationConsumer
1414
import com.mapbox.navigation.ui.base.util.internal.resource.ResourceLoaderFactory
15-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoadCallback
16-
import com.mapbox.navigation.ui.base.util.resource.ResourceLoader
1715
import com.mapbox.navigation.ui.maps.guidance.signboard.SignboardAction
1816
import com.mapbox.navigation.ui.maps.guidance.signboard.SignboardProcessor
1917
import com.mapbox.navigation.ui.maps.guidance.signboard.SignboardResult
2018
import com.mapbox.navigation.ui.maps.guidance.signboard.model.MapboxSignboardOptions
2119
import com.mapbox.navigation.ui.maps.guidance.signboard.model.SignboardError
2220
import com.mapbox.navigation.ui.maps.guidance.signboard.model.SignboardValue
21+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadCallback
2322
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoadRequest
23+
import com.mapbox.navigation.ui.utils.internal.resource.ResourceLoader
2424
import com.mapbox.navigation.utils.internal.InternalJobControlFactory
2525
import com.mapbox.navigation.utils.internal.JobControl
2626
import io.mockk.clearAllMocks

0 commit comments

Comments
 (0)