Skip to content

Commit 1623155

Browse files
authored
Use app-preview for nav 3 examples (#198)
* Add example of rendering current location on the map * Add example of fetching routes between 2 points
1 parent c57fbb3 commit 1623155

25 files changed

+423
-2670
lines changed

app-preview/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ android {
6262

6363
dependencies {
6464
// Mapbox Navigation SDK
65-
implementation "com.mapbox.navigation:copilot:2.10.1"
66-
implementation "com.mapbox.navigation:android:2.10.1"
65+
implementation "com.mapbox.navigationcore:navigation:3.0.0-rc.5"
66+
implementation "com.mapbox.navigationcore:ui-maps:3.0.0-rc.5"
6767
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.21"
6868
implementation "androidx.core:core-ktx:1.9.0"
6969
implementation "com.google.android.material:material:1.7.0"
@@ -81,4 +81,4 @@ dependencies {
8181
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
8282
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
8383

84-
}
84+
}

app-preview/src/main/AndroidManifest.xml

+9-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
</activity>
2020

2121
<activity
22-
android:name=".copilot.CopilotActivity"
23-
android:exported="true" />
22+
android:name=".location.ShowCurrentLocationActivity"
23+
android:screenOrientation="portrait"
24+
android:exported="false" />
25+
26+
<activity android:name=".fetchroute.FetchARouteActivity"
27+
android:screenOrientation="portrait"
28+
android:exported="false"
29+
/>
2430
</application>
25-
</manifest>
31+
</manifest>

app-preview/src/main/java/com/mapbox/navigation/examples/preview/ExamplesList.kt

+12-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,20 @@ package com.mapbox.navigation.examples.preview
22

33
import android.content.Context
44
import androidx.core.content.ContextCompat
5-
import com.mapbox.navigation.examples.preview.copilot.CopilotActivity
5+
import com.mapbox.navigation.examples.preview.fetchroute.FetchARouteActivity
6+
import com.mapbox.navigation.examples.preview.location.ShowCurrentLocationActivity
67

78
fun Context.examplesList() = listOf(
89
MapboxExample(
9-
ContextCompat.getDrawable(
10-
this,
11-
R.drawable.mapbox_screenshot_copilot
12-
),
13-
getString(R.string.title_copilot),
14-
getString(R.string.description_copilot),
15-
CopilotActivity::class.java
10+
ContextCompat.getDrawable(this, R.drawable.mapbox_ic_user_current_location),
11+
getString(R.string.title_current_location),
12+
getString(R.string.description_current_location),
13+
ShowCurrentLocationActivity::class.java
14+
),
15+
MapboxExample(
16+
ContextCompat.getDrawable(this, R.drawable.mapbox_screenshot_fetch_a_route),
17+
getString(R.string.title_fetch_route),
18+
getString(R.string.description_fetch_route),
19+
FetchARouteActivity::class.java
1620
),
1721
)

app-preview/src/main/java/com/mapbox/navigation/examples/preview/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class MainActivity : AppCompatActivity(), PermissionsListener {
4040
bindExamples()
4141
}
4242

43-
override fun onExplanationNeeded(permissionsToExplain: MutableList<String>?) {
43+
override fun onExplanationNeeded(permissionsToExplain: List<String>) {
4444
Toast.makeText(
4545
this,
4646
"This app needs location and storage permissions in order to show its functionality.",

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/CopilotActivity.kt

-237
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/CopilotViewModel.kt

-42
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/res/drawable/ic_feedback.xml

-5
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/res/drawable/ic_route.xml

-5
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/res/drawable/ic_search.xml

-7
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/res/drawable/ic_start.xml

-5
This file was deleted.

app-preview/src/main/java/com/mapbox/navigation/examples/preview/copilot/res/drawable/ic_stop.xml

-5
This file was deleted.

0 commit comments

Comments
 (0)