Update NavigationActivity naming to avoid naming collisions (#1020)

mapbox · Jun 14, 2018 · 4b35273 · 4b35273
1 parent 2cfbc2d
commit 4b35273
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libandroid-navigation-ui/src/main/AndroidManifest.xml b/libandroid-navigation-ui/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
-    <activity android:name=".NavigationActivity"/>
+    <activity android:name=".MapboxNavigationActivity"/>
   </application>
 
 </manifest>
diff --git a/.../navigation/ui/v5/NavigationActivity.java → ...ation/ui/v5/MapboxNavigationActivity.java b/.../navigation/ui/v5/NavigationActivity.java → ...ation/ui/v5/MapboxNavigationActivity.java
@@ -17,7 +17,8 @@
  * <p>
  * Demonstrates the proper setup and usage of the view, including all lifecycle methods.
  */
-public class NavigationActivity extends AppCompatActivity implements OnNavigationReadyCallback, NavigationListener {
+public class MapboxNavigationActivity extends AppCompatActivity implements OnNavigationReadyCallback,
+  NavigationListener {
 
   private NavigationView navigationView;
 

diff --git a/...ion-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java b/...ion-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationLauncher.java
@@ -43,7 +43,7 @@ public static void startNavigation(Activity activity, NavigationLauncherOptions
 
     editor.apply();
 
-    Intent navigationActivity = new Intent(activity, NavigationActivity.class);
+    Intent navigationActivity = new Intent(activity, MapboxNavigationActivity.class);
     activity.startActivity(navigationActivity);
   }