[android][sdk] Move routing types to .sdk.routing

Signed-off-by: Andrei Shkrob <github@shkrob.dev>

android/app/src/main/java/app/organicmaps/Framework.java

@@ -13,13 +13,12 @@ import app.organicmaps.api.RequestType;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
-import app.organicmaps.products.Product;
 import app.organicmaps.products.ProductsConfig;
-import app.organicmaps.routing.JunctionInfo;
-import app.organicmaps.routing.RouteMarkData;
-import app.organicmaps.routing.RoutePointInfo;
-import app.organicmaps.routing.RoutingInfo;
-import app.organicmaps.routing.TransitRouteInfo;
+import app.organicmaps.sdk.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.RouteMarkData;
+import app.organicmaps.sdk.routing.RoutePointInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.PlacePageActivationListener;
 import app.organicmaps.sdk.routing.RoutingListener;
 import app.organicmaps.sdk.routing.RoutingLoadPointsListener;

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -79,11 +79,11 @@ import app.organicmaps.maplayer.isolines.IsolinesState;
 import app.organicmaps.routing.ManageRouteBottomSheet;
 import app.organicmaps.routing.NavigationController;
 import app.organicmaps.routing.NavigationService;
-import app.organicmaps.routing.RoutePointInfo;
+import app.organicmaps.sdk.routing.RoutePointInfo;
 import app.organicmaps.routing.RoutingBottomMenuListener;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.routing.RoutingErrorDialogFragment;
-import app.organicmaps.routing.RoutingOptions;
+import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.routing.RoutingPlanFragment;
 import app.organicmaps.routing.RoutingPlanInplaceController;
 import app.organicmaps.sdk.ChoosePositionMode;

android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java

@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
-import app.organicmaps.routing.RoutePointInfo;
+import app.organicmaps.sdk.routing.RoutePointInfo;
 import app.organicmaps.sdk.search.Popularity;
 import app.organicmaps.util.Constants;
 

android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java

@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
-import app.organicmaps.routing.RoutePointInfo;
+import app.organicmaps.sdk.routing.RoutePointInfo;
 import app.organicmaps.sdk.search.Popularity;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlacePageData;

android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java

@@ -30,10 +30,10 @@ import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
-import app.organicmaps.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.JunctionInfo;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sound.TtsPlayer;
 import app.organicmaps.util.LocationUtils;
 import app.organicmaps.util.log.Logger;

android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java

@@ -41,7 +41,7 @@ import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.routing.ResultCodesHelper;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.Router;
 import app.organicmaps.util.Config;
 

android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java

@@ -18,7 +18,7 @@ import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.Toggle;
 import app.organicmaps.car.util.UiHelpers;
-import app.organicmaps.routing.RoutingOptions;
+import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.settings.RoadType;
 
 import java.util.HashMap;

android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java

@@ -8,8 +8,8 @@ import androidx.car.app.navigation.model.LaneDirection;
 import androidx.car.app.navigation.model.Maneuver;
 import androidx.core.graphics.drawable.IconCompat;
 
-import app.organicmaps.routing.RoutingInfo;
-import app.organicmaps.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.SingleLaneInfo;
 
 public final class RoutingHelpers
 {

android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java

@@ -15,8 +15,8 @@ import androidx.car.app.navigation.model.Trip;
 import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.bookmarks.data.MapObject;
-import app.organicmaps.routing.RoutingInfo;
-import app.organicmaps.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.SingleLaneInfo;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.widget.LanesDrawable;
 

android/app/src/main/java/app/organicmaps/location/LocationHelper.java

@@ -25,7 +25,7 @@ import app.organicmaps.Map;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
-import app.organicmaps.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.JunctionInfo;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.util.Config;
 import app.organicmaps.util.LocationUtils;

android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java

@@ -5,7 +5,7 @@ import android.location.Location;
 
 import androidx.annotation.NonNull;
 
-import app.organicmaps.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.JunctionInfo;
 import app.organicmaps.util.LocationUtils;
 import app.organicmaps.util.concurrency.UiThread;
 import app.organicmaps.util.log.Logger;

android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java

@@ -17,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.sdk.routing.RouteMarkData;
+import app.organicmaps.sdk.routing.RoutePointInfo;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 

android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java

@@ -20,6 +20,7 @@ import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;

android/app/src/main/java/app/organicmaps/routing/NavigationController.java

@@ -19,6 +19,7 @@ import app.organicmaps.location.LocationHelper;
 import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;

android/app/src/main/java/app/organicmaps/routing/NavigationService.java

@@ -33,6 +33,7 @@ import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sound.MediaPlayerWrapper;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;

android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java

@@ -32,6 +32,11 @@ import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.location.LocationHelper;
+import app.organicmaps.sdk.routing.RouteMarkData;
+import app.organicmaps.sdk.routing.RoutePointInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.TransitRouteInfo;
+import app.organicmaps.sdk.routing.TransitStepInfo;
 import app.organicmaps.util.Distance;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;

android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuListener.java

@@ -1,5 +1,7 @@
 package app.organicmaps.routing;
 
+import app.organicmaps.sdk.routing.RoutePointInfo;
+
 public interface RoutingBottomMenuListener
 {
   void onUseMyPositionAsStart();

android/app/src/main/java/app/organicmaps/routing/RoutingController.java

@@ -17,10 +17,15 @@ import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.routing.RouteMarkData;
+import app.organicmaps.sdk.routing.RoutePointInfo;
 import app.organicmaps.sdk.routing.RouteRecommendationType;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.RoutingListener;
 import app.organicmaps.sdk.routing.RoutingLoadPointsListener;
+import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.routing.RoutingProgressListener;
+import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.widget.placepage.CoordinatesFormat;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.Utils;

android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java

@@ -19,6 +19,9 @@ import app.organicmaps.Framework;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.RoutingOptions;
+import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.settings.DrivingOptionsActivity;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;

android/app/src/main/java/app/organicmaps/routing/TransitStepAdapter.java

@@ -8,6 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
+import app.organicmaps.sdk.routing.TransitStepInfo;
 
 import java.util.ArrayList;
 import java.util.List;

android/app/src/main/java/app/organicmaps/routing/TransitStepView.java

@@ -20,6 +20,8 @@ import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import app.organicmaps.R;
+import app.organicmaps.sdk.routing.TransitStepInfo;
+import app.organicmaps.sdk.routing.TransitStepType;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
 import app.organicmaps.util.ThemeUtils;
 

android/app/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java

@@ -1,11 +1,11 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.Keep;
 
 // Used by JNI.
 @Keep
 @SuppressWarnings("unused")
-public class JunctionInfo
+public final class JunctionInfo
 {
   public final double mLat;
   public final double mLon;

android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 // Called from JNI.
 @Keep
 @SuppressWarnings("unused")
-public class RouteMarkData
+public final class RouteMarkData
 {
   @Nullable
   public final String mTitle;

android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -12,7 +12,7 @@ import java.lang.annotation.RetentionPolicy;
 // Called from JNI.
 @Keep
 @SuppressWarnings("unused")
-public class RoutePointInfo implements Parcelable
+public final class RoutePointInfo implements Parcelable
 {
   public static final Creator<RoutePointInfo> CREATOR = new Creator<>()
   {

android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import android.widget.ImageView;
 
@@ -12,7 +12,7 @@ import app.organicmaps.util.Distance;
 // Called from JNI.
 @Keep
 @SuppressWarnings("unused")
-public class RoutingInfo
+public final class RoutingInfo
 {
   // Target (end point of route).
   public final Distance distToTarget;
@@ -105,7 +105,7 @@ public class RoutingInfo
     }
   }
 
-  enum PedestrianTurnDirection
+  public enum PedestrianTurnDirection
   {
     NO_TURN(R.drawable.ic_turn_straight, 0),
     GO_STRAIGHT(R.drawable.ic_turn_straight, 0),

android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.NonNull;
 
@@ -7,7 +7,7 @@ import app.organicmaps.settings.RoadType;
 import java.util.HashSet;
 import java.util.Set;
 
-public class RoutingOptions
+public final class RoutingOptions
 {
   public static void addOption(@NonNull RoadType roadType)
   {
@@ -24,10 +24,6 @@ public class RoutingOptions
     return nativeHasOption(roadType.ordinal());
   }
 
-  private static native void nativeAddOption(int option);
-  private static native void nativeRemoveOption(int option);
-  private static native boolean nativeHasOption(int option);
-
   public static boolean hasAnyOptions()
   {
     for (RoadType each : RoadType.values())
@@ -49,4 +45,10 @@ public class RoutingOptions
     }
     return roadTypes;
   }
+
+  private static native void nativeAddOption(int option);
+
+  private static native void nativeRemoveOption(int option);
+
+  private static native boolean nativeHasOption(int option);
 }

android/app/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java

@@ -1,11 +1,11 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 
 import app.organicmaps.R;
 
-public class SingleLaneInfo
+public final class SingleLaneInfo
 {
   public LaneWay[] mLane;
   public boolean mIsActive;

android/app/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -13,7 +13,7 @@ import java.util.List;
 // Used by JNI.
 @Keep
 @SuppressWarnings("unused")
-public class TransitRouteInfo
+public final class TransitRouteInfo
 {
   @NonNull
   private final String mTotalDistance;
@@ -42,29 +42,29 @@ public class TransitRouteInfo
   }
 
   @NonNull
-  String getTotalPedestrianDistance()
+  public String getTotalPedestrianDistance()
   {
     return mTotalPedestrianDistance;
   }
 
-  int getTotalPedestrianTimeInSec()
+  public int getTotalPedestrianTimeInSec()
   {
     return mTotalPedestrianTimeInSec;
   }
 
   @NonNull
-  String getTotalPedestrianDistanceUnits()
+  public String getTotalPedestrianDistanceUnits()
   {
     return mTotalPedestrianDistanceUnits;
   }
 
-  int getTotalTime()
+  public int getTotalTime()
   {
     return mTotalTimeInSec;
   }
 
   @NonNull
-  List<TransitStepInfo> getTransitSteps()
+  public List<TransitStepInfo> getTransitSteps()
   {
     return new ArrayList<>(Arrays.asList(mSteps));
   }

android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Keep;
@@ -14,7 +14,7 @@ import java.lang.annotation.RetentionPolicy;
 // Used by JNI.
 @Keep
 @SuppressWarnings("unused")
-public class TransitStepInfo
+public final class TransitStepInfo
 {
   private static final int TRANSIT_TYPE_INTERMEDIATE_POINT = 0;
   private static final int TRANSIT_TYPE_PEDESTRIAN = 1;

android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java

@@ -1,4 +1,4 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
 import androidx.annotation.DrawableRes;
 

android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java

@@ -14,7 +14,7 @@ import androidx.appcompat.widget.SwitchCompat;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.routing.RoutingOptions;
+import app.organicmaps.sdk.routing.RoutingOptions;
 
 import java.util.ArrayList;
 import java.util.Collections;

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -24,7 +24,7 @@ import app.organicmaps.editor.data.Language;
 import app.organicmaps.help.HelpActivity;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationProviderFactory;
-import app.organicmaps.routing.RoutingOptions;
+import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.util.Config;
 import app.organicmaps.util.NetworkPolicy;
 import app.organicmaps.util.PowerManagment;

android/app/src/main/java/app/organicmaps/widget/LanesDrawable.java

@@ -15,7 +15,7 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 
 import app.organicmaps.R;
-import app.organicmaps.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.SingleLaneInfo;
 
 import java.util.Objects;
 

android/app/src/main/java/app/organicmaps/widget/LanesView.java

@@ -18,7 +18,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StyleableRes;
 
 import app.organicmaps.R;
-import app.organicmaps.routing.SingleLaneInfo;
+import app.organicmaps.sdk.routing.SingleLaneInfo;
 
 public class LanesView extends View
 {

android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java

@@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import app.organicmaps.R;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.routing.RoutingInfo;
+import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sound.TtsPlayer;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.StringUtils;