diff --git a/OsmAnd-telegram/build.gradle b/OsmAnd-telegram/build.gradle index 4b215af1ad..6491fe3267 100644 --- a/OsmAnd-telegram/build.gradle +++ b/OsmAnd-telegram/build.gradle @@ -138,6 +138,7 @@ afterEvaluate { dependencies { implementation project(path: ':OsmAnd-java', configuration: 'android') implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(":osmand-api") implementation( "org.jetbrains.kotlin:kotlin-stdlib:1.2.71") { exclude group: 'org.jetbrains', module: 'annotations' diff --git a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl deleted file mode 100644 index f15fe8f44b..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlCallback.aidl +++ /dev/null @@ -1,54 +0,0 @@ -package net.osmand.aidl; - -import net.osmand.aidl.search.SearchResult; -import net.osmand.aidl.gpx.AGpxBitmap; -import net.osmand.aidl.navigation.ADirectionInfo; -import net.osmand.aidl.navigation.OnVoiceNavigationParams; - -interface IOsmAndAidlCallback { - - /** - * Callback for search requests. - * - * @return resultSet - set of SearchResult - */ - void onSearchComplete(in List resultSet); - - /** - * Callback for {@link IOsmAndAidlInterface} registerForUpdates() method. - */ - void onUpdate(); - - /** - * Callback for {@link IOsmAndAidlInterface} registerForOsmandInitListener() method. - */ - void onAppInitialized(); - - /** - * Callback for {@link IOsmAndAidlInterface} getBitmapForGpx() method. - * - * @return bitmap - snapshot image of gpx track on map - */ - void onGpxBitmapCreated(in AGpxBitmap bitmap); - - /** - * Callback for {@link IOsmAndAidlInterface} registerForNavigationUpdates() method. - * - * @return directionInfo - update on distance to next turn and turns type. - */ - void updateNavigationInfo(in ADirectionInfo directionInfo); - - /** - * Callback for {@link IOsmAndAidlInterface} buttons set with addContextMenuButtons() method. - * - * @param buttonId - id of custom button - * @param pointId - id of point button associated with - * @param layerId - id of layer point and button associated with - */ - void onContextMenuButtonClicked(in int buttonId, String pointId, String layerId); - - /** - * Callback for {@link IOsmAndAidlInterface} registerForVoiceRouterMessages() method. - */ - void onVoiceRouterNotify(in OnVoiceNavigationParams params); -} \ No newline at end of file diff --git a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl deleted file mode 100644 index 541194e18d..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/IOsmAndAidlInterface.aidl +++ /dev/null @@ -1,849 +0,0 @@ -package net.osmand.aidl; - -import net.osmand.aidl.map.ALatLon; -import net.osmand.aidl.map.SetMapLocationParams; - -import net.osmand.aidl.favorite.group.AFavoriteGroup; -import net.osmand.aidl.favorite.group.AddFavoriteGroupParams; -import net.osmand.aidl.favorite.group.RemoveFavoriteGroupParams; -import net.osmand.aidl.favorite.group.UpdateFavoriteGroupParams; - -import net.osmand.aidl.favorite.AFavorite; -import net.osmand.aidl.favorite.AddFavoriteParams; -import net.osmand.aidl.favorite.RemoveFavoriteParams; -import net.osmand.aidl.favorite.UpdateFavoriteParams; - -import net.osmand.aidl.mapmarker.AMapMarker; -import net.osmand.aidl.mapmarker.AddMapMarkerParams; -import net.osmand.aidl.mapmarker.RemoveMapMarkerParams; -import net.osmand.aidl.mapmarker.UpdateMapMarkerParams; - -import net.osmand.aidl.calculateroute.CalculateRouteParams; - -import net.osmand.aidl.gpx.ImportGpxParams; -import net.osmand.aidl.gpx.ShowGpxParams; -import net.osmand.aidl.gpx.StartGpxRecordingParams; -import net.osmand.aidl.gpx.StopGpxRecordingParams; -import net.osmand.aidl.gpx.HideGpxParams; -import net.osmand.aidl.gpx.ASelectedGpxFile; - -import net.osmand.aidl.mapwidget.AMapWidget; -import net.osmand.aidl.mapwidget.AddMapWidgetParams; -import net.osmand.aidl.mapwidget.RemoveMapWidgetParams; -import net.osmand.aidl.mapwidget.UpdateMapWidgetParams; - -import net.osmand.aidl.maplayer.point.AMapPoint; -import net.osmand.aidl.maplayer.point.AddMapPointParams; -import net.osmand.aidl.maplayer.point.RemoveMapPointParams; -import net.osmand.aidl.maplayer.point.UpdateMapPointParams; -import net.osmand.aidl.maplayer.AMapLayer; -import net.osmand.aidl.maplayer.AddMapLayerParams; -import net.osmand.aidl.maplayer.RemoveMapLayerParams; -import net.osmand.aidl.maplayer.UpdateMapLayerParams; - -import net.osmand.aidl.navigation.NavigateParams; -import net.osmand.aidl.navigation.NavigateGpxParams; - -import net.osmand.aidl.note.TakePhotoNoteParams; -import net.osmand.aidl.note.StartVideoRecordingParams; -import net.osmand.aidl.note.StartAudioRecordingParams; -import net.osmand.aidl.note.StopRecordingParams; - -import net.osmand.aidl.gpx.RemoveGpxParams; - -import net.osmand.aidl.maplayer.point.ShowMapPointParams; - -import net.osmand.aidl.navdrawer.SetNavDrawerItemsParams; -import net.osmand.aidl.navdrawer.NavDrawerFooterParams; -import net.osmand.aidl.navdrawer.NavDrawerHeaderParams; - -import net.osmand.aidl.navigation.PauseNavigationParams; -import net.osmand.aidl.navigation.ResumeNavigationParams; -import net.osmand.aidl.navigation.StopNavigationParams; -import net.osmand.aidl.navigation.MuteNavigationParams; -import net.osmand.aidl.navigation.UnmuteNavigationParams; - -import net.osmand.aidl.IOsmAndAidlCallback; - -import net.osmand.aidl.search.SearchResult; -import net.osmand.aidl.search.SearchParams; -import net.osmand.aidl.navigation.NavigateSearchParams; - -import net.osmand.aidl.customization.SetWidgetsParams; -import net.osmand.aidl.customization.OsmandSettingsParams; -import net.osmand.aidl.customization.OsmandSettingsInfoParams; -import net.osmand.aidl.customization.CustomizationInfoParams; - -import net.osmand.aidl.gpx.AGpxFile; -import net.osmand.aidl.gpx.AGpxFileDetails; -import net.osmand.aidl.gpx.CreateGpxBitmapParams; -import net.osmand.aidl.gpx.GpxColorParams; - -import net.osmand.aidl.tiles.ASqliteDbFile; - -import net.osmand.aidl.plugins.PluginParams; -import net.osmand.aidl.copyfile.CopyFileParams; - -import net.osmand.aidl.navigation.ANavigationUpdateParams; -import net.osmand.aidl.navigation.ANavigationVoiceRouterMessageParams; - -import net.osmand.aidl.contextmenu.ContextMenuButtonsParams; -import net.osmand.aidl.contextmenu.UpdateContextMenuButtonsParams; -import net.osmand.aidl.contextmenu.RemoveContextMenuButtonsParams; - -import net.osmand.aidl.mapmarker.RemoveMapMarkersParams; - -// NOTE: Add new methods at the end of file!!! - -interface IOsmAndAidlInterface { - - /** - * Add map marker at given location. - * - * @param lat (double) - latitude. - * @param lon (double) - longitude. - * @param name (String)- name of marker. - */ - boolean addMapMarker(in AddMapMarkerParams params); - - /** - * Remove map marker. - * - * If ignoreCoordinates is false the marker is only removed if lat/lon match the currently set values of the marker. - * If ignoreCoordinates is true the marker is removed if the name matches, the values of lat/lon are ignored. - * - * @param lat (double) - latitude. - * @param lon (double) - longitude. - * @param name (String)- name of marker. - * @param ignoreCoordinates (boolean) - flag to determine whether lat/lon shall be ignored - */ - boolean removeMapMarker(in RemoveMapMarkerParams params); - - /** - * Update map marker. - * - * If ignoreCoordinates is false the marker gets updated only if latPrev/lonPrev match the currently set values of the marker. - * If ignoreCoordinates is true the marker gets updated if the name matches, the values of latPrev/lonPrev are ignored. - * - * @param latPrev (double) - latitude (current marker). - * @param lonPrev (double) - longitude (current marker). - * @param namePrev (String) - name (current marker). - * @param latNew (double) - latitude (new marker). - * @param lonNew (double) - longitude (new marker). - * @param nameNew (String) - name (new marker). - * @param ignoreCoordinates (boolean) - flag to determine whether latPrev/lonPrev shall be ignored - */ - boolean updateMapMarker(in UpdateMapMarkerParams params); - - /** - * Add map widget to the right side of the main screen. - * Note: any specified icon should exist in OsmAnd app resources. - * - * @param id (String) - widget id. - * @param menuIconName (String) - icon name (configure map menu). - * @param menuTitle (String) - widget name (configure map menu). - * @param lightIconName (String) - icon name for the light theme (widget). - * @param darkIconName (String) - icon name for the dark theme (widget). - * @param text (String) - main widget text. - * @param description (String) - sub text, like "km/h". - * @param order (int) - order position in the widgets list. - * @param intentOnClick (String) - onClick intent. Called after click on widget as startActivity(Intent intent). - */ - boolean addMapWidget(in AddMapWidgetParams params); - - /** - * Remove map widget. - * - * @param (String) id - widget id. - */ - boolean removeMapWidget(in RemoveMapWidgetParams params); - - /** - * Update map widget. - * Note: any specified icon should exist in OsmAnd app resources. - * - * @param id (String) - widget id. - * @param menuIconName (String) - icon name (configure map menu). - * @param menuTitle (String) - widget name (configure map menu). - * @param lightIconName (String) - icon name for the light theme (widget). - * @param darkIconName (String) - icon name for the dark theme (widget). - * @param text (String) - main widget text. - * @param description (String) - sub text, like "km/h". - * @param order (int) - order position in the widgets list. - * @param intentOnClick (String) - onClick intent. Called after click on widget as startActivity(Intent intent). - */ - boolean updateMapWidget(in UpdateMapWidgetParams params); - - /** - * Add point to user layer. - * - * @param layerId (String) - layer id. Note: layer should be added first. - * @param pointId (String) - point id. - * @param shortName (String) - short name (single char). Displayed on the map. - * @param fullName (String) - full name. Displayed in the context menu on first row. - * @param typeName (String) - type name. Displayed in context menu on second row. - * @param color (int) - color of circle's background. - * @param location (ALatLon) - location of the point. - * @param details (List)- list of details. Displayed under context menu. - * @param params (Map) - optional map of params for point. - */ - boolean addMapPoint(in AddMapPointParams params); - - - /** - * Remove point. - * - * @param layerId (String) - layer id. - * @param pointId (String) - point id. - */ - boolean removeMapPoint(in RemoveMapPointParams params); - - /** - * Update point. - * - * @param layerId (String) - layer id. - * @param pointId (String) - point id. - * @param updateOpenedMenuAndMap (boolean) - flag to enable folowing mode and menu updates for point - * @param shortName (String) - short name (single char). Displayed on the map. - * @param fullName (String) - full name. Displayed in the context menu on first row. - * @param typeName (String) - type name. Displayed in context menu on second row. - * @param color (String) - color of circle's background. - * @param location (ALatLon)- location of the point. - * @param details (List) - list of details. Displayed under context menu. - * @param params (Map) - optional map of params for point. - */ - boolean updateMapPoint(in UpdateMapPointParams params); - - /** - * Add user layer on the map. - * - * @param id (String) - layer id. - * @param name (String) - layer name. - * @param zOrder (float) - z-order position of layer. Default value is 5.5f - * @param points Map - initial list of points. Nullable. - * @param imagePoints (boolean) - use new style for points on map or not. Also default zoom bounds for new style can be edited. - */ - boolean addMapLayer(in AddMapLayerParams params); - - /** - * Remove user layer. - * - * @param id (String) - layer id. - */ - boolean removeMapLayer(in RemoveMapLayerParams params); - - /** - * Update user layer. - * - * @param id (String) - layer id. - * @param name (String) - layer name. - * @param zOrder (float) - z-order position of layer. Default value is 5.5f - * @param points Map - list of points. Nullable. - * @param imagePoints (boolean) - use new style for points on map or not. Also default zoom bounds for new style can be edited. - */ - boolean updateMapLayer(in UpdateMapLayerParams params); - - /** - * Import GPX file to OsmAnd (from URI or file). - * - * @param gpxUri (Uri) - URI created by FileProvider (preferable method). - * @param file (File) - File which represents GPX track (not recomended, OsmAnd should have rights to access file location). - * @param fileName (String) - Destination file name. May contain dirs. - * @param color (String) - color of gpx. Can be one of: "red", "orange", "lightblue", "blue", "purple", - * "translucent_red", "translucent_orange", "translucent_lightblue", - * "translucent_blue", "translucent_purple" - * @param show (boolean) - show track on the map after import - */ - boolean importGpx(in ImportGpxParams params); - - /** - * Show GPX file on map. - * - * @param fileName (String) - file name to show. Must be imported first. - */ - boolean showGpx(in ShowGpxParams params); - - /** - * Hide GPX file. - * - * @param fileName (String) - file name to hide. - */ - boolean hideGpx(in HideGpxParams params); - - /** - * Get list of active GPX files. - * - * @return list of active gpx files. - */ - boolean getActiveGpx(out List files); - - /** - * Set map view to current location. - * - * @param latitude (double) - latitude of new map center. - * @param longitude (double) - longitude of new map center. - * @param zoom (float) - map zoom level. Set 0 to keep zoom unchanged. - * @param animated (boolean) - set true to animate changes. - */ - boolean setMapLocation(in SetMapLocationParams params); - - - boolean calculateRoute(in CalculateRouteParams params); - - /** - * Refresh the map (UI) - */ - boolean refreshMap(); - - /** - * Add favorite group with given params. - * - * @param name (String) - group name. - * @param color (String) - group color. Can be one of: "red", "orange", "yellow", - * "lightgreen", "green", "lightblue", "blue", "purple", "pink", "brown". - * @param visible (boolean) - group visibility. - */ - boolean addFavoriteGroup(in AddFavoriteGroupParams params); - - /** - * Update favorite group with given params. - * - * @param namePrev (String) - group name (current). - * @param colorPrev (String) - group color (current). - * @param visiblePrev (boolean) - group visibility (current). - * @param nameNew (String) - group name (new). - * @param colorNew (String) - group color (new). - * @param visibleNew (boolean) - group visibility (new). - */ - boolean removeFavoriteGroup(in RemoveFavoriteGroupParams params); - - /** - * Remove favorite group with given name. - * - * @param name (String) - name of favorite group. - */ - boolean updateFavoriteGroup(in UpdateFavoriteGroupParams params); - - /** - * Add favorite at given location with given params. - * - * @param lat (double) - latitude. - * @param lon (double) - longitude. - * @param name (String) - name of favorite item. - * @param description (String) - description of favorite item. - * @param category (String) - category of favorite item. - * @param color (String) - color of favorite item. Can be one of: "red", "orange", "yellow", - * "lightgreen", "green", "lightblue", "blue", "purple", "pink", "brown". - * @param visible (boolean) - should favorite item be visible after creation. - */ - boolean addFavorite(in AddFavoriteParams params); - - /** - * Update favorite at given location with given params. - * - * @param latPrev (double) - latitude (current favorite). - * @param lonPrev (double) - longitude (current favorite). - * @param namePrev (String) - name of favorite item (current favorite). - * @param categoryPrev (String) - category of favorite item (current favorite). - * @param latNew (double) - latitude (new favorite). - * @param lonNew (double) - longitude (new favorite). - * @param nameNew (String) - name of favorite item (new favorite). - * @param descriptionNew (String) - description of favorite item (new favorite). - * @param categoryNew (String) - category of favorite item (new favorite). Use only to create a new category, - * not to update an existing one. If you want to update an existing category, - * use the {@link #updateFavoriteGroup(String, String, boolean, String, String, boolean)} method. - * @param colorNew (String) - color of new category. Can be one of: "red", "orange", "yellow", - * "lightgreen", "green", "lightblue", "blue", "purple", "pink", "brown". - * @param visibleNew (boolean) - should new category be visible after creation. - */ - boolean removeFavorite(in RemoveFavoriteParams params); - - /** - * Remove favorite at given location with given params. - * - * @param lat (double) - latitude. - * @param lon (double) - longitude. - * @param name (String) - name of favorite item. - * @param category (String) - category of favorite item. - */ - boolean updateFavorite(in UpdateFavoriteParams params); - - /** - * Start gpx recording. - */ - boolean startGpxRecording(in StartGpxRecordingParams params); - - /** - * Stop gpx recording. - */ - boolean stopGpxRecording(in StopGpxRecordingParams params); - - /** - * Take photo note. - * - * @param lat (double) - latutude of photo note. - * @param lon (double) - longitude of photo note. - */ - boolean takePhotoNote(in TakePhotoNoteParams params); - - /** - * Start video note recording. - * - * @param lat (double) - latutude of video note point. - * @param lon (double) - longitude of video note point. - */ - boolean startVideoRecording(in StartVideoRecordingParams params); - - /** - * Start audio note recording. - * - * @param lat (double) - latutude of audio note point. - * @param lon (double) - longitude of audio note point. - */ - boolean startAudioRecording(in StartAudioRecordingParams params); - - /** - * Stop Audio/Video recording. - */ - boolean stopRecording(in StopRecordingParams params); - - /** - * Start navigation. - * - * @param startName (String) - name of the start point as it displays in OsmAnd's UI. Nullable. - * @param startLat (double) - latitude of the start point. If 0 - current location is used. - * @param startLon (double) - longitude of the start point. If 0 - current location is used. - * @param destName (String) - name of the start point as it displays in OsmAnd's UI. - * @param destLat (double) - latitude of a destination point. - * @param destLon (double) - longitude of a destination point. - * @param profile (String) - One of: "default", "car", "bicycle", "pedestrian", "aircraft", "boat", "hiking", "motorcycle", "truck". Nullable (default). - * @param force (boolean) - ask to stop current navigation if any. False - ask. True - don't ask. - */ - boolean navigate(in NavigateParams params); - - /** - * Start navigation using gpx file. User need to grant Uri permission to OsmAnd. - * - * @param gpxUri (Uri) - URI created by FileProvider. - * @param force (boolean) - ask to stop current navigation if any. False - ask. True - don't ask. - */ - boolean navigateGpx(in NavigateGpxParams params); - - /** - * Remove GPX file. - * - * @param fileName (String) - file name to remove; - */ - boolean removeGpx(in RemoveGpxParams params); - - - /** - * Show AMapPoint on map in OsmAnd. - * - * @param layerId (String) - layer id. Note: layer should be added first. - * @param pointId (String) - point id. - * @param shortName (String) - short name (single char). Displayed on the map. - * @param fullName (String) - full name. Displayed in the context menu on first row. - * @param typeName (String) - type name. Displayed in context menu on second row. - * @param color (int) - color of circle's background. - * @param location (ALatLon) - location of the point. - * @param details List - list of details. Displayed under context menu. - * @param params Map - optional map of params for point. - */ - boolean showMapPoint(in ShowMapPointParams params); - - /** - * Method for adding up to 3 items to the OsmAnd navigation drawer. - * - * @param appPackage - current application package. - * @param names - list of names for items. - * @param uris - list of uris for intents. - * @param iconNames - list of icon names for items. - * @param flags - list of flags for intents. Use -1 if no flags needed. - */ - boolean setNavDrawerItems(in SetNavDrawerItemsParams params); - - /** - * Put navigation on pause. - */ - boolean pauseNavigation(in PauseNavigationParams params); - - /** - * Resume navigation if it was paused before. - */ - boolean resumeNavigation(in ResumeNavigationParams params); - - /** - * Stop navigation. Removes target / intermediate points and route path from the map. - */ - boolean stopNavigation(in StopNavigationParams params); - - - /** - * Mute voice guidance. Stays muted until unmute manually or via the api. - */ - boolean muteNavigation(in MuteNavigationParams params); - - /** - * Unmute voice guidance. - */ - boolean unmuteNavigation(in UnmuteNavigationParams params); - - /** - * Run search for POI / Address. - * - * @param searchQuery (String) - search query string. - * @param searchType (int) - type of search. Values: - * SearchParams.SEARCH_TYPE_ALL - all kind of search - * SearchParams.SEARCH_TYPE_POI - POIs only - * SearchParams.SEARCH_TYPE_ADDRESS - addresses only - * - * @param latitude (double) - latitude of original search location. - * @param longitude (double) - longitude of original search location. - * @param radiusLevel (int) - value from 1 to 7. Default value = 1. - * @param totalLimit (int) - limit of returned search result rows. Default value = -1 (unlimited). - */ - boolean search(in SearchParams params, IOsmAndAidlCallback callback); - - /** - * Do search and start navigation. - * - * @param startName (String) - name of the start point as it displays in OsmAnd's UI. Nullable. - * @param startLat (double) - latitude of the start point. If 0 - current location is used. - * @param startLon (double) - longitude of the start point. If 0 - current location is used. - * @param searchQuery (String) - Text of a query for searching a destination point. Sent as URI parameter. - * @param searchLat (double) - original location of search (latitude). Sent as URI parameter. - * @param searchLon (double) - original location of search (longitude). Sent as URI parameter. - * @param profile (String) - one of: "default", "car", "bicycle", "pedestrian", "aircraft", "boat", "hiking", "motorcycle", "truck". Nullable (default). - * @param force (boolean) - ask to stop current navigation if any. False - ask. True - don't ask. - */ - boolean navigateSearch(in NavigateSearchParams params); - - /** - * Method to register for periodical callbacks from OsmAnd - * - * @param updateTimeMS (long)- period of time in millisecond after which callback is triggered - * @param callback (IOsmAndCallback)- create and provide instance of {@link IOsmAndAidlCallback} interface - * @return id (long) - id of callback in OsmAnd. Needed to unsubscribe from updates. - */ - long registerForUpdates(in long updateTimeMS, IOsmAndAidlCallback callback); - - /** - * Method to unregister from periodical callbacks from OsmAnd - * - * @param callbackId (long)- id of registered callback (provided by OsmAnd - * in {@link OsmAndAidlHelper#registerForUpdates(long, IOsmAndAidlCallback)}) - */ - boolean unregisterFromUpdates(in long callbackId); - - /** - * Method for adding image to the top of Osmand's NavDrawer. - * - * @param imageUri (String)- image's URI.toString - * - * @deprecated - * Use the {@link #setNavDrawerLogoWithParams(NavDrawerHeaderParams params)} method. - */ - boolean setNavDrawerLogo(in String imageUri); - - /** - * Method for selected UI elements (like QuickSearch button) to show. - * - * @param ids (List)- list of menu items keys from {@link OsmAndCustomizationConstants} - */ - boolean setEnabledIds(in List ids); - - /** - * Method for selected UI elements (like QuickSearch button) to hide. - * - * @param ids (List)- list of menu items keys from {@link OsmAndCustomizationConstants} - */ - boolean setDisabledIds(in List ids); - - /** - * Method to show selected NavDrawer's menu items. - * - * @param patterns (List) - list of menu items names from {@link OsmAndCustomizationConstants} - */ - boolean setEnabledPatterns(in List patterns); - - /** - * Method to hide selected NavDrawer's menu items. - * - * @param patterns (List)- list of menu items names from {@link OsmAndCustomizationConstants} - */ - boolean setDisabledPatterns(in List patterns); - - /** - * Register OsmAnd widgets for visibility. - * - * @param widgetKey ()- widget id. - * @param appModKeys - list of OsmAnd Application modes widget active with. Could be "null" for all modes. - */ - boolean regWidgetVisibility(in SetWidgetsParams params); - - /** - * Register OsmAnd widgets for availability. - * - * @param widgetKey (String) - widget id. - * @param appModKeys (List)- ist of OsmAnd Application modes widget active with. Could be "null" for all modes. - */ - boolean regWidgetAvailability(in SetWidgetsParams params); - - /** - * Add custom parameters for OsmAnd settings to associate with client app. - * - * @param sharedPreferencesName (String)- string with name of clint's app for shared preferences key - * @param bundle (Bundle)- bundle with keys from Settings IDs {@link OsmAndCustomizationConstants} and Settings params - */ - boolean customizeOsmandSettings(in OsmandSettingsParams params); - - /** - * Method to get list of gpx files currently registered (imported or created) in OsmAnd; - * - * @return list of gpx files - */ - boolean getImportedGpx(out List files); - - /** - * Method to get list of sqlitedb files registered in OsmAnd; - * - * @return list of sqlitedb files - */ - boolean getSqliteDbFiles(out List files); - - /** - * Method to get list of currently active sqlitedb files - * - * @return list of sqlitedb files - */ - boolean getActiveSqliteDbFiles(out List files); - - /** - * Method to show selected sqlitedb file as map overlay. - * - * @param fileName (String) - name of sqlitedb file - */ - boolean showSqliteDbFile(String fileName); - - /** - * Method to hide sqlitedb file from map overlay. - * - * @param fileName (String) - name of sqlitedb file - */ - boolean hideSqliteDbFile(String fileName); - - /** - * Method for adding image to the top of OsmAnd's NavDrawer with additional params - * - * @param imageUri (String) - image's URI.toString - * @param packageName (String) - client's app package name - * @param intent (String) - intent for additional functionality on image click - * - */ - boolean setNavDrawerLogoWithParams(in NavDrawerHeaderParams params); - - /** - * Method for adding functionality to "Powered by Osmand" logo in NavDrawer's footer - * (reset OsmAnd settings to pre-clinet app's state) - * - * @param packageName (String) - package name - * @param intent (String) - intent - * @param appName (String) - client's app name - */ - boolean setNavDrawerFooterWithParams(in NavDrawerFooterParams params); - - /** - * Restore default (pre-client) OsmAnd settings and state: - * clears features, widgets and settings customization, NavDraw logo. - */ - boolean restoreOsmand(); - - /** - * Method to change state of plug-ins in OsmAnd. - * - * @param pluginId (String) - id (name) of plugin. - * @param newState (int) - new state (0 - off, 1 - on). - */ - boolean changePluginState(in PluginParams params); - - /** - * Method to register for callback on OsmAnd initialization - * @param callback (IOsmAndAidlCallback) - create and provide instance of {@link IOsmAndAidlCallback} interface - */ - boolean registerForOsmandInitListener(in IOsmAndAidlCallback callback); - - /** - * Requests bitmap snap-shot of map with GPX file from provided URI in its center. - * You can set bitmap size, density and GPX lines color, but you need - * to manually download appropriate map in OsmAnd or background will be empty. - * Bitmap will be returned through callback {@link IOsmAndAidlCallback#onGpxBitmapCreated(AGpxBitmap)} - * - * @param gpxUri (Uri/File) - Uri for gpx file - * @param density (float) - image density. Recommended to use default metrics for device's display. - * @param widthPixels (int) - width of bitmap - * @param heightPixels (int) - height of bitmap - * @param color (int) - color in ARGB format - * @param callback (IOsmAndAidlCallback) - instance of callback from OsmAnd. - */ - boolean getBitmapForGpx(in CreateGpxBitmapParams file, IOsmAndAidlCallback callback); - - /** - * Method to copy files to OsmAnd part by part. For now supports only sqlitedb format. - * Part size (bytearray) should not exceed 256k. - * - * @param fileName (String) - name of file - * @param filePartData (byte[]) - parts of file, byte[] with size 256k or less. - * @param startTime (long) - timestamp of copying start. - * @param isDone (boolean) - boolean to mark end of copying. - * @return number of last successfully received file part or error(-1). - */ - int copyFile(in CopyFileParams filePart); - - /** - * Method to register for updates during navgation. Notifies user about distance to the next turn and its type. - * - * @param subscribeToUpdates (boolean) - subscribe or unsubscribe from updates - * @param callbackId (long) - id of callback, needed to unsubscribe from updates - * @param callback (IOsmAndAidlCallback) - callback to notify user on navigation data change - */ - long registerForNavigationUpdates(in ANavigationUpdateParams params, IOsmAndAidlCallback callback); - - /** - * Method to add Context Menu buttons to OsmAnd Context menu. - * - * {@link ContextMenuButtonsParams } is a wrapper class for params: - * - * @param leftButton (AContextMenuButton) - parameters for left context button: - * @param buttonId (String at AContextMenuButton) - id of button in View - * @param leftTextCaption (String at AContextMenuButton) - left-side button text - * @param rightTextCaption (String at AContextMenuButton) - right-side button text - * @param String leftIconName (String at AContextMenuButton) - name of left-side icon - * @param String rightIconName (String at AContextMenuButton) - name of right-side icon - * @param boolean needColorizeIcon (booleanat AContextMenuButton) - flag to apply color to icon - * @param boolean enabled (boolean at AContextMenuButton) - enable button flag - * - * @param rightButton (AContextMenuButton) - parameters for right context button, see leftButton param for details. - * @param id (String) - button id; - * @param appPackage (String) - clinet's app package name - * @param layerId (String) - id of Osmand's map layer - * @param callbackId (long) - {@link IOsmAndAidlCallback} id - * @param pointsIds (List) - list of point Ids to which this rules applies to. - * - * @param callback (IOsmAndAidlCallback) - AIDL callback; - * - * @return long - callback's Id; - */ - long addContextMenuButtons(in ContextMenuButtonsParams params, IOsmAndAidlCallback callback); - - /** - * Method to remove Context Menu buttons from OsmAnd Context menu. - * - * {@link RemoveContextMenuButtonsParams} is a wrapper class for params: - * - * @param paramsId (String) - id of {@link ContextMenuButtonsParams} of button you want to remove; - * @param callbackId (long) - id of {@ling IOsmAndAidlCallback} of button you want to remove; - * - */ - boolean removeContextMenuButtons(in RemoveContextMenuButtonsParams params); - - /** - * Method to update params on already set custom Context Button. - * - * {@link UpdateContextMenuButtonsParams } is a wrapper class for params: - * - * @param leftButton (AContextMenuButton) - parameters for left context button: - * @param buttonId (String at AContextMenuButton) - id of button in View - * @param leftTextCaption (String at AContextMenuButton) - left-side button text - * @param rightTextCaption (String at AContextMenuButton) - right-side button text - * @param String leftIconName (String at AContextMenuButton) - name of left-side icon - * @param String rightIconName (String at AContextMenuButton) - name of right-side icon - * @param boolean needColorizeIcon (booleanat AContextMenuButton) - flag to apply color to icon - * @param boolean enabled (boolean at AContextMenuButton) - enable button flag - * - * @param rightButton (AContextMenuButton) - parameters for right context button, see leftButton param for details. - * @param id (String) - button id; - * @param appPackage (String) - clinet's app package name - * @param layerId (String) - id of Osmand's map layer - * @param callbackId (long) - {@link IOsmAndAidlCallback} id - * @param pointsIds (List) - list of point Ids to which this rules applies to. - * - */ - boolean updateContextMenuButtons(in UpdateContextMenuButtonsParams params); - - /** - * Method to check if there is a customized setting in OsmAnd Settings. - * - * {@link OsmandSettingsInfoParams} is a wrapper class for params: - * - * @param sharedPreferencesName (String at OsmandSettingInfoParams) - key of setting in OsmAnd's preferences. - * - * @return boolean - true if setting is already set in SharedPreferences - * - */ - boolean areOsmandSettingsCustomized(in OsmandSettingsInfoParams params); - - /** - * Method to customize parameters of OsmAnd. - * - * @param params (CustomizationInfoParams) - wrapper class for custom settings and ui. - * - * @param settingsParams (OsmandSettingsParams) - wrapper class for OsmAnd shared preferences params. - * See {@link #customizeOsmandSettings(in OsmandSettingsParams params) customizeOsmandSettings} - * method description for details. - * @param navDrawerHeaderParams (NavDrawerHeaderParams) - wrapper class for OsmAnd navdrawer header params. - * See {@link #setNavDrawerLogoWithParams(in NavDrawerHeaderParams params) setNavDrawerLogoWithParams} - * method description for details. - * @param navDrawerFooterParams (NavDrawerFooterParams) - wrapper class for OsmAnd navdrawer footer params. - * See {@link #setNavDrawerFooterWithParams(in NavDrawerFooterParams params) setNavDrawerFooterWithParams} - * method description for details. - * @param visibilityWidgetsParams (ArrayList) - wrapper class for OsmAnd widgets visibility. - * See {@link #regWidgetVisibility(in SetWidgetsParams params) regWidgetVisibility} - * method description for details. - * @param availabilityWidgetsParams (ArrayList) - wrapper class for OsmAnd widgets availability. - * See {@link #regWidgetAvailability(in SetWidgetsParams params) regWidgetAvailability} - * method description for details. - * @param pluginsParams (ArrayList) - wrapper class for OsmAnd plugins states params. - * See {@link #changePluginState(in PluginParams params) changePluginState} - * method description for details. - * @param featuresEnabledIds (List) - list of UI elements (like QuickSearch button) to show. - * See {@link #setEnabledIds(in List ids) setEnabledIds} - * @param featuresDisabledIds (List) - list of UI elements (like QuickSearch button) to hide. - * See {@link #setDisabledIds(in List ids) setDisabledIds} - * @param featuresEnabledPatterns (List) - list of NavDrawer menu items to show. - * See {@link #setEnabledPatterns(in List patterns) setEnabledPatterns} - * @param featuresDisabledPatterns (List) - list of NavDrawer menu items to hide. - * See {@link #setDisabledPatterns(in List patterns) setDisabledPatterns} - * - */ - boolean setCustomization(in CustomizationInfoParams params); - - /** - * Method to register for Voice Router voice messages during navigation. Notifies user about voice messages. - * - * @params subscribeToUpdates (boolean) - boolean flag to subscribe or unsubscribe from messages - * @params callbackId (long) - id of callback, needed to unsubscribe from messages - * @params callback (IOsmAndAidlCallback) - callback to notify user on voice message - */ - long registerForVoiceRouterMessages(in ANavigationVoiceRouterMessageParams params, IOsmAndAidlCallback callback); - - /** - * Removes all active map markers (marks them as passed and moves to history) - * Empty class of params - */ - boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams params); - - /** - * Method to get color name for gpx. - * - * @param fileName (String) - name of gpx file. - * - * @param gpxColor (String) - color name of gpx. Can be one of: "red", "orange", "lightblue", - * "blue", "purple", "translucent_red", "translucent_orange", - * "translucent_lightblue", "translucent_blue", "translucent_purple" - * Which used in {@link #importGpx(in ImportGpxParams params) importGpx} - * Or color hex if gpx has custom color. - * - */ - boolean getGpxColor(inout GpxColorParams params); -} diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/AContextMenuButton.java b/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/AContextMenuButton.java deleted file mode 100644 index b235116999..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/AContextMenuButton.java +++ /dev/null @@ -1,101 +0,0 @@ -package net.osmand.aidl.contextmenu; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AContextMenuButton implements Parcelable { - - private int buttonId; - - private String leftTextCaption; - private String rightTextCaption; - private String leftIconName; - private String rightIconName; - - private boolean needColorizeIcon; - private boolean enabled; - - public AContextMenuButton(int buttonId, String leftTextCaption, String rightTextCaption, String leftIconName, String rightIconName, boolean needColorizeIcon, boolean enabled) { - this.buttonId = buttonId; - this.leftTextCaption = leftTextCaption; - this.rightTextCaption = rightTextCaption; - this.leftIconName = leftIconName; - this.rightIconName = rightIconName; - this.needColorizeIcon = needColorizeIcon; - this.enabled = enabled; - } - - protected AContextMenuButton(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public AContextMenuButton createFromParcel(Parcel in) { - return new AContextMenuButton(in); - } - - @Override - public AContextMenuButton[] newArray(int size) { - return new AContextMenuButton[size]; - } - }; - - public int getButtonId() { - return buttonId; - } - - public String getLeftTextCaption() { - return leftTextCaption; - } - - public String getRightTextCaption() { - return rightTextCaption; - } - - public String getLeftIconName() { - return leftIconName; - } - - public String getRightIconName() { - return rightIconName; - } - - public boolean isNeedColorizeIcon() { - return needColorizeIcon; - } - - public boolean isEnabled() { - return enabled; - } - - public static Creator getCREATOR() { - return CREATOR; - } - - @Override - public void writeToParcel(Parcel dest, int f) { - dest.writeInt(buttonId); - dest.writeString(leftTextCaption); - dest.writeString(rightTextCaption); - dest.writeString(leftIconName); - dest.writeString(rightIconName); - dest.writeInt(needColorizeIcon ? 1 : 0); - dest.writeInt(enabled ? 1 : 0); - } - - private void readFromParcel(Parcel in) { - buttonId = in.readInt(); - leftTextCaption = in.readString(); - rightTextCaption = in.readString(); - leftIconName = in.readString(); - rightIconName = in.readString(); - needColorizeIcon = in.readInt() != 0; - enabled = in.readInt() != 0; - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java b/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java deleted file mode 100644 index ce4d4a637c..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.osmand.aidl.contextmenu; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateContextMenuButtonsParams implements Parcelable { - private ContextMenuButtonsParams buttonsParams; - - public UpdateContextMenuButtonsParams(ContextMenuButtonsParams widget) { - this.buttonsParams = widget; - } - - public UpdateContextMenuButtonsParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public UpdateContextMenuButtonsParams createFromParcel(Parcel in) { - return new UpdateContextMenuButtonsParams(in); - } - - public UpdateContextMenuButtonsParams[] newArray(int size) { - return new UpdateContextMenuButtonsParams[size]; - } - }; - - public ContextMenuButtonsParams getContextMenuButtonsParams() { - return buttonsParams; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(buttonsParams, flags); - } - - private void readFromParcel(Parcel in) { - buttonsParams = in.readParcelable(ContextMenuButtonsParams.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl deleted file mode 100644 index 128f5e6b94..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable AGpxBitmap; - diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java deleted file mode 100644 index 3fe755135e..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.java +++ /dev/null @@ -1,196 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -public class AGpxFileDetails implements Parcelable { - - private float totalDistance = 0; - private int totalTracks = 0; - private long startTime = Long.MAX_VALUE; - private long endTime = Long.MIN_VALUE; - private long timeSpan = 0; - private long timeMoving = 0; - private float totalDistanceMoving = 0; - - private double diffElevationUp = 0; - private double diffElevationDown = 0; - private double avgElevation = 0; - private double minElevation = 99999; - private double maxElevation = -100; - - private float minSpeed = Float.MAX_VALUE; - private float maxSpeed = 0; - private float avgSpeed; - - private int points; - private int wptPoints = 0; - - private List wptCategoryNames = new ArrayList<>(); - - public AGpxFileDetails(float totalDistance, int totalTracks, - long startTime, long endTime, - long timeSpan, long timeMoving, float totalDistanceMoving, - double diffElevationUp, double diffElevationDown, - double avgElevation, double minElevation, double maxElevation, - float minSpeed, float maxSpeed, float avgSpeed, - int points, int wptPoints, Set wptCategoryNames) { - this.totalDistance = totalDistance; - this.totalTracks = totalTracks; - this.startTime = startTime; - this.endTime = endTime; - this.timeSpan = timeSpan; - this.timeMoving = timeMoving; - this.totalDistanceMoving = totalDistanceMoving; - this.diffElevationUp = diffElevationUp; - this.diffElevationDown = diffElevationDown; - this.avgElevation = avgElevation; - this.minElevation = minElevation; - this.maxElevation = maxElevation; - this.minSpeed = minSpeed; - this.maxSpeed = maxSpeed; - this.avgSpeed = avgSpeed; - this.points = points; - this.wptPoints = wptPoints; - if (wptCategoryNames != null) { - this.wptCategoryNames = new ArrayList<>(wptCategoryNames); - } - } - - public AGpxFileDetails(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public AGpxFileDetails createFromParcel(Parcel in) { - return new AGpxFileDetails(in); - } - - public AGpxFileDetails[] newArray(int size) { - return new AGpxFileDetails[size]; - } - }; - - public float getTotalDistance() { - return totalDistance; - } - - public int getTotalTracks() { - return totalTracks; - } - - public long getStartTime() { - return startTime; - } - - public long getEndTime() { - return endTime; - } - - public long getTimeSpan() { - return timeSpan; - } - - public long getTimeMoving() { - return timeMoving; - } - - public float getTotalDistanceMoving() { - return totalDistanceMoving; - } - - public double getDiffElevationUp() { - return diffElevationUp; - } - - public double getDiffElevationDown() { - return diffElevationDown; - } - - public double getAvgElevation() { - return avgElevation; - } - - public double getMinElevation() { - return minElevation; - } - - public double getMaxElevation() { - return maxElevation; - } - - public float getMinSpeed() { - return minSpeed; - } - - public float getMaxSpeed() { - return maxSpeed; - } - - public float getAvgSpeed() { - return avgSpeed; - } - - public int getPoints() { - return points; - } - - public int getWptPoints() { - return wptPoints; - } - - public List getWptCategoryNames() { - return wptCategoryNames; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeFloat(totalDistance); - out.writeInt(totalTracks); - out.writeLong(startTime); - out.writeLong(endTime); - out.writeLong(timeSpan); - out.writeLong(timeMoving); - out.writeFloat(totalDistanceMoving); - out.writeDouble(diffElevationUp); - out.writeDouble(diffElevationDown); - out.writeDouble(avgElevation); - out.writeDouble(minElevation); - out.writeDouble(maxElevation); - out.writeFloat(minSpeed); - out.writeFloat(maxSpeed); - out.writeFloat(avgSpeed); - out.writeInt(points); - out.writeInt(wptPoints); - out.writeStringList(wptCategoryNames); - } - - private void readFromParcel(Parcel in) { - totalDistance = in.readFloat(); - totalTracks = in.readInt(); - startTime = in.readLong(); - endTime = in.readLong(); - timeSpan = in.readLong(); - timeMoving = in.readLong(); - totalDistanceMoving = in.readFloat(); - diffElevationUp = in.readDouble(); - diffElevationDown = in.readDouble(); - avgElevation = in.readDouble(); - minElevation = in.readDouble(); - maxElevation = in.readDouble(); - minSpeed = in.readFloat(); - maxSpeed = in.readFloat(); - avgSpeed = in.readFloat(); - points = in.readInt(); - wptPoints = in.readInt(); - in.readStringList(wptCategoryNames); - } - - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.java b/OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.java deleted file mode 100644 index 6ffc6e2a70..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class ASelectedGpxFile implements Parcelable { - - private String fileName; - private long modifiedTime; - private long fileSize; - private AGpxFileDetails details; - - public ASelectedGpxFile(@NonNull String fileName) { - this.fileName = fileName; - } - - public ASelectedGpxFile(@NonNull String fileName, long modifiedTime, long fileSize, @Nullable AGpxFileDetails details) { - this.fileName = fileName; - this.modifiedTime = modifiedTime; - this.fileSize = fileSize; - this.details = details; - } - - public ASelectedGpxFile(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public ASelectedGpxFile createFromParcel(Parcel in) { - return new ASelectedGpxFile(in); - } - - public ASelectedGpxFile[] newArray(int size) { - return new ASelectedGpxFile[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public long getModifiedTime() { - return modifiedTime; - } - - public long getFileSize() { - return fileSize; - } - - public AGpxFileDetails getDetails() { - return details; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - out.writeLong(modifiedTime); - out.writeLong(fileSize); - - out.writeByte((byte) (details != null ? 1 : 0)); - if (details != null) { - out.writeParcelable(details, flags); - } - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - modifiedTime = in.readLong(); - fileSize = in.readLong(); - - boolean hasDetails= in.readByte() != 0; - if (hasDetails) { - details = in.readParcelable(AGpxFileDetails.class.getClassLoader()); - } else { - details = null; - } - } - - public int describeContents() { - return 0; - } -} - diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java b/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java deleted file mode 100644 index 08f489922c..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.mapmarker; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveMapMarkerParams implements Parcelable { - - private AMapMarker marker; - - public RemoveMapMarkerParams(AMapMarker marker) { - this.marker = marker; - } - - public RemoveMapMarkerParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public RemoveMapMarkerParams createFromParcel(Parcel in) { - return new RemoveMapMarkerParams(in); - } - - public RemoveMapMarkerParams[] newArray(int size) { - return new RemoveMapMarkerParams[size]; - } - }; - - public AMapMarker getMarker() { - return marker; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(marker, flags); - } - - private void readFromParcel(Parcel in) { - marker = in.readParcelable(AMapMarker.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java b/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java deleted file mode 100644 index d03bc0d7f6..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.osmand.aidl.mapmarker; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateMapMarkerParams implements Parcelable { - - private AMapMarker markerPrev; - private AMapMarker markerNew; - - public UpdateMapMarkerParams(AMapMarker markerPrev, AMapMarker markerNew) { - this.markerPrev = markerPrev; - this.markerNew = markerNew; - } - - public UpdateMapMarkerParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public UpdateMapMarkerParams createFromParcel(Parcel in) { - return new UpdateMapMarkerParams(in); - } - - public UpdateMapMarkerParams[] newArray(int size) { - return new UpdateMapMarkerParams[size]; - } - }; - - public AMapMarker getMarkerPrev() { - return markerPrev; - } - - public AMapMarker getMarkerNew() { - return markerNew; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(markerPrev, flags); - out.writeParcelable(markerNew, flags); - } - - private void readFromParcel(Parcel in) { - markerPrev = in.readParcelable(AMapMarker.class.getClassLoader()); - markerNew = in.readParcelable(AMapMarker.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java b/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java deleted file mode 100644 index 196380729f..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ANavigationVoiceRouterMessageParams implements Parcelable{ - private boolean subscribeToUpdates = true; - private long callbackId = -1L; - - public ANavigationVoiceRouterMessageParams() { - } - - public long getCallbackId() { - return callbackId; - } - - public void setCallbackId(long callbackId) { - this.callbackId = callbackId; - } - - public void setSubscribeToUpdates(boolean subscribeToUpdates) { - this.subscribeToUpdates = subscribeToUpdates; - } - - public boolean isSubscribeToUpdates() { - return subscribeToUpdates; - } - - protected ANavigationVoiceRouterMessageParams(Parcel in) { - callbackId = in.readLong(); - subscribeToUpdates = in.readByte() != 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeLong(callbackId); - dest.writeByte((byte) (subscribeToUpdates ? 1 : 0)); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public ANavigationVoiceRouterMessageParams createFromParcel(Parcel in) { - return new ANavigationVoiceRouterMessageParams(in); - } - - @Override - public ANavigationVoiceRouterMessageParams[] newArray(int size) { - return new ANavigationVoiceRouterMessageParams[size]; - } - }; -} diff --git a/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java b/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java deleted file mode 100644 index ac6f5e55d2..0000000000 --- a/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.osmand.aidl.tiles; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -public class ASqliteDbFile implements Parcelable { - - private String fileName; - private long modifiedTime; - private long fileSize; - private boolean active; - - public ASqliteDbFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active) { - this.fileName = fileName; - this.modifiedTime = modifiedTime; - this.fileSize = fileSize; - this.active = active; - } - - public ASqliteDbFile(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public ASqliteDbFile createFromParcel(Parcel in) { - return new ASqliteDbFile(in); - } - - public ASqliteDbFile[] newArray(int size) { - return new ASqliteDbFile[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public long getModifiedTime() { - return modifiedTime; - } - - public long getFileSize() { - return fileSize; - } - - public boolean isActive() { - return active; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - out.writeLong(modifiedTime); - out.writeLong(fileSize); - out.writeByte((byte) (active ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - modifiedTime = in.readLong(); - fileSize = in.readLong(); - active = in.readByte() != 0; - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index 81f1a8e6c3..c8e773be6b 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -433,6 +433,7 @@ task appStart(type: Exec) { dependencies { implementation project(path: ':OsmAnd-java', configuration: 'android') + implementation project(":osmand-api") implementation 'com.android.support:multidex:1.0.1' implementation 'com.android.support:gridlayout-v7:27.1.1' implementation 'com.android.support:cardview-v7:27.1.1' diff --git a/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl b/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl deleted file mode 100644 index 017dd5e944..0000000000 --- a/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.calculateroute; - -parcelable CalculateRouteParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java b/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java deleted file mode 100644 index 3cc660ec8a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.osmand.aidl.calculateroute; - -import android.os.Parcel; -import android.os.Parcelable; - -import net.osmand.aidl.map.ALatLon; - -import java.util.ArrayList; -import java.util.List; - -public class CalculateRouteParams implements Parcelable { - - private ALatLon startPoint; - private String startPointName; - private ALatLon endPoint; - private String endPointName; - private List intermediatePoints = new ArrayList<>(); - private List intermediateNames = new ArrayList<>(); - - public CalculateRouteParams(ALatLon startPoint, String startPointName, - ALatLon endPoint, String endPointName, - List intermediatePoints, List intermediateNames) { - - if (endPoint == null) { - throw new IllegalArgumentException("endPoint cannot be null"); - } - - this.startPoint = startPoint; - this.startPointName = startPointName; - this.endPoint = endPoint; - this.endPointName = endPointName; - if (intermediatePoints != null) { - this.intermediatePoints.addAll(intermediatePoints); - } - if (intermediateNames != null) { - this.intermediateNames.addAll(intermediateNames); - } - } - - public CalculateRouteParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public CalculateRouteParams createFromParcel(Parcel in) { - return new CalculateRouteParams(in); - } - - public CalculateRouteParams[] newArray(int size) { - return new CalculateRouteParams[size]; - } - }; - - public ALatLon getStartPoint() { - return startPoint; - } - - public String getStartPointName() { - return startPointName; - } - - public ALatLon getEndPoint() { - return endPoint; - } - - public String getEndPointName() { - return endPointName; - } - - public List getIntermediatePoints() { - return intermediatePoints; - } - - public List getIntermediateNames() { - return intermediateNames; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(startPoint, flags); - out.writeString(startPointName); - out.writeParcelable(endPoint, flags); - out.writeString(endPointName); - out.writeTypedList(intermediatePoints); - out.writeStringList(intermediateNames); - } - - private void readFromParcel(Parcel in) { - startPoint = in.readParcelable(ALatLon.class.getClassLoader()); - startPointName = in.readString(); - endPoint = in.readParcelable(ALatLon.class.getClassLoader()); - endPointName = in.readString(); - in.readTypedList(intermediatePoints, ALatLon.CREATOR); - in.readStringList(intermediateNames); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl deleted file mode 100644 index 4a8cbee665..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.contextmenu; - -parcelable AContextMenuButton; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl deleted file mode 100644 index cf05b9db9c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.contextmenu; - -parcelable ContextMenuButtonsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java b/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java deleted file mode 100644 index 0bdfb25feb..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java +++ /dev/null @@ -1,105 +0,0 @@ -package net.osmand.aidl.contextmenu; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; -import java.util.List; - -public class ContextMenuButtonsParams implements Parcelable { - - private AContextMenuButton leftButton; - private AContextMenuButton rightButton; - - private String id; - private String appPackage; - private String layerId; - - private long callbackId = -1L; - - private List pointsIds = new ArrayList<>(); - - public ContextMenuButtonsParams(AContextMenuButton leftButton, AContextMenuButton rightButton, String id, String appPackage, String layerId, long callbackId, List pointsIds) { - this.leftButton = leftButton; - this.rightButton = rightButton; - this.id = id; - this.appPackage = appPackage; - this.layerId = layerId; - this.callbackId = callbackId; - this.pointsIds = pointsIds; - } - - public ContextMenuButtonsParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public ContextMenuButtonsParams createFromParcel(Parcel in) { - return new ContextMenuButtonsParams(in); - } - - @Override - public ContextMenuButtonsParams[] newArray(int size) { - return new ContextMenuButtonsParams[size]; - } - }; - - public AContextMenuButton getLeftButton() { - return leftButton; - } - - public AContextMenuButton getRightButton() { - return rightButton; - } - - public String getId() { - return id; - } - - public String getAppPackage() { - return appPackage; - } - - public String getLayerId() { - return layerId; - } - - public long getCallbackId() { - return callbackId; - } - - public void setCallbackId(long callbackId) { - this.callbackId = callbackId; - } - - public List getPointsIds() { - return pointsIds; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeParcelable(leftButton, flags); - dest.writeParcelable(rightButton, flags); - dest.writeString(id); - dest.writeString(appPackage); - dest.writeString(layerId); - dest.writeLong(callbackId); - dest.writeStringList(pointsIds); - } - - private void readFromParcel(Parcel in) { - leftButton = in.readParcelable(AContextMenuButton.class.getClassLoader()); - rightButton = in.readParcelable(AContextMenuButton.class.getClassLoader()); - id = in.readString(); - appPackage = in.readString(); - layerId = in.readString(); - callbackId = in.readLong(); - in.readStringList(pointsIds); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl deleted file mode 100644 index 557a8e5113..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.contextmenu; - -parcelable RemoveContextMenuButtonsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java b/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java deleted file mode 100644 index 33f3ab400c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.osmand.aidl.contextmenu; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveContextMenuButtonsParams implements Parcelable { - - private String paramsId; - - private long callbackId = -1L; - - public RemoveContextMenuButtonsParams(String paramsId, long callbackId) { - this.paramsId = paramsId; - this.callbackId = callbackId; - } - - public RemoveContextMenuButtonsParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public RemoveContextMenuButtonsParams createFromParcel(Parcel in) { - return new RemoveContextMenuButtonsParams(in); - } - - public RemoveContextMenuButtonsParams[] newArray(int size) { - return new RemoveContextMenuButtonsParams[size]; - } - }; - - public String getParamsId() { - return paramsId; - } - - public long getCallbackId() { - return callbackId; - } - - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(paramsId); - dest.writeLong(callbackId); - } - - private void readFromParcel(Parcel in) { - paramsId = in.readString(); - callbackId = in.readLong(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl b/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl deleted file mode 100644 index f5482b3452..0000000000 --- a/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.contextmenu; - -parcelable UpdateContextMenuButtonsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl b/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl deleted file mode 100644 index a786325e98..0000000000 --- a/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.copyfile; - -parcelable CopyFileParams; diff --git a/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java b/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java deleted file mode 100644 index e795d5b7b7..0000000000 --- a/OsmAnd/src/net/osmand/aidl/copyfile/CopyFileParams.java +++ /dev/null @@ -1,78 +0,0 @@ -package net.osmand.aidl.copyfile; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -public class CopyFileParams implements Parcelable { - private String fileName; - private byte[] filePartData; - private long startTime; - private boolean done; - - public CopyFileParams(@NonNull String fileName, @NonNull byte[] filePartData, long startTime, boolean done) { - this.fileName = fileName; - this.filePartData = filePartData; - this.startTime = startTime; - this.done = done; - } - - public String getFileName() { - return fileName; - } - - public byte[] getFilePartData() { - return filePartData; - } - - public boolean isDone() { - return done; - } - - public long getStartTime() { - return startTime; - } - - protected CopyFileParams(Parcel in) { - fileName = in.readString(); - filePartData = in.createByteArray(); - startTime = in.readLong(); - done = in.readByte() == 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public CopyFileParams createFromParcel(Parcel in) { - return new CopyFileParams(in); - } - - @Override - public CopyFileParams[] newArray(int size) { - return new CopyFileParams[size]; - } - }; - - - @Override - public int describeContents() { - return 0; - } - - @Override - public String toString() { - return "CopyFileParams {" + - " fileName=" + fileName + - ", filePartData size=" + filePartData.length + - ", startTime=" + startTime + - ", done=" + done + - " }"; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(fileName); - dest.writeByteArray(filePartData); - dest.writeLong(startTime); - dest.writeByte((byte) (done ? 0 : 1)); - } -} diff --git a/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl deleted file mode 100644 index e72d2d47dc..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.customization; - -parcelable CustomizationInfoParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.java b/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.java deleted file mode 100644 index 0e83f7f41c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/CustomizationInfoParams.java +++ /dev/null @@ -1,172 +0,0 @@ -package net.osmand.aidl.customization; - -import android.annotation.SuppressLint; -import android.os.Parcel; -import android.os.Parcelable; - -import net.osmand.aidl.navdrawer.NavDrawerFooterParams; -import net.osmand.aidl.navdrawer.NavDrawerHeaderParams; -import net.osmand.aidl.navdrawer.SetNavDrawerItemsParams; -import net.osmand.aidl.plugins.PluginParams; - -import java.util.ArrayList; -import java.util.List; - -public class CustomizationInfoParams implements Parcelable { - - private OsmandSettingsParams settingsParams; - - private NavDrawerHeaderParams navDrawerHeaderParams; - private NavDrawerFooterParams navDrawerFooterParams; - private SetNavDrawerItemsParams navDrawerItemsParams; - - private ArrayList visibilityWidgetsParams = new ArrayList<>(); - private ArrayList availabilityWidgetsParams = new ArrayList<>(); - - private ArrayList pluginsParams = new ArrayList<>(); - - private List featuresEnabledIds = new ArrayList<>(); - private List featuresDisabledIds = new ArrayList<>(); - private List featuresEnabledPatterns = new ArrayList<>(); - private List featuresDisabledPatterns = new ArrayList<>(); - - public CustomizationInfoParams(OsmandSettingsParams settingsParams, - NavDrawerHeaderParams navDrawerHeaderParams, - NavDrawerFooterParams navDrawerFooterParams, - SetNavDrawerItemsParams navDrawerItemsParams, - ArrayList visibilityWidgetsParams, - ArrayList availabilityWidgetsParams, - ArrayList pluginsParams, - List featuresEnabledIds, - List featuresDisabledIds, - List featuresEnabledPatterns, - List featuresDisabledPatterns) { - this.settingsParams = settingsParams; - this.navDrawerHeaderParams = navDrawerHeaderParams; - this.navDrawerFooterParams = navDrawerFooterParams; - this.navDrawerItemsParams = navDrawerItemsParams; - - if (visibilityWidgetsParams != null) { - this.visibilityWidgetsParams.addAll(visibilityWidgetsParams); - } - if (availabilityWidgetsParams != null) { - this.availabilityWidgetsParams.addAll(availabilityWidgetsParams); - } - if (pluginsParams != null) { - this.pluginsParams.addAll(pluginsParams); - } - if (featuresEnabledIds != null) { - this.featuresEnabledIds.addAll(featuresEnabledIds); - } - if (featuresDisabledIds != null) { - this.featuresDisabledIds.addAll(featuresDisabledIds); - } - if (featuresEnabledPatterns != null) { - this.featuresEnabledPatterns.addAll(featuresEnabledPatterns); - } - if (featuresDisabledPatterns != null) { - this.featuresDisabledPatterns.addAll(featuresDisabledPatterns); - } - } - - public CustomizationInfoParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public CustomizationInfoParams createFromParcel(Parcel in) { - return new CustomizationInfoParams(in); - } - - @Override - public CustomizationInfoParams[] newArray(int size) { - return new CustomizationInfoParams[size]; - } - }; - - public OsmandSettingsParams getSettingsParams() { - return settingsParams; - } - - public NavDrawerHeaderParams getNavDrawerHeaderParams() { - return navDrawerHeaderParams; - } - - public NavDrawerFooterParams getNavDrawerFooterParams() { - return navDrawerFooterParams; - } - - public SetNavDrawerItemsParams getNavDrawerItemsParams() { - return navDrawerItemsParams; - } - - public ArrayList getVisibilityWidgetsParams() { - return visibilityWidgetsParams; - } - - public ArrayList getAvailabilityWidgetsParams() { - return availabilityWidgetsParams; - } - - public ArrayList getPluginsParams() { - return pluginsParams; - } - - public List getFeaturesEnabledIds() { - return featuresEnabledIds; - } - - public List getFeaturesDisabledIds() { - return featuresDisabledIds; - } - - public List getFeaturesEnabledPatterns() { - return featuresEnabledPatterns; - } - - public List getFeaturesDisabledPatterns() { - return featuresDisabledPatterns; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(settingsParams, flags); - - out.writeParcelable(navDrawerHeaderParams, flags); - out.writeParcelable(navDrawerFooterParams, flags); - out.writeParcelable(navDrawerItemsParams, flags); - - out.writeTypedList(visibilityWidgetsParams); - out.writeTypedList(availabilityWidgetsParams); - out.writeTypedList(pluginsParams); - - out.writeStringList(featuresEnabledIds); - out.writeStringList(featuresDisabledIds); - out.writeStringList(featuresEnabledPatterns); - out.writeStringList(featuresDisabledPatterns); - } - - @SuppressLint("ParcelClassLoader") - private void readFromParcel(Parcel in) { - settingsParams = in.readParcelable(OsmandSettingsParams.class.getClassLoader()); - - navDrawerHeaderParams = in.readParcelable(NavDrawerHeaderParams.class.getClassLoader()); - navDrawerFooterParams = in.readParcelable(NavDrawerFooterParams.class.getClassLoader()); - navDrawerItemsParams = in.readParcelable(SetNavDrawerItemsParams.class.getClassLoader()); - - in.readTypedList(visibilityWidgetsParams, SetWidgetsParams.CREATOR); - in.readTypedList(availabilityWidgetsParams, SetWidgetsParams.CREATOR); - in.readTypedList(pluginsParams, PluginParams.CREATOR); - - in.readStringList(featuresEnabledIds); - in.readStringList(featuresDisabledIds); - in.readStringList(featuresEnabledPatterns); - in.readStringList(featuresDisabledPatterns); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl deleted file mode 100644 index 80d0fa56ed..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.customization; - -parcelable OsmandSettingsInfoParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java deleted file mode 100644 index ba4285af1d..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.osmand.aidl.customization; - -import android.annotation.SuppressLint; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -public class OsmandSettingsInfoParams implements Parcelable { - - private String sharedPreferencesName; - - public OsmandSettingsInfoParams(@NonNull String sharedPreferencesName) { - this.sharedPreferencesName = sharedPreferencesName; - } - - public OsmandSettingsInfoParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public OsmandSettingsInfoParams createFromParcel(Parcel in) { - return new OsmandSettingsInfoParams(in); - } - - @Override - public OsmandSettingsInfoParams[] newArray(int size) { - return new OsmandSettingsInfoParams[size]; - } - }; - - public String getSharedPreferencesName() { - return sharedPreferencesName; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(sharedPreferencesName); - } - - @SuppressLint("ParcelClassLoader") - private void readFromParcel(Parcel in) { - sharedPreferencesName = in.readString(); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl deleted file mode 100644 index 770070bb46..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.customization; - -parcelable OsmandSettingsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java b/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java deleted file mode 100644 index bff8c68018..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/OsmandSettingsParams.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.osmand.aidl.customization; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class OsmandSettingsParams implements Parcelable { - - private String sharedPreferencesName; - private Bundle bundle; - - public OsmandSettingsParams(@NonNull String sharedPreferencesName, @Nullable Bundle bundle) { - this.sharedPreferencesName = sharedPreferencesName; - this.bundle = bundle; - } - - public OsmandSettingsParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public OsmandSettingsParams createFromParcel(Parcel in) { - return new OsmandSettingsParams(in); - } - - @Override - public OsmandSettingsParams[] newArray(int size) { - return new OsmandSettingsParams[size]; - } - }; - - public String getSharedPreferencesName() { - return sharedPreferencesName; - } - - public Bundle getBundle() { - return bundle; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(sharedPreferencesName); - out.writeBundle(bundle); - } - - @SuppressLint("ParcelClassLoader") - private void readFromParcel(Parcel in) { - sharedPreferencesName = in.readString(); - bundle = in.readBundle(); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl deleted file mode 100644 index 235a4abe51..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.customization; - -parcelable SetWidgetsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java b/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java deleted file mode 100644 index d9343b920e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/customization/SetWidgetsParams.java +++ /dev/null @@ -1,93 +0,0 @@ -package net.osmand.aidl.customization; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.Nullable; - -import java.util.ArrayList; -import java.util.List; - -public class SetWidgetsParams implements Parcelable { - - private String widgetKey; - private List appModesKeys; - - public SetWidgetsParams(String widgetKey, @Nullable List appModesKeys) { - this.widgetKey = widgetKey; - this.appModesKeys = appModesKeys; - } - - public SetWidgetsParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public SetWidgetsParams createFromParcel(Parcel in) { - return new SetWidgetsParams(in); - } - - @Override - public SetWidgetsParams[] newArray(int size) { - return new SetWidgetsParams[size]; - } - }; - - public String getWidgetKey() { - return widgetKey; - } - - public List getAppModesKeys() { - return appModesKeys; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(widgetKey); - writeStringList(out, appModesKeys); - } - - private void readFromParcel(Parcel in) { - widgetKey = in.readString(); - appModesKeys = readStringList(in); - } - - @Override - public int describeContents() { - return 0; - } - - private void writeStringList(Parcel out, List val) { - if (val == null) { - out.writeInt(-1); - return; - } - int N = val.size(); - int i = 0; - out.writeInt(N); - while (i < N) { - out.writeString(val.get(i)); - i++; - } - } - - private List readStringList(Parcel in) { - List list = new ArrayList<>(); - int M = list.size(); - int N = in.readInt(); - if (N == -1) { - return null; - } - int i = 0; - for (; i < M && i < N; i++) { - list.set(i, in.readString()); - } - for (; i < N; i++) { - list.add(in.readString()); - } - for (; i < M; i++) { - list.remove(N); - } - return list; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.aidl b/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.aidl deleted file mode 100644 index afd535fbe8..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite; - -parcelable AFavorite; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.java b/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.java deleted file mode 100644 index b7fc057249..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/AFavorite.java +++ /dev/null @@ -1,96 +0,0 @@ -package net.osmand.aidl.favorite; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AFavorite implements Parcelable { - - private double lat; - private double lon; - private String name; - private String description; - private String category; - private String color; - private boolean visible; - - public AFavorite(double lat, double lon, String name, String description, - String category, String color, boolean visible) { - this.lat = lat; - this.lon = lon; - this.name = name; - this.description = description; - this.category = category; - this.color = color; - this.visible = visible; - } - - public AFavorite(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public AFavorite createFromParcel(Parcel in) { - return new AFavorite(in); - } - - @Override - public AFavorite[] newArray(int size) { - return new AFavorite[size]; - } - }; - - public double getLat() { - return lat; - } - - public double getLon() { - return lon; - } - - public String getName() { - return name; - } - - public String getDescription() { - return description; - } - - public String getCategory() { - return category; - } - - public String getColor() { - return color; - } - - public boolean isVisible() { - return visible; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(lat); - out.writeDouble(lon); - out.writeString(name); - out.writeString(description); - out.writeString(category); - out.writeString(color); - out.writeByte((byte) (visible ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - lat = in.readDouble(); - lon = in.readDouble(); - name = in.readString(); - description = in.readString(); - category = in.readString(); - color = in.readString(); - visible = in.readByte() != 0; - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl deleted file mode 100644 index c546992b10..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite; - -parcelable AddFavoriteParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.java deleted file mode 100644 index 87baeb5a99..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/AddFavoriteParams.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.osmand.aidl.favorite; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AddFavoriteParams implements Parcelable { - - private AFavorite favorite; - - public AddFavoriteParams(AFavorite favorite) { - this.favorite = favorite; - } - - public AddFavoriteParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public AddFavoriteParams createFromParcel(Parcel in) { - return new AddFavoriteParams(in); - } - - @Override - public AddFavoriteParams[] newArray(int size) { - return new AddFavoriteParams[size]; - } - }; - - public AFavorite getFavorite() { - return favorite; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favorite, flags); - } - - private void readFromParcel(Parcel in) { - favorite = in.readParcelable(AFavorite.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl deleted file mode 100644 index 37c08cd374..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite; - -parcelable RemoveFavoriteParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java deleted file mode 100644 index 15e2ca74bd..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.osmand.aidl.favorite; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveFavoriteParams implements Parcelable { - - private AFavorite favorite; - - public RemoveFavoriteParams(AFavorite favorite) { - this.favorite = favorite; - } - - public RemoveFavoriteParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public RemoveFavoriteParams createFromParcel(Parcel in) { - return new RemoveFavoriteParams(in); - } - - @Override - public RemoveFavoriteParams[] newArray(int size) { - return new RemoveFavoriteParams[size]; - } - }; - - public AFavorite getFavorite() { - return favorite; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favorite, flags); - } - - private void readFromParcel(Parcel in) { - favorite = in.readParcelable(AFavorite.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl deleted file mode 100644 index ba4a9364d3..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite; - -parcelable UpdateFavoriteParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java b/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java deleted file mode 100644 index 43fdfc13bd..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.osmand.aidl.favorite; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateFavoriteParams implements Parcelable { - - private AFavorite favoritePrev; - private AFavorite favoriteNew; - - public UpdateFavoriteParams(AFavorite favoritePrev, AFavorite favoriteNew) { - this.favoritePrev = favoritePrev; - this.favoriteNew = favoriteNew; - } - - public UpdateFavoriteParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public UpdateFavoriteParams createFromParcel(Parcel in) { - return new UpdateFavoriteParams(in); - } - - @Override - public UpdateFavoriteParams[] newArray(int size) { - return new UpdateFavoriteParams[size]; - } - }; - - public AFavorite getFavoritePrev() { - return favoritePrev; - } - - public AFavorite getFavoriteNew() { - return favoriteNew; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favoritePrev, flags); - out.writeParcelable(favoriteNew, flags); - } - - private void readFromParcel(Parcel in) { - favoritePrev = in.readParcelable(AFavorite.class.getClassLoader()); - favoriteNew = in.readParcelable(AFavorite.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl deleted file mode 100644 index baec925474..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite.group; - -parcelable AFavoriteGroup; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java b/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java deleted file mode 100644 index e9b6348468..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.osmand.aidl.favorite.group; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AFavoriteGroup implements Parcelable { - - private String name; - private String color; - private boolean visible; - - public AFavoriteGroup(String name, String color, boolean visible) { - this.name = name; - this.color = color; - this.visible = visible; - } - - public AFavoriteGroup(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public AFavoriteGroup createFromParcel(Parcel in) { - return new AFavoriteGroup(in); - } - - @Override - public AFavoriteGroup[] newArray(int size) { - return new AFavoriteGroup[size]; - } - }; - - public String getName() { - return name; - } - - public String getColor() { - return color; - } - - public boolean isVisible() { - return visible; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(name); - out.writeString(color); - out.writeByte((byte) (visible ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - name = in.readString(); - color = in.readString(); - visible = in.readByte() != 0; - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl deleted file mode 100644 index 5850b5cd34..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite.group; - -parcelable AddFavoriteGroupParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java deleted file mode 100644 index 7cb3228572..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.osmand.aidl.favorite.group; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AddFavoriteGroupParams implements Parcelable { - - private AFavoriteGroup favoriteGroup; - - public AddFavoriteGroupParams(AFavoriteGroup favoriteGroup) { - this.favoriteGroup = favoriteGroup; - } - - public AddFavoriteGroupParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public AddFavoriteGroupParams createFromParcel(Parcel in) { - return new AddFavoriteGroupParams(in); - } - - @Override - public AddFavoriteGroupParams[] newArray(int size) { - return new AddFavoriteGroupParams[size]; - } - }; - - public AFavoriteGroup getFavoriteGroup() { - return favoriteGroup; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favoriteGroup, flags); - } - - private void readFromParcel(Parcel in) { - favoriteGroup = in.readParcelable(AFavoriteGroup.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl deleted file mode 100644 index e8b0710a01..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite.group; - -parcelable RemoveFavoriteGroupParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java deleted file mode 100644 index 0b17274440..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.osmand.aidl.favorite.group; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveFavoriteGroupParams implements Parcelable { - - private AFavoriteGroup favoriteGroup; - - public RemoveFavoriteGroupParams(AFavoriteGroup favoriteGroup) { - this.favoriteGroup = favoriteGroup; - } - - public RemoveFavoriteGroupParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public RemoveFavoriteGroupParams createFromParcel(Parcel in) { - return new RemoveFavoriteGroupParams(in); - } - - @Override - public RemoveFavoriteGroupParams[] newArray(int size) { - return new RemoveFavoriteGroupParams[size]; - } - }; - - public AFavoriteGroup getFavoriteGroup() { - return favoriteGroup; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favoriteGroup, flags); - } - - private void readFromParcel(Parcel in) { - favoriteGroup = in.readParcelable(AFavoriteGroup.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl b/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl deleted file mode 100644 index e9001a8c5e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.favorite.group; - -parcelable UpdateFavoriteGroupParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java b/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java deleted file mode 100644 index 0ea52e1fda..0000000000 --- a/OsmAnd/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.osmand.aidl.favorite.group; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateFavoriteGroupParams implements Parcelable { - - private AFavoriteGroup favoriteGroupPrev; - private AFavoriteGroup favoriteGroupNew; - - public UpdateFavoriteGroupParams(AFavoriteGroup favoriteGroup, AFavoriteGroup favoriteGroupNew) { - this.favoriteGroupPrev = favoriteGroup; - this.favoriteGroupNew = favoriteGroupNew; - } - - public UpdateFavoriteGroupParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public UpdateFavoriteGroupParams createFromParcel(Parcel in) { - return new UpdateFavoriteGroupParams(in); - } - - @Override - public UpdateFavoriteGroupParams[] newArray(int size) { - return new UpdateFavoriteGroupParams[size]; - } - }; - - public AFavoriteGroup getFavoriteGroupPrev() { - return favoriteGroupPrev; - } - - public AFavoriteGroup getFavoriteGroupNew() { - return favoriteGroupNew; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(favoriteGroupPrev, flags); - out.writeParcelable(favoriteGroupNew, flags); - } - - private void readFromParcel(Parcel in) { - favoriteGroupPrev = in.readParcelable(AFavoriteGroup.class.getClassLoader()); - favoriteGroupNew = in.readParcelable(AFavoriteGroup.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java deleted file mode 100644 index f4bdef433d..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.java +++ /dev/null @@ -1,46 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.graphics.Bitmap; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -public class AGpxBitmap implements Parcelable { - - private Bitmap bitmap; - - public AGpxBitmap(@NonNull Bitmap bitmap) { - this.bitmap = bitmap; - } - - public AGpxBitmap(Parcel in) { - readFromParcel(in); - } - - public Bitmap getBitmap() { - return bitmap; - } - - public static final Creator CREATOR = new - Creator() { - public AGpxBitmap createFromParcel(Parcel in) { - return new AGpxBitmap(in); - } - - public AGpxBitmap[] newArray(int size) { - return new AGpxBitmap[size]; - } - }; - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(bitmap, flags); - } - - private void readFromParcel(Parcel in) { - bitmap = in.readParcelable(Bitmap.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl deleted file mode 100644 index 413d34a571..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable AGpxFile; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java deleted file mode 100644 index 028c0a628a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFile.java +++ /dev/null @@ -1,88 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class AGpxFile implements Parcelable { - - private String fileName; - private long modifiedTime; - private long fileSize; - private boolean active; - private AGpxFileDetails details; - - public AGpxFile(@NonNull String fileName, long modifiedTime, long fileSize, boolean active, @Nullable AGpxFileDetails details) { - this.fileName = fileName; - this.modifiedTime = modifiedTime; - this.fileSize = fileSize; - this.active = active; - this.details = details; - } - - public AGpxFile(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public AGpxFile createFromParcel(Parcel in) { - return new AGpxFile(in); - } - - public AGpxFile[] newArray(int size) { - return new AGpxFile[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public long getModifiedTime() { - return modifiedTime; - } - - public long getFileSize() { - return fileSize; - } - - public boolean isActive() { - return active; - } - - public AGpxFileDetails getDetails() { - return details; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - out.writeLong(modifiedTime); - out.writeLong(fileSize); - out.writeByte((byte) (active ? 1 : 0)); - - out.writeByte((byte) (details != null ? 1 : 0)); - if (details != null) { - out.writeParcelable(details, flags); - } - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - modifiedTime = in.readLong(); - fileSize = in.readLong(); - active = in.readByte() != 0; - - boolean hasDetails = in.readByte() != 0; - if (hasDetails) { - details = in.readParcelable(AGpxFileDetails.class.getClassLoader()); - } else { - details = null; - } - } - - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl b/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl deleted file mode 100644 index 1e2cdec2b1..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable AGpxFileDetails; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl deleted file mode 100644 index 23fc3312b4..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable ASelectedGpxFile; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl deleted file mode 100644 index b02d5c6e70..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable CreateGpxBitmapParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java b/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java deleted file mode 100644 index b6af1d354c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java +++ /dev/null @@ -1,101 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; - -import java.io.File; - -public class CreateGpxBitmapParams implements Parcelable { - - private File gpxFile; - private Uri gpxUri; - private float density; - private int widthPixels; - private int heightPixels; - private int color; //ARGB color int - - public CreateGpxBitmapParams(File gpxFile, float density, int widthPixels, int heightPixels, int color) { - this.gpxFile = gpxFile; - this.density = density; - this.widthPixels = widthPixels; - this.heightPixels = heightPixels; - this.color = color; - } - - public CreateGpxBitmapParams(Uri gpxUri, float density, int widthPixels, int heightPixels, int color) { - this.gpxUri = gpxUri; - this.density = density; - this.widthPixels = widthPixels; - this.heightPixels = heightPixels; - this.color = color; - } - - public CreateGpxBitmapParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public CreateGpxBitmapParams createFromParcel(Parcel in) { - return new CreateGpxBitmapParams(in); - } - - public CreateGpxBitmapParams[] newArray(int size) { - return new CreateGpxBitmapParams[size]; - } - }; - - public File getGpxFile() { - return gpxFile; - } - - public Uri getGpxUri() { - return gpxUri; - } - - public int getWidthPixels() { - return widthPixels; - } - - public int getHeightPixels() { - return heightPixels; - } - - public float getDensity() { - return density; - } - - public int getColor() { - return color; - } - - public void writeToParcel(Parcel out, int flags) { - if (gpxFile != null) { - out.writeString(gpxFile.getAbsolutePath()); - } else { - out.writeString(null); - } - out.writeParcelable(gpxUri, flags); - out.writeFloat(density); - out.writeInt(widthPixels); - out.writeInt(heightPixels); - out.writeInt(color); - } - - private void readFromParcel(Parcel in) { - String gpxAbsolutePath = in.readString(); - if (gpxAbsolutePath != null) { - gpxFile = new File(gpxAbsolutePath); - } - gpxUri = in.readParcelable(Uri.class.getClassLoader()); - density = in.readFloat(); - widthPixels = in.readInt(); - heightPixels = in.readInt(); - color = in.readInt(); - } - - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.aidl deleted file mode 100644 index bd26e19344..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable GpxColorParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.java b/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.java deleted file mode 100644 index cd039ec0cc..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/GpxColorParams.java +++ /dev/null @@ -1,66 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -public class GpxColorParams implements Parcelable { - - private String fileName; - private String gpxColor; - - public GpxColorParams() { - - } - - public GpxColorParams(@NonNull String fileName) { - this.fileName = fileName; - } - - public GpxColorParams(@NonNull String fileName, String gpxColor) { - this.fileName = fileName; - this.gpxColor = gpxColor; - } - - public GpxColorParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public GpxColorParams createFromParcel(Parcel in) { - return new GpxColorParams(in); - } - - public GpxColorParams[] newArray(int size) { - return new GpxColorParams[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public String getGpxColor() { - return gpxColor; - } - - public void setGpxColor(String gpxColor) { - this.gpxColor = gpxColor; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - out.writeString(gpxColor); - } - - public void readFromParcel(Parcel in) { - fileName = in.readString(); - gpxColor = in.readString(); - } - - public int describeContents() { - return 0; - } -} - diff --git a/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.aidl deleted file mode 100644 index 4c8992552c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable HideGpxParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.java deleted file mode 100644 index 5e37c66f80..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/HideGpxParams.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -public class HideGpxParams implements Parcelable { - - private String fileName; - - public HideGpxParams(String fileName) { - this.fileName = fileName; - } - - public HideGpxParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public HideGpxParams createFromParcel(Parcel in) { - return new HideGpxParams(in); - } - - public HideGpxParams[] newArray(int size) { - return new HideGpxParams[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - } - - public int describeContents() { - return 0; - } -} - diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.aidl deleted file mode 100644 index 23ecdb6ff3..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable ImportGpxParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.java deleted file mode 100644 index 6d2ed2cb88..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/ImportGpxParams.java +++ /dev/null @@ -1,106 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; - -import java.io.File; - -public class ImportGpxParams implements Parcelable { - - private File gpxFile; - private Uri gpxUri; - private String sourceRawData; - private String destinationPath; - private String color; - private boolean show; - - public ImportGpxParams(File gpxFile, String destinationPath, String color, boolean show) { - this.gpxFile = gpxFile; - this.destinationPath = destinationPath; - this.color = color; - this.show = show; - } - - public ImportGpxParams(Uri gpxUri, String destinationPath, String color, boolean show) { - this.gpxUri = gpxUri; - this.destinationPath = destinationPath; - this.color = color; - this.show = show; - } - - public ImportGpxParams(String sourceRawData, String destinationPath, String color, boolean show) { - this.sourceRawData = sourceRawData; - this.destinationPath = destinationPath; - this.color = color; - this.show = show; - } - - public ImportGpxParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public ImportGpxParams createFromParcel(Parcel in) { - return new ImportGpxParams(in); - } - - public ImportGpxParams[] newArray(int size) { - return new ImportGpxParams[size]; - } - }; - - public File getGpxFile() { - return gpxFile; - } - - public Uri getGpxUri() { - return gpxUri; - } - - public String getSourceRawData() { - return sourceRawData; - } - - public String getDestinationPath() { - return destinationPath; - } - - public String getColor() { - return color; - } - - public boolean isShow() { - return show; - } - - public void writeToParcel(Parcel out, int flags) { - if (gpxFile != null) { - out.writeString(gpxFile.getAbsolutePath()); - } else { - out.writeString(null); - } - out.writeParcelable(gpxUri, flags); - out.writeString(sourceRawData); - out.writeString(destinationPath); - out.writeString(color); - out.writeByte((byte) (show ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - String gpxAbsolutePath = in.readString(); - if (gpxAbsolutePath != null) { - gpxFile = new File(gpxAbsolutePath); - } - gpxUri = in.readParcelable(Uri.class.getClassLoader()); - sourceRawData = in.readString(); - destinationPath = in.readString(); - color = in.readString(); - show = in.readByte() == 1; - } - - public int describeContents() { - return 0; - } -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl deleted file mode 100644 index e9025f7a19..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable RemoveGpxParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.java deleted file mode 100644 index 2253fa3616..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/RemoveGpxParams.java +++ /dev/null @@ -1,48 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveGpxParams implements Parcelable { - - private String fileName; - - public RemoveGpxParams(String fileName) { - this.fileName = fileName; - } - - public RemoveGpxParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - @Override - public RemoveGpxParams createFromParcel(Parcel in) { - return new RemoveGpxParams(in); - } - - @Override - public RemoveGpxParams[] newArray(int size) { - return new RemoveGpxParams[size]; - } - }; - - public String getFileName() { - return fileName; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.aidl deleted file mode 100644 index 217f600c4e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable ShowGpxParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.java b/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.java deleted file mode 100644 index 4d385a65a4..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/ShowGpxParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ShowGpxParams implements Parcelable { - - private String fileName; - - public ShowGpxParams(String fileName) { - this.fileName = fileName; - } - - public ShowGpxParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public ShowGpxParams createFromParcel(Parcel in) { - return new ShowGpxParams(in); - } - - public ShowGpxParams[] newArray(int size) { - return new ShowGpxParams[size]; - } - }; - - public String getFileName() { - return fileName; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(fileName); - } - - private void readFromParcel(Parcel in) { - fileName = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl deleted file mode 100644 index 14f4871540..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable StartGpxRecordingParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java b/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java deleted file mode 100644 index 139eac8ea3..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StartGpxRecordingParams implements Parcelable { - - public StartGpxRecordingParams() { - - } - - public StartGpxRecordingParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StartGpxRecordingParams createFromParcel(Parcel in) { - return new StartGpxRecordingParams(in); - } - - @Override - public StartGpxRecordingParams[] newArray(int size) { - return new StartGpxRecordingParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl deleted file mode 100644 index db08f1811a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.gpx; - -parcelable StopGpxRecordingParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java b/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java deleted file mode 100644 index ada47db418..0000000000 --- a/OsmAnd/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.osmand.aidl.gpx; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StopGpxRecordingParams implements Parcelable { - - public StopGpxRecordingParams() { - - } - - public StopGpxRecordingParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StopGpxRecordingParams createFromParcel(Parcel in) { - return new StopGpxRecordingParams(in); - } - - @Override - public StopGpxRecordingParams[] newArray(int size) { - return new StopGpxRecordingParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/map/ALatLon.aidl b/OsmAnd/src/net/osmand/aidl/map/ALatLon.aidl deleted file mode 100644 index 33d5930f02..0000000000 --- a/OsmAnd/src/net/osmand/aidl/map/ALatLon.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.map; - -parcelable ALatLon; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/map/ALatLon.java b/OsmAnd/src/net/osmand/aidl/map/ALatLon.java deleted file mode 100644 index 377344fd6a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/map/ALatLon.java +++ /dev/null @@ -1,83 +0,0 @@ -package net.osmand.aidl.map; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ALatLon implements Parcelable { - - private double longitude; - private double latitude; - - public ALatLon(double latitude, double longitude) { - this.latitude = latitude; - this.longitude = longitude; - } - - public ALatLon(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public ALatLon createFromParcel(Parcel in) { - return new ALatLon(in); - } - - public ALatLon[] newArray(int size) { - return new ALatLon[size]; - } - }; - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - int temp; - temp = (int)Math.floor(latitude * 10000); - result = prime * result + temp; - temp = (int)Math.floor(longitude * 10000); - result = prime * result + temp; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - - ALatLon other = (ALatLon) obj; - return Math.abs(latitude - other.latitude) < 0.00001 - && Math.abs(longitude - other.longitude) < 0.00001; - } - - @Override - public String toString() { - return "Lat " + ((float)latitude) + " Lon " + ((float)longitude); - } - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - } - - public void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.aidl b/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.aidl deleted file mode 100644 index 9edde4f616..0000000000 --- a/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.map; - -parcelable SetMapLocationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.java b/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.java deleted file mode 100644 index 929c817d9d..0000000000 --- a/OsmAnd/src/net/osmand/aidl/map/SetMapLocationParams.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.osmand.aidl.map; - -import android.os.Parcel; -import android.os.Parcelable; - -public class SetMapLocationParams implements Parcelable { - - private double latitude; - private double longitude; - private int zoom; - private boolean animated; - - public SetMapLocationParams(double latitude, double longitude, int zoom, boolean animated) { - this.latitude = latitude; - this.longitude = longitude; - this.zoom = zoom; - this.animated = animated; - } - - public SetMapLocationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public SetMapLocationParams createFromParcel(Parcel in) { - return new SetMapLocationParams(in); - } - - public SetMapLocationParams[] newArray(int size) { - return new SetMapLocationParams[size]; - } - }; - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - public int getZoom() { - return zoom; - } - - public boolean isAnimated() { - return animated; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - out.writeInt(zoom); - out.writeByte((byte) (animated ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - zoom = in.readInt(); - animated = in.readByte() != 0; - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.aidl deleted file mode 100644 index 745f49f1a5..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer; - -parcelable AMapLayer; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.java b/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.java deleted file mode 100644 index f1c982fa3c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/AMapLayer.java +++ /dev/null @@ -1,176 +0,0 @@ -package net.osmand.aidl.maplayer; - -import android.os.Parcel; -import android.os.Parcelable; - -import net.osmand.aidl.maplayer.point.AMapPoint; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -public class AMapLayer implements Parcelable { - private String id; - private String name; - private float zOrder = 5.5f; - private Map points = new ConcurrentHashMap<>(); - - private boolean imagePoints = false; - private int circlePointMinZoom = 0; - private int circlePointMaxZoom = 6; - private int smallPointMinZoom = 7; - private int smallPointMaxZoom = 13; - private int bigPointMinZoom = 14; - private int bigPointMaxZoom = 22; - - public AMapLayer(String id, String name, float zOrder, List pointList) { - this.id = id; - this.name = name; - this.zOrder = zOrder; - if (pointList != null) { - for (AMapPoint p : pointList) { - this.points.put(p.getId(), p); - } - } - } - - public AMapLayer(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public AMapLayer createFromParcel(Parcel in) { - return new AMapLayer(in); - } - - public AMapLayer[] newArray(int size) { - return new AMapLayer[size]; - } - }; - - public String getId() { - return id; - } - - public String getName() { - return name; - } - - public float getZOrder() { - return zOrder; - } - - public List getPoints() { - return new ArrayList<>(points.values()); - } - - public AMapPoint getPoint(String pointId) { - return points.get(pointId); - } - - public boolean hasPoint(String pointId) { - return points.containsKey(pointId); - } - - public void putPoint(AMapPoint point) { - points.put(point.getId(), point); - } - - public void removePoint(String pointId) { - points.remove(pointId); - } - - public boolean isImagePoints() { - return imagePoints; - } - - public void setImagePoints(boolean imagePoints) { - this.imagePoints = imagePoints; - } - - public void copyZoomBounds(AMapLayer layer) { - circlePointMinZoom = layer.circlePointMinZoom; - circlePointMaxZoom = layer.circlePointMaxZoom; - smallPointMinZoom = layer.smallPointMinZoom; - smallPointMaxZoom = layer.smallPointMaxZoom; - bigPointMinZoom = layer.bigPointMinZoom; - bigPointMaxZoom = layer.bigPointMaxZoom; - } - - public void setCirclePointZoomBounds(int min, int max) { - circlePointMinZoom = min; - circlePointMaxZoom = max; - } - - public void setSmallPointZoomBounds(int min, int max) { - smallPointMinZoom = min; - smallPointMaxZoom = max; - } - - public void setBigPointZoomBounds(int min, int max) { - bigPointMinZoom = min; - bigPointMaxZoom = max; - } - - public int getCirclePointMinZoom() { - return circlePointMinZoom; - } - - public int getCirclePointMaxZoom() { - return circlePointMaxZoom; - } - - public int getSmallPointMinZoom() { - return smallPointMinZoom; - } - - public int getSmallPointMaxZoom() { - return smallPointMaxZoom; - } - - public int getBigPointMinZoom() { - return bigPointMinZoom; - } - - public int getBigPointMaxZoom() { - return bigPointMaxZoom; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(id); - out.writeString(name); - out.writeFloat(zOrder); - out.writeTypedList(new ArrayList<>(points.values())); - out.writeByte((byte) (imagePoints ? 1 : 0)); - out.writeInt(circlePointMinZoom); - out.writeInt(circlePointMaxZoom); - out.writeInt(smallPointMinZoom); - out.writeInt(smallPointMaxZoom); - out.writeInt(bigPointMinZoom); - out.writeInt(bigPointMaxZoom); - } - - private void readFromParcel(Parcel in) { - id = in.readString(); - name = in.readString(); - zOrder = in.readFloat(); - List pointList = new ArrayList<>(); - in.readTypedList(pointList, AMapPoint.CREATOR); - for (AMapPoint p : pointList) { - this.points.put(p.getId(), p); - } - imagePoints = in.readByte() == 1; - circlePointMinZoom = in.readInt(); - circlePointMaxZoom = in.readInt(); - smallPointMinZoom = in.readInt(); - smallPointMaxZoom = in.readInt(); - bigPointMinZoom = in.readInt(); - bigPointMaxZoom = in.readInt(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl deleted file mode 100644 index 8116760a45..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer; - -parcelable AddMapLayerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.java deleted file mode 100644 index 38e9e53667..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/AddMapLayerParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.maplayer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.os.Parcelable.Creator; - -public class AddMapLayerParams implements Parcelable { - private AMapLayer layer; - - public AddMapLayerParams(AMapLayer layer) { - this.layer = layer; - } - - public AddMapLayerParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public AddMapLayerParams createFromParcel(Parcel in) { - return new AddMapLayerParams(in); - } - - public AddMapLayerParams[] newArray(int size) { - return new AddMapLayerParams[size]; - } - }; - - public AMapLayer getLayer() { - return layer; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(layer, flags); - } - - private void readFromParcel(Parcel in) { - layer = in.readParcelable(AMapLayer.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl deleted file mode 100644 index 20a972ee95..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer; - -parcelable RemoveMapLayerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java deleted file mode 100644 index 3e87627445..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.maplayer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.os.Parcelable.Creator; - -public class RemoveMapLayerParams implements Parcelable { - private String id; - - public RemoveMapLayerParams(String id) { - this.id = id; - } - - public RemoveMapLayerParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public RemoveMapLayerParams createFromParcel(Parcel in) { - return new RemoveMapLayerParams(in); - } - - public RemoveMapLayerParams[] newArray(int size) { - return new RemoveMapLayerParams[size]; - } - }; - - public String getId() { - return id; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(id); - } - - private void readFromParcel(Parcel in) { - id = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl deleted file mode 100644 index eafe8ef464..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer; - -parcelable UpdateMapLayerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java deleted file mode 100644 index a2f6e16498..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.maplayer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.os.Parcelable.Creator; - -public class UpdateMapLayerParams implements Parcelable { - private AMapLayer layer; - - public UpdateMapLayerParams(AMapLayer layer) { - this.layer = layer; - } - - public UpdateMapLayerParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public UpdateMapLayerParams createFromParcel(Parcel in) { - return new UpdateMapLayerParams(in); - } - - public UpdateMapLayerParams[] newArray(int size) { - return new UpdateMapLayerParams[size]; - } - }; - - public AMapLayer getLayer() { - return layer; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(layer, flags); - } - - private void readFromParcel(Parcel in) { - layer = in.readParcelable(AMapLayer.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl deleted file mode 100644 index 53fb86b788..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -parcelable AMapPoint; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.java deleted file mode 100644 index a47e8ccfe9..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/AMapPoint.java +++ /dev/null @@ -1,125 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -import android.os.Parcel; -import android.os.Parcelable; - -import net.osmand.aidl.map.ALatLon; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class AMapPoint implements Parcelable { - public static final String POINT_IMAGE_URI_PARAM = "point_image_uri_param"; - public static final String POINT_SPEED_PARAM = "point_speed_param"; - public static final String POINT_TYPE_ICON_NAME_PARAM = "point_type_icon_name_param"; - public static final String POINT_STALE_LOC_PARAM = "point_stale_loc_param"; - public static final String POINT_BEARING_PARAM = "point_bearing_param"; - - private String id; - private String shortName; - private String fullName; - private String typeName; - private String layerId; - private int color; - private ALatLon location; - private List details = new ArrayList<>(); - private Map params = new HashMap<>(); - - public AMapPoint(String id, String shortName, String fullName, String typeName, String layerId, - int color, ALatLon location, List details, Map params) { - this.id = id; - this.shortName = shortName; - this.fullName = fullName; - this.typeName = typeName; - this.layerId = layerId; - this.color = color; - this.location = location; - if (details != null) { - this.details.addAll(details); - } - if (params != null) { - this.params.putAll(params); - } - } - - public AMapPoint(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public AMapPoint createFromParcel(Parcel in) { - return new AMapPoint(in); - } - - public AMapPoint[] newArray(int size) { - return new AMapPoint[size]; - } - }; - - public String getId() { - return id; - } - - public String getShortName() { - return shortName; - } - - public String getFullName() { - return fullName; - } - - public String getTypeName() { - return typeName; - } - - public String getLayerId() { - return layerId; - } - - public int getColor() { - return color; - } - - public ALatLon getLocation() { - return location; - } - - public List getDetails() { - return details; - } - - public Map getParams() { - return params; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(id); - out.writeString(shortName); - out.writeString(fullName); - out.writeString(typeName); - out.writeInt(color); - out.writeParcelable(location, flags); - out.writeStringList(details); - out.writeMap(params); - out.writeString(layerId); - } - - private void readFromParcel(Parcel in) { - id = in.readString(); - shortName = in.readString(); - fullName = in.readString(); - typeName = in.readString(); - color = in.readInt(); - location = in.readParcelable(ALatLon.class.getClassLoader()); - in.readStringList(details); - in.readMap(params, HashMap.class.getClassLoader()); - layerId = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl deleted file mode 100644 index d41d6b69ca..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -parcelable AddMapPointParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java deleted file mode 100644 index 0d575a38d9..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AddMapPointParams implements Parcelable { - private String layerId; - private AMapPoint point; - - public AddMapPointParams(String layerId, AMapPoint point) { - this.layerId = layerId; - this.point = point; - } - - public AddMapPointParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public AddMapPointParams createFromParcel(Parcel in) { - return new AddMapPointParams(in); - } - - public AddMapPointParams[] newArray(int size) { - return new AddMapPointParams[size]; - } - }; - - public String getLayerId() { - return layerId; - } - - public AMapPoint getPoint() { - return point; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(layerId); - out.writeParcelable(point, flags); - } - - private void readFromParcel(Parcel in) { - layerId = in.readString(); - point = in.readParcelable(AMapPoint.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl deleted file mode 100644 index 68a5fdcf11..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -parcelable RemoveMapPointParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java deleted file mode 100644 index 797556b1e3..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveMapPointParams implements Parcelable { - private String layerId; - private String pointId; - - public RemoveMapPointParams(String layerId, String pointId) { - this.layerId = layerId; - this.pointId = pointId; - } - - public RemoveMapPointParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public RemoveMapPointParams createFromParcel(Parcel in) { - return new RemoveMapPointParams(in); - } - - public RemoveMapPointParams[] newArray(int size) { - return new RemoveMapPointParams[size]; - } - }; - - public String getLayerId() { - return layerId; - } - - public String getPointId() { - return pointId; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(layerId); - out.writeString(pointId); - } - - private void readFromParcel(Parcel in) { - layerId = in.readString(); - pointId = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl deleted file mode 100644 index 54ff9b2075..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -parcelable ShowMapPointParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java deleted file mode 100644 index 5b6e0c17c9..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ShowMapPointParams implements Parcelable { - - private String layerId; - private AMapPoint point; - - public ShowMapPointParams(String layerId, AMapPoint point) { - this.layerId = layerId; - this.point = point; - } - - public ShowMapPointParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - @Override - public ShowMapPointParams createFromParcel(Parcel in) { - return new ShowMapPointParams(in); - } - - @Override - public ShowMapPointParams[] newArray(int size) { - return new ShowMapPointParams[size]; - } - }; - - public String getLayerId() { - return layerId; - } - - public AMapPoint getPoint() { - return point; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(layerId); - out.writeParcelable(point, flags); - } - - private void readFromParcel(Parcel in) { - layerId = in.readString(); - point = in.readParcelable(AMapPoint.class.getClassLoader()); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl b/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl deleted file mode 100644 index d81ea87253..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -parcelable UpdateMapPointParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java b/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java deleted file mode 100644 index a7b871a1d4..0000000000 --- a/OsmAnd/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.osmand.aidl.maplayer.point; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateMapPointParams implements Parcelable { - private String layerId; - private AMapPoint point; - private boolean updateOpenedMenuAndMap; - - public UpdateMapPointParams(String layerId, AMapPoint point, boolean updateOpenedMenuAndMap) { - this.layerId = layerId; - this.point = point; - this.updateOpenedMenuAndMap = updateOpenedMenuAndMap; - } - - public UpdateMapPointParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public UpdateMapPointParams createFromParcel(Parcel in) { - return new UpdateMapPointParams(in); - } - - public UpdateMapPointParams[] newArray(int size) { - return new UpdateMapPointParams[size]; - } - }; - - public String getLayerId() { - return layerId; - } - - public AMapPoint getPoint() { - return point; - } - - public boolean isUpdateOpenedMenuAndMap() { - return updateOpenedMenuAndMap; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(layerId); - out.writeParcelable(point, flags); - out.writeInt(updateOpenedMenuAndMap ? 1 : 0); - } - - private void readFromParcel(Parcel in) { - layerId = in.readString(); - point = in.readParcelable(AMapPoint.class.getClassLoader()); - updateOpenedMenuAndMap = in.readInt() != 0; - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.aidl deleted file mode 100644 index 4721b1812b..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapmarker; - -parcelable AMapMarker; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.java b/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.java deleted file mode 100644 index 083b5bbb37..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/AMapMarker.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.osmand.aidl.mapmarker; - -import android.os.Parcel; -import android.os.Parcelable; - -import net.osmand.aidl.map.ALatLon; - -public class AMapMarker implements Parcelable { - - private ALatLon latLon; - private String name; - - public AMapMarker(ALatLon latLon, String name) { - - if (latLon == null) { - throw new IllegalArgumentException("latLon cannot be null"); - } - - if (name == null) { - name = ""; - } - - this.latLon = latLon; - this.name = name; - } - - public AMapMarker(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public AMapMarker createFromParcel(Parcel in) { - return new AMapMarker(in); - } - - public AMapMarker[] newArray(int size) { - return new AMapMarker[size]; - } - }; - - public ALatLon getLatLon() { - return latLon; - } - - public String getName() { - return name; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(latLon, flags); - out.writeString(name); - } - - private void readFromParcel(Parcel in) { - latLon = in.readParcelable(ALatLon.class.getClassLoader()); - name = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl deleted file mode 100644 index eef370b4e2..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapmarker; - -parcelable AddMapMarkerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java deleted file mode 100644 index cc707006e4..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.osmand.aidl.mapmarker; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AddMapMarkerParams implements Parcelable { - - private AMapMarker marker; - - public AddMapMarkerParams(AMapMarker marker) { - this.marker = marker; - } - - public AddMapMarkerParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public AddMapMarkerParams createFromParcel(Parcel in) { - return new AddMapMarkerParams(in); - } - - public AddMapMarkerParams[] newArray(int size) { - return new AddMapMarkerParams[size]; - } - }; - - public AMapMarker getMarker() { - return marker; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(marker, flags); - } - - private void readFromParcel(Parcel in) { - marker = in.readParcelable(AMapMarker.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl deleted file mode 100644 index e5b5b126ad..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapmarker; - -parcelable RemoveMapMarkerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl deleted file mode 100644 index ee5f4936d7..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapmarker; - -parcelable RemoveMapMarkersParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java b/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java deleted file mode 100644 index cf0ea8d00c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.osmand.aidl.mapmarker; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveMapMarkersParams implements Parcelable { - - - public RemoveMapMarkersParams() { - } - - public RemoveMapMarkersParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new - Creator() { - public RemoveMapMarkersParams createFromParcel(Parcel in) { - return new RemoveMapMarkersParams(in); - } - - public RemoveMapMarkersParams[] newArray(int size) { - return new RemoveMapMarkersParams[size]; - } - }; - - - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl b/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl deleted file mode 100644 index 2a17fa9369..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapmarker; - -parcelable UpdateMapMarkerParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.aidl deleted file mode 100644 index 7798986483..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapwidget; - -parcelable AMapWidget; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.java b/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.java deleted file mode 100644 index f6fac08942..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/AMapWidget.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.osmand.aidl.mapwidget; - -import android.content.Intent; -import android.os.Parcel; -import android.os.Parcelable; - -public class AMapWidget implements Parcelable { - private String id; - private String menuIconName; - private String menuTitle; - private String lightIconName; - private String darkIconName; - private String text; - private String description; - private int order; - private Intent intentOnClick; - - public AMapWidget(String id, String menuIconName, String menuTitle, - String lightIconName, String darkIconName, String text, String description, - int order, Intent intentOnClick) { - this.id = id; - this.menuIconName = menuIconName; - this.menuTitle = menuTitle; - this.lightIconName = lightIconName; - this.darkIconName = darkIconName; - this.text = text; - this.description = description; - this.order = order; - this.intentOnClick = intentOnClick; - } - - public AMapWidget(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public AMapWidget createFromParcel(Parcel in) { - return new AMapWidget(in); - } - - public AMapWidget[] newArray(int size) { - return new AMapWidget[size]; - } - }; - - public String getId() { - return id; - } - - public String getMenuIconName() { - return menuIconName; - } - - public String getMenuTitle() { - return menuTitle; - } - - public String getLightIconName() { - return lightIconName; - } - - public String getDarkIconName() { - return darkIconName; - } - - public String getText() { - return text; - } - - public String getDescription() { - return description; - } - - public int getOrder() { - return order; - } - - public Intent getIntentOnClick() { - return intentOnClick; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(id); - out.writeString(menuIconName); - out.writeString(menuTitle); - out.writeString(lightIconName); - out.writeString(darkIconName); - out.writeString(text); - out.writeString(description); - out.writeInt(order); - out.writeParcelable(intentOnClick, flags); - } - - private void readFromParcel(Parcel in) { - id = in.readString(); - menuIconName = in.readString(); - menuTitle = in.readString(); - lightIconName = in.readString(); - darkIconName = in.readString(); - text = in.readString(); - description = in.readString(); - order = in.readInt(); - intentOnClick = in.readParcelable(Intent.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl deleted file mode 100644 index 891d338eb8..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapwidget; - -parcelable AddMapWidgetParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java deleted file mode 100644 index 69b337209e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.osmand.aidl.mapwidget; - -import android.os.Parcel; -import android.os.Parcelable; - -public class AddMapWidgetParams implements Parcelable { - private AMapWidget widget; - - public AddMapWidgetParams(AMapWidget widget) { - this.widget = widget; - } - - public AddMapWidgetParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public AddMapWidgetParams createFromParcel(Parcel in) { - return new AddMapWidgetParams(in); - } - - public AddMapWidgetParams[] newArray(int size) { - return new AddMapWidgetParams[size]; - } - }; - - public AMapWidget getWidget() { - return widget; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(widget, flags); - } - - private void readFromParcel(Parcel in) { - widget = in.readParcelable(AMapWidget.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl deleted file mode 100644 index 445b0c994d..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapwidget; - -parcelable RemoveMapWidgetParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java deleted file mode 100644 index e1433d530c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.osmand.aidl.mapwidget; - -import android.os.Parcel; -import android.os.Parcelable; - -public class RemoveMapWidgetParams implements Parcelable { - private String id; - - public RemoveMapWidgetParams(String id) { - this.id = id; - } - - public RemoveMapWidgetParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public RemoveMapWidgetParams createFromParcel(Parcel in) { - return new RemoveMapWidgetParams(in); - } - - public RemoveMapWidgetParams[] newArray(int size) { - return new RemoveMapWidgetParams[size]; - } - }; - - public String getId() { - return id; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeString(id); - } - - private void readFromParcel(Parcel in) { - id = in.readString(); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl b/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl deleted file mode 100644 index b92f94c008..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.mapwidget; - -parcelable UpdateMapWidgetParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java b/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java deleted file mode 100644 index 07114ad16e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.osmand.aidl.mapwidget; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UpdateMapWidgetParams implements Parcelable { - private AMapWidget widget; - - public UpdateMapWidgetParams(AMapWidget widget) { - this.widget = widget; - } - - public UpdateMapWidgetParams(Parcel in) { - readFromParcel(in); - } - - public static final Parcelable.Creator CREATOR = new - Parcelable.Creator() { - public UpdateMapWidgetParams createFromParcel(Parcel in) { - return new UpdateMapWidgetParams(in); - } - - public UpdateMapWidgetParams[] newArray(int size) { - return new UpdateMapWidgetParams[size]; - } - }; - - public AMapWidget getWidget() { - return widget; - } - - public void writeToParcel(Parcel out, int flags) { - out.writeParcelable(widget, flags); - } - - private void readFromParcel(Parcel in) { - widget = in.readParcelable(AMapWidget.class.getClassLoader()); - } - - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl deleted file mode 100644 index fc1271a8ca..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navdrawer; - -parcelable NavDrawerFooterParams; diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java deleted file mode 100644 index 9bfd70193f..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.osmand.aidl.navdrawer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class NavDrawerFooterParams implements Parcelable { - - @NonNull - private String packageName; - @Nullable - private String intent; - @Nullable - private String appName; - - @NonNull - public String getPackageName() { - return packageName; - } - - @Nullable - public String getIntent() { - return intent; - } - - @Nullable - public String getAppName() { - return appName; - } - - public NavDrawerFooterParams(@NonNull String packageName, @Nullable String intent, - @Nullable String appName) { - this.packageName = packageName; - this.intent = intent; - this.appName = appName; - } - - protected NavDrawerFooterParams(Parcel in) { - packageName = in.readString(); - intent = in.readString(); - appName = in.readString(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(packageName); - dest.writeString(intent); - dest.writeString(appName); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavDrawerFooterParams createFromParcel(Parcel in) { - return new NavDrawerFooterParams(in); - } - - @Override - public NavDrawerFooterParams[] newArray(int size) { - return new NavDrawerFooterParams[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl deleted file mode 100644 index c230824841..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navdrawer; - -parcelable NavDrawerHeaderParams; diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java deleted file mode 100644 index c88950fd10..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.osmand.aidl.navdrawer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class NavDrawerHeaderParams implements Parcelable { - - @NonNull - private String imageUri; - @NonNull - private String packageName; - @Nullable - private String intent; - - @NonNull - public String getImageUri() { - return imageUri; - } - - @NonNull - public String getPackageName() { - return packageName; - } - - @Nullable - public String getIntent() { - return intent; - } - - public NavDrawerHeaderParams(@NonNull String imageUri, @NonNull String packageName, - @Nullable String intent) { - this.imageUri = imageUri; - this.packageName = packageName; - this.intent = intent; - } - - public NavDrawerHeaderParams(Parcel in) { - imageUri = in.readString(); - packageName = in.readString(); - intent = in.readString(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(imageUri); - dest.writeString(packageName); - dest.writeString(intent); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavDrawerHeaderParams createFromParcel(Parcel in) { - return new NavDrawerHeaderParams(in); - } - - @Override - public NavDrawerHeaderParams[] newArray(int size) { - return new NavDrawerHeaderParams[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl deleted file mode 100644 index 082061b7f1..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navdrawer; - -parcelable NavDrawerItem; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.java b/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.java deleted file mode 100644 index aedc585b65..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/NavDrawerItem.java +++ /dev/null @@ -1,73 +0,0 @@ -package net.osmand.aidl.navdrawer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -public class NavDrawerItem implements Parcelable { - - private String name; - private String uri; - private String iconName; - private int flags; - - public NavDrawerItem(@NonNull String name, @NonNull String uri, @Nullable String iconName) { - this(name, uri, iconName, -1); - } - - public NavDrawerItem(@NonNull String name, @NonNull String uri, @Nullable String iconName, int flags) { - this.name = name; - this.uri = uri; - this.iconName = iconName; - this.flags = flags; - } - - protected NavDrawerItem(Parcel in) { - name = in.readString(); - uri = in.readString(); - iconName = in.readString(); - flags = in.readInt(); - } - - public String getName() { - return name; - } - - public String getUri() { - return uri; - } - - public String getIconName() { - return iconName; - } - - public int getFlags() { - return flags; - } - - @Override - public void writeToParcel(Parcel dest, int f) { - dest.writeString(name); - dest.writeString(uri); - dest.writeString(iconName); - dest.writeInt(flags); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavDrawerItem createFromParcel(Parcel in) { - return new NavDrawerItem(in); - } - - @Override - public NavDrawerItem[] newArray(int size) { - return new NavDrawerItem[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl b/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl deleted file mode 100644 index 1d34a5cdc5..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navdrawer; - -parcelable SetNavDrawerItemsParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java b/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java deleted file mode 100644 index 783a76eb7b..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.navdrawer; - -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.NonNull; - -import java.util.ArrayList; -import java.util.List; - -public class SetNavDrawerItemsParams implements Parcelable { - - private String appPackage; - private List items; - - public SetNavDrawerItemsParams(@NonNull String appPackage, @NonNull List items) { - this.appPackage = appPackage; - this.items = items; - } - - protected SetNavDrawerItemsParams(Parcel in) { - appPackage = in.readString(); - items = new ArrayList<>(); - in.readTypedList(items, NavDrawerItem.CREATOR); - } - - public String getAppPackage() { - return appPackage; - } - - public List getItems() { - return items; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(appPackage); - dest.writeTypedList(new ArrayList<>(items)); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public SetNavDrawerItemsParams createFromParcel(Parcel in) { - return new SetNavDrawerItemsParams(in); - } - - @Override - public SetNavDrawerItemsParams[] newArray(int size) { - return new SetNavDrawerItemsParams[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.aidl deleted file mode 100644 index b0793d6e1a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable ADirectionInfo; diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.java b/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.java deleted file mode 100644 index a5e7074f0e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ADirectionInfo.java +++ /dev/null @@ -1,73 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ADirectionInfo implements Parcelable { - - private int distanceTo; //distance to next turn - private int turnType; //turn type - private boolean isLeftSide; //is movement left-sided - - public ADirectionInfo(int distanceTo, int turnType, boolean isLeftSide) { - this.distanceTo = distanceTo; - this.turnType = turnType; - this.isLeftSide = isLeftSide; - } - - protected ADirectionInfo(Parcel in) { - distanceTo = in.readInt(); - turnType = in.readInt(); - isLeftSide = in.readByte() != 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public ADirectionInfo createFromParcel(Parcel in) { - return new ADirectionInfo(in); - } - - @Override - public ADirectionInfo[] newArray(int size) { - return new ADirectionInfo[size]; - } - }; - - public int getDistanceTo() { - return distanceTo; - } - - public int getTurnType() { - return turnType; - } - - public boolean isLeftSide() { - return isLeftSide; - } - - public void setDistanceTo(int distanceTo) { - this.distanceTo = distanceTo; - } - - public void setTurnType(int turnType) { - this.turnType = turnType; - } - - public void setLeftSide(boolean leftSide) { - isLeftSide = leftSide; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(distanceTo); - dest.writeInt(turnType); - dest.writeByte((byte) (isLeftSide ? 1 : 0)); - } - - -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl deleted file mode 100644 index 43f370d024..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl +++ /dev/null @@ -1,4 +0,0 @@ - -package net.osmand.aidl.navigation; - -parcelable ANavigationUpdateParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java deleted file mode 100644 index 38c8f5ffe4..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ANavigationUpdateParams implements Parcelable { - - private boolean subscribeToUpdates = true; - private long callbackId = -1L; - - public ANavigationUpdateParams() { - } - - public long getCallbackId() { - return callbackId; - } - - public void setCallbackId(long callbackId) { - this.callbackId = callbackId; - } - - public void setSubscribeToUpdates(boolean subscribeToUpdates) { - this.subscribeToUpdates = subscribeToUpdates; - } - - public boolean isSubscribeToUpdates() { - return subscribeToUpdates; - } - - protected ANavigationUpdateParams(Parcel in) { - callbackId = in.readLong(); - subscribeToUpdates = in.readByte() != 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeLong(callbackId); - dest.writeByte((byte) (subscribeToUpdates ? 1 : 0)); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public ANavigationUpdateParams createFromParcel(Parcel in) { - return new ANavigationUpdateParams(in); - } - - @Override - public ANavigationUpdateParams[] newArray(int size) { - return new ANavigationUpdateParams[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl deleted file mode 100644 index 6dfbe239ae..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable ANavigationVoiceRouterMessageParams; diff --git a/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl deleted file mode 100644 index d1205adaf3..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable MuteNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.java deleted file mode 100644 index 8965c415fa..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/MuteNavigationParams.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class MuteNavigationParams implements Parcelable { - - public MuteNavigationParams() { - } - - public MuteNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public MuteNavigationParams createFromParcel(Parcel in) { - return new MuteNavigationParams(in); - } - - @Override - public MuteNavigationParams[] newArray(int size) { - return new MuteNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl deleted file mode 100644 index dea59ed048..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable NavigateGpxParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.java deleted file mode 100644 index 6e8fb8efe7..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateGpxParams.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.net.Uri; -import android.os.Parcel; -import android.os.Parcelable; - -public class NavigateGpxParams implements Parcelable { - - private String data; - private Uri uri; - private boolean force; - - public NavigateGpxParams(String data, boolean force) { - this.data = data; - this.force = force; - } - - public NavigateGpxParams(Uri uri, boolean force) { - this.uri = uri; - this.force = force; - } - - public NavigateGpxParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavigateGpxParams createFromParcel(Parcel in) { - return new NavigateGpxParams(in); - } - - @Override - public NavigateGpxParams[] newArray(int size) { - return new NavigateGpxParams[size]; - } - }; - - public String getData() { - return data; - } - - public Uri getUri() { - return uri; - } - - public boolean isForce() { - return force; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(data); - out.writeParcelable(uri, flags); - out.writeByte((byte) (force ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - data = in.readString(); - uri = in.readParcelable(Uri.class.getClassLoader()); - force = in.readByte() != 0; - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.aidl deleted file mode 100644 index f9b51d7a8c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable NavigateParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.java deleted file mode 100644 index 8b0bdeb1eb..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateParams.java +++ /dev/null @@ -1,104 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class NavigateParams implements Parcelable { - - private String startName; - private double startLat; - private double startLon; - private String destName; - private double destLat; - private double destLon; - private String profile; - private boolean force; - - public NavigateParams(String startName, double startLat, double startLon, String destName, double destLat, double destLon, String profile, boolean force) { - this.startName = startName; - this.startLat = startLat; - this.startLon = startLon; - this.destName = destName; - this.destLat = destLat; - this.destLon = destLon; - this.profile = profile; - this.force = force; - } - - public NavigateParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavigateParams createFromParcel(Parcel in) { - return new NavigateParams(in); - } - - @Override - public NavigateParams[] newArray(int size) { - return new NavigateParams[size]; - } - }; - - public String getStartName() { - return startName; - } - - public double getStartLat() { - return startLat; - } - - public double getStartLon() { - return startLon; - } - - public String getDestName() { - return destName; - } - - public double getDestLat() { - return destLat; - } - - public double getDestLon() { - return destLon; - } - - public String getProfile() { - return profile; - } - - public boolean isForce() { - return force; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(startName); - out.writeDouble(startLat); - out.writeDouble(startLon); - out.writeString(destName); - out.writeDouble(destLat); - out.writeDouble(destLon); - out.writeString(profile); - out.writeByte((byte) (force ? 1 : 0)); - } - - private void readFromParcel(Parcel in) { - startName = in.readString(); - startLat = in.readDouble(); - startLon = in.readDouble(); - destName = in.readString(); - destLat = in.readDouble(); - destLon = in.readDouble(); - profile = in.readString(); - force = in.readByte() != 0; - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl deleted file mode 100644 index 57433b8fde..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable NavigateSearchParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.java b/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.java deleted file mode 100644 index b092bcd4eb..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/NavigateSearchParams.java +++ /dev/null @@ -1,106 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class NavigateSearchParams implements Parcelable { - - private String startName; - private double startLat; - private double startLon; - private String searchQuery; - private double searchLat; - private double searchLon; - private String profile; - private boolean force; - - public NavigateSearchParams(String startName, double startLat, double startLon, - String searchQuery, double searchLat, double searchLon, - String profile, boolean force) { - this.startName = startName; - this.startLat = startLat; - this.startLon = startLon; - this.searchQuery = searchQuery; - this.searchLat = searchLat; - this.searchLon = searchLon; - this.profile = profile; - this.force = force; - } - - public NavigateSearchParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public NavigateSearchParams createFromParcel(Parcel in) { - return new NavigateSearchParams(in); - } - - @Override - public NavigateSearchParams[] newArray(int size) { - return new NavigateSearchParams[size]; - } - }; - - public String getStartName() { - return startName; - } - - public double getStartLat() { - return startLat; - } - - public double getStartLon() { - return startLon; - } - - public String getSearchQuery() { - return searchQuery; - } - - public double getSearchLat() { - return searchLat; - } - - public double getSearchLon() { - return searchLon; - } - - public String getProfile() { - return profile; - } - - public boolean isForce() { - return force; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(startName); - out.writeDouble(startLat); - out.writeDouble(startLon); - out.writeString(searchQuery); - out.writeString(profile); - out.writeByte((byte) (force ? 1 : 0)); - out.writeDouble(searchLat); - out.writeDouble(searchLon); - } - - private void readFromParcel(Parcel in) { - startName = in.readString(); - startLat = in.readDouble(); - startLon = in.readDouble(); - searchQuery = in.readString(); - profile = in.readString(); - force = in.readByte() != 0; - searchLat = in.readDouble(); - searchLon = in.readDouble(); - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl deleted file mode 100644 index 53ab4f6a5c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable OnVoiceNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java deleted file mode 100644 index 20fd34e13e..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; -import java.util.List; - -public class OnVoiceNavigationParams implements Parcelable { - - private List cmds; - private List played; - - public OnVoiceNavigationParams() { - cmds = new ArrayList<>(); - played = new ArrayList<>(); - } - - public OnVoiceNavigationParams(List cmds, List played) { - this.cmds = cmds; - this.played = played; - } - - public OnVoiceNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public OnVoiceNavigationParams createFromParcel(Parcel in) { - return new OnVoiceNavigationParams(in); - } - - @Override - public OnVoiceNavigationParams[] newArray(int size) { - return new OnVoiceNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeStringList(cmds); - out.writeStringList(played); - } - - private void readFromParcel(Parcel in) { - cmds = new ArrayList<>(); - in.readStringList(cmds); - played = new ArrayList<>(); - in.readStringList(played); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl deleted file mode 100644 index 0a18566304..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable PauseNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.java deleted file mode 100644 index 5a28538039..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/PauseNavigationParams.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class PauseNavigationParams implements Parcelable { - - public PauseNavigationParams() { - } - - public PauseNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public PauseNavigationParams createFromParcel(Parcel in) { - return new PauseNavigationParams(in); - } - - @Override - public PauseNavigationParams[] newArray(int size) { - return new PauseNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl deleted file mode 100644 index 4dcf619aaa..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable ResumeNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.java deleted file mode 100644 index d1032dc914..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/ResumeNavigationParams.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class ResumeNavigationParams implements Parcelable { - - public ResumeNavigationParams() { - } - - public ResumeNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public ResumeNavigationParams createFromParcel(Parcel in) { - return new ResumeNavigationParams(in); - } - - @Override - public ResumeNavigationParams[] newArray(int size) { - return new ResumeNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.aidl deleted file mode 100644 index 5ba45bdf50..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable StopNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.java deleted file mode 100644 index e87d6ed2da..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/StopNavigationParams.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StopNavigationParams implements Parcelable { - - public StopNavigationParams() { - } - - public StopNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StopNavigationParams createFromParcel(Parcel in) { - return new StopNavigationParams(in); - } - - @Override - public StopNavigationParams[] newArray(int size) { - return new StopNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl b/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl deleted file mode 100644 index 7512bbcf34..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.navigation; - -parcelable UnmuteNavigationParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java b/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java deleted file mode 100644 index 36819db065..0000000000 --- a/OsmAnd/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.osmand.aidl.navigation; - -import android.os.Parcel; -import android.os.Parcelable; - -public class UnmuteNavigationParams implements Parcelable { - - public UnmuteNavigationParams() { - } - - public UnmuteNavigationParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public UnmuteNavigationParams createFromParcel(Parcel in) { - return new UnmuteNavigationParams(in); - } - - @Override - public UnmuteNavigationParams[] newArray(int size) { - return new UnmuteNavigationParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - } - - private void readFromParcel(Parcel in) { - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl deleted file mode 100644 index bb16dea140..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.note; - -parcelable StartAudioRecordingParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.java deleted file mode 100644 index c2800feb9c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StartAudioRecordingParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.note; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StartAudioRecordingParams implements Parcelable { - - private double latitude; - private double longitude; - - public StartAudioRecordingParams(double latitude, double longitude) { - this.latitude = latitude; - this.longitude = longitude; - } - - public StartAudioRecordingParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StartAudioRecordingParams createFromParcel(Parcel in) { - return new StartAudioRecordingParams(in); - } - - @Override - public StartAudioRecordingParams[] newArray(int size) { - return new StartAudioRecordingParams[size]; - } - }; - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - } - - private void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl deleted file mode 100644 index 082b68e09c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.note; - -parcelable StartVideoRecordingParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.java deleted file mode 100644 index aee86ea9de..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StartVideoRecordingParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.note; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StartVideoRecordingParams implements Parcelable { - - private double latitude; - private double longitude; - - public StartVideoRecordingParams(double latitude, double longitude) { - this.latitude = latitude; - this.longitude = longitude; - } - - public StartVideoRecordingParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StartVideoRecordingParams createFromParcel(Parcel in) { - return new StartVideoRecordingParams(in); - } - - @Override - public StartVideoRecordingParams[] newArray(int size) { - return new StartVideoRecordingParams[size]; - } - }; - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - } - - private void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.aidl b/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.aidl deleted file mode 100644 index 4111efbcb6..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.note; - -parcelable StopRecordingParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.java b/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.java deleted file mode 100644 index b56a42504b..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/StopRecordingParams.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.osmand.aidl.note; - -import android.os.Parcel; -import android.os.Parcelable; - -public class StopRecordingParams implements Parcelable { - - public StopRecordingParams() { - - } - - public StopRecordingParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public StopRecordingParams createFromParcel(Parcel in) { - return new StopRecordingParams(in); - } - - @Override - public StopRecordingParams[] newArray(int size) { - return new StopRecordingParams[size]; - } - }; - - @Override - public void writeToParcel(Parcel out, int flags) { - - } - - private void readFromParcel(Parcel in) { - - } - - @Override - public int describeContents() { - return 0; - } - -} \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl b/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl deleted file mode 100644 index 3c09d62c41..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.note; - -parcelable TakePhotoNoteParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.java b/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.java deleted file mode 100644 index 254516e080..0000000000 --- a/OsmAnd/src/net/osmand/aidl/note/TakePhotoNoteParams.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.osmand.aidl.note; - -import android.os.Parcel; -import android.os.Parcelable; - -public class TakePhotoNoteParams implements Parcelable { - - private double latitude; - private double longitude; - - public TakePhotoNoteParams(double latitude, double longitude) { - this.latitude = latitude; - this.longitude = longitude; - } - - public TakePhotoNoteParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public TakePhotoNoteParams createFromParcel(Parcel in) { - return new TakePhotoNoteParams(in); - } - - @Override - public TakePhotoNoteParams[] newArray(int size) { - return new TakePhotoNoteParams[size]; - } - }; - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - } - - private void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - } - - @Override - public int describeContents() { - return 0; - } - -} diff --git a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl deleted file mode 100644 index beff693f5a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.aidl +++ /dev/null @@ -1,5 +0,0 @@ -// PluginParams.aidl -package net.osmand.aidl.plugins; - -parcelable PluginParams; - diff --git a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java b/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java deleted file mode 100644 index 028bd8676a..0000000000 --- a/OsmAnd/src/net/osmand/aidl/plugins/PluginParams.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.osmand.aidl.plugins; - -import android.os.Parcel; -import android.os.Parcelable; - -public class PluginParams implements Parcelable { - - private String pluginId; - private int newState; //0- off, 1 - on - - public PluginParams(String pluginId, int newState) { - this.pluginId = pluginId; - this.newState = newState; - } - - public String getPluginId() { - return pluginId; - } - - public int getNewState() { - return newState; - } - - protected PluginParams(Parcel in) { - pluginId = in.readString(); - newState = in.readInt(); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeString(pluginId); - dest.writeInt(newState); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public PluginParams createFromParcel(Parcel in) { - return new PluginParams(in); - } - - @Override - public PluginParams[] newArray(int size) { - return new PluginParams[size]; - } - }; -} diff --git a/OsmAnd/src/net/osmand/aidl/search/SearchParams.aidl b/OsmAnd/src/net/osmand/aidl/search/SearchParams.aidl deleted file mode 100644 index dfda88c493..0000000000 --- a/OsmAnd/src/net/osmand/aidl/search/SearchParams.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.search; - -parcelable SearchParams; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/search/SearchParams.java b/OsmAnd/src/net/osmand/aidl/search/SearchParams.java deleted file mode 100644 index 303cecb25c..0000000000 --- a/OsmAnd/src/net/osmand/aidl/search/SearchParams.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.osmand.aidl.search; - -import android.os.Parcel; -import android.os.Parcelable; - -public class SearchParams implements Parcelable { - - public static final int SEARCH_TYPE_POI = 1; - public static final int SEARCH_TYPE_ADDRESS = 2; - public static final int SEARCH_TYPE_ALL = SEARCH_TYPE_POI | SEARCH_TYPE_ADDRESS; - - private String searchQuery; - private int searchType; - private double latitude; - private double longitude; - private int radiusLevel = 1; - private int totalLimit = -1; - - public SearchParams(String searchQuery, int searchType, double latitude, double longitude, int radiusLevel, int totalLimit) { - this.searchQuery = searchQuery; - this.searchType = searchType; - this.latitude = latitude; - this.longitude = longitude; - this.radiusLevel = radiusLevel; - this.totalLimit = totalLimit; - } - - public SearchParams(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public SearchParams createFromParcel(Parcel in) { - return new SearchParams(in); - } - - @Override - public SearchParams[] newArray(int size) { - return new SearchParams[size]; - } - }; - - public String getSearchQuery() { - return searchQuery; - } - - public int getSearchType() { - return searchType; - } - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - public int getRadiusLevel() { - return radiusLevel; - } - - public int getTotalLimit() { - return totalLimit; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeString(searchQuery); - out.writeInt(searchType); - out.writeDouble(latitude); - out.writeDouble(longitude); - out.writeInt(radiusLevel); - out.writeInt(totalLimit); - } - - private void readFromParcel(Parcel in) { - searchQuery = in.readString(); - searchType = in.readInt(); - latitude = in.readDouble(); - longitude = in.readDouble(); - radiusLevel = in.readInt(); - totalLimit = in.readInt(); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/search/SearchResult.aidl b/OsmAnd/src/net/osmand/aidl/search/SearchResult.aidl deleted file mode 100644 index caecc7721b..0000000000 --- a/OsmAnd/src/net/osmand/aidl/search/SearchResult.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.search; - -parcelable SearchResult; \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/aidl/search/SearchResult.java b/OsmAnd/src/net/osmand/aidl/search/SearchResult.java deleted file mode 100644 index ef28063355..0000000000 --- a/OsmAnd/src/net/osmand/aidl/search/SearchResult.java +++ /dev/null @@ -1,96 +0,0 @@ -package net.osmand.aidl.search; - -import android.os.Parcel; -import android.os.Parcelable; - -import java.util.ArrayList; -import java.util.List; - -public class SearchResult implements Parcelable { - - private double latitude; - private double longitude; - - private String localName; - private String localTypeName; - - private String alternateName; - private List otherNames = new ArrayList<>(); - - - public SearchResult(double latitude, double longitude, String localName, String localTypeName, - String alternateName, List otherNames) { - this.latitude = latitude; - this.longitude = longitude; - this.localName = localName; - this.localTypeName = localTypeName; - this.alternateName = alternateName; - if (otherNames != null) { - this.otherNames = otherNames; - } - } - - public SearchResult(Parcel in) { - readFromParcel(in); - } - - public static final Creator CREATOR = new Creator() { - @Override - public SearchResult createFromParcel(Parcel in) { - return new SearchResult(in); - } - - @Override - public SearchResult[] newArray(int size) { - return new SearchResult[size]; - } - }; - - public double getLatitude() { - return latitude; - } - - public double getLongitude() { - return longitude; - } - - public String getLocalName() { - return localName; - } - - public String getLocalTypeName() { - return localTypeName; - } - - public String getAlternateName() { - return alternateName; - } - - public List getOtherNames() { - return otherNames; - } - - @Override - public void writeToParcel(Parcel out, int flags) { - out.writeDouble(latitude); - out.writeDouble(longitude); - out.writeString(localName); - out.writeString(localTypeName); - out.writeString(alternateName); - out.writeStringList(otherNames); - } - - private void readFromParcel(Parcel in) { - latitude = in.readDouble(); - longitude = in.readDouble(); - localName = in.readString(); - localTypeName = in.readString(); - alternateName = in.readString(); - in.readStringList(otherNames); - } - - @Override - public int describeContents() { - return 0; - } -} diff --git a/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl b/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl deleted file mode 100644 index 319cfd5035..0000000000 --- a/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl +++ /dev/null @@ -1,3 +0,0 @@ -package net.osmand.aidl.tiles; - -parcelable ASqliteDbFile; \ No newline at end of file diff --git a/osmand-api/.gitignore b/osmand-api/.gitignore new file mode 100644 index 0000000000..5497b8f2a1 --- /dev/null +++ b/osmand-api/.gitignore @@ -0,0 +1,10 @@ +# Android Studio +*/.idea +*/*.iml + +# Gradle +*/.gradle +*/local.properties + +# Output files +*/build \ No newline at end of file diff --git a/osmand-api/AndroidManifest.xml b/osmand-api/AndroidManifest.xml new file mode 100644 index 0000000000..62f8e3fa83 --- /dev/null +++ b/osmand-api/AndroidManifest.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/osmand-api/build.gradle b/osmand-api/build.gradle new file mode 100644 index 0000000000..885f7763f6 --- /dev/null +++ b/osmand-api/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + buildToolsVersion "27.0.3" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 26 + versionCode 2 + versionName "2.0" + } + + sourceSets { + main { + manifest.srcFile "AndroidManifest.xml" + aidl.srcDirs = ["src"] + java.srcDirs = ["src"] + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:support-annotations:27.1.1' +} \ No newline at end of file diff --git a/osmand-api/res/values/strings.xml b/osmand-api/res/values/strings.xml new file mode 100644 index 0000000000..e4dbe2e964 --- /dev/null +++ b/osmand-api/res/values/strings.xml @@ -0,0 +1,3 @@ + + OsmAnd-api + diff --git a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl b/osmand-api/src/net/osmand/aidl/IOsmAndAidlCallback.aidl similarity index 100% rename from OsmAnd/src/net/osmand/aidl/IOsmAndAidlCallback.aidl rename to osmand-api/src/net/osmand/aidl/IOsmAndAidlCallback.aidl diff --git a/OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl b/osmand-api/src/net/osmand/aidl/IOsmAndAidlInterface.aidl similarity index 100% rename from OsmAnd/src/net/osmand/aidl/IOsmAndAidlInterface.aidl rename to osmand-api/src/net/osmand/aidl/IOsmAndAidlInterface.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl b/osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl rename to osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java b/osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java rename to osmand-api/src/net/osmand/aidl/calculateroute/CalculateRouteParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl b/osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl rename to osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.aidl diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.java b/osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/contextmenu/AContextMenuButton.java rename to osmand-api/src/net/osmand/aidl/contextmenu/AContextMenuButton.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl rename to osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidl/contextmenu/ContextMenuButtonsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl rename to osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidl/contextmenu/RemoveContextMenuButtonsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl b/osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl rename to osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.aidl diff --git a/OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java b/osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java rename to osmand-api/src/net/osmand/aidl/contextmenu/UpdateContextMenuButtonsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/copyfile/CopyFileParams.aidl b/osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/copyfile/CopyFileParams.aidl rename to osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/copyfile/CopyFileParams.java b/osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/copyfile/CopyFileParams.java rename to osmand-api/src/net/osmand/aidl/copyfile/CopyFileParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl b/osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl rename to osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/CustomizationInfoParams.java b/osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/CustomizationInfoParams.java rename to osmand-api/src/net/osmand/aidl/customization/CustomizationInfoParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl b/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl rename to osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java b/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java rename to osmand-api/src/net/osmand/aidl/customization/OsmandSettingsInfoParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl b/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl rename to osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java b/osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/OsmandSettingsParams.java rename to osmand-api/src/net/osmand/aidl/customization/OsmandSettingsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.aidl b/osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.aidl rename to osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java b/osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/customization/SetWidgetsParams.java rename to osmand-api/src/net/osmand/aidl/customization/SetWidgetsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/AFavorite.aidl b/osmand-api/src/net/osmand/aidl/favorite/AFavorite.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/AFavorite.aidl rename to osmand-api/src/net/osmand/aidl/favorite/AFavorite.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/AFavorite.java b/osmand-api/src/net/osmand/aidl/favorite/AFavorite.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/AFavorite.java rename to osmand-api/src/net/osmand/aidl/favorite/AFavorite.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/AddFavoriteParams.java b/osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/AddFavoriteParams.java rename to osmand-api/src/net/osmand/aidl/favorite/AddFavoriteParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java b/osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java rename to osmand-api/src/net/osmand/aidl/favorite/RemoveFavoriteParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java b/osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java rename to osmand-api/src/net/osmand/aidl/favorite/UpdateFavoriteParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl b/osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl rename to osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java b/osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java rename to osmand-api/src/net/osmand/aidl/favorite/group/AFavoriteGroup.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidl/favorite/group/AddFavoriteGroupParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidl/favorite/group/RemoveFavoriteGroupParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl b/osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl rename to osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java b/osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java rename to osmand-api/src/net/osmand/aidl/favorite/group/UpdateFavoriteGroupParams.java diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl b/osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.aidl similarity index 100% rename from OsmAnd/src/net/osmand/aidl/gpx/AGpxBitmap.aidl rename to osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java b/osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxBitmap.java rename to osmand-api/src/net/osmand/aidl/gpx/AGpxBitmap.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.aidl b/osmand-api/src/net/osmand/aidl/gpx/AGpxFile.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.aidl rename to osmand-api/src/net/osmand/aidl/gpx/AGpxFile.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java b/osmand-api/src/net/osmand/aidl/gpx/AGpxFile.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFile.java rename to osmand-api/src/net/osmand/aidl/gpx/AGpxFile.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl b/osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl rename to osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.aidl diff --git a/OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java b/osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/gpx/AGpxFileDetails.java rename to osmand-api/src/net/osmand/aidl/gpx/AGpxFileDetails.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl b/osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl rename to osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.aidl diff --git a/OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java b/osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/gpx/ASelectedGpxFile.java rename to osmand-api/src/net/osmand/aidl/gpx/ASelectedGpxFile.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java b/osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java rename to osmand-api/src/net/osmand/aidl/gpx/CreateGpxBitmapParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/GpxColorParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/GpxColorParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/GpxColorParams.java b/osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/GpxColorParams.java rename to osmand-api/src/net/osmand/aidl/gpx/GpxColorParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/HideGpxParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/HideGpxParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/HideGpxParams.java b/osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/HideGpxParams.java rename to osmand-api/src/net/osmand/aidl/gpx/HideGpxParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ImportGpxParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/ImportGpxParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ImportGpxParams.java b/osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/ImportGpxParams.java rename to osmand-api/src/net/osmand/aidl/gpx/ImportGpxParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/RemoveGpxParams.java b/osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/RemoveGpxParams.java rename to osmand-api/src/net/osmand/aidl/gpx/RemoveGpxParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ShowGpxParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/ShowGpxParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/ShowGpxParams.java b/osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/ShowGpxParams.java rename to osmand-api/src/net/osmand/aidl/gpx/ShowGpxParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java b/osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java rename to osmand-api/src/net/osmand/aidl/gpx/StartGpxRecordingParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl b/osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl rename to osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java b/osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java rename to osmand-api/src/net/osmand/aidl/gpx/StopGpxRecordingParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/map/ALatLon.aidl b/osmand-api/src/net/osmand/aidl/map/ALatLon.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/map/ALatLon.aidl rename to osmand-api/src/net/osmand/aidl/map/ALatLon.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/map/ALatLon.java b/osmand-api/src/net/osmand/aidl/map/ALatLon.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/map/ALatLon.java rename to osmand-api/src/net/osmand/aidl/map/ALatLon.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/map/SetMapLocationParams.aidl b/osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/map/SetMapLocationParams.aidl rename to osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/map/SetMapLocationParams.java b/osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/map/SetMapLocationParams.java rename to osmand-api/src/net/osmand/aidl/map/SetMapLocationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/AMapLayer.aidl b/osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/AMapLayer.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/AMapLayer.java b/osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/AMapLayer.java rename to osmand-api/src/net/osmand/aidl/maplayer/AMapLayer.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/AddMapLayerParams.java b/osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/AddMapLayerParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/AddMapLayerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java b/osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/RemoveMapLayerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java b/osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/UpdateMapLayerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl b/osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AMapPoint.java b/osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AMapPoint.java rename to osmand-api/src/net/osmand/aidl/maplayer/point/AMapPoint.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java b/osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/point/AddMapPointParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java b/osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/point/RemoveMapPointParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java b/osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/point/ShowMapPointParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl b/osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl rename to osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java b/osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java rename to osmand-api/src/net/osmand/aidl/maplayer/point/UpdateMapPointParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AMapMarker.aidl b/osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AMapMarker.aidl rename to osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AMapMarker.java b/osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AMapMarker.java rename to osmand-api/src/net/osmand/aidl/mapmarker/AMapMarker.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl rename to osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java b/osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java rename to osmand-api/src/net/osmand/aidl/mapmarker/AddMapMarkerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl rename to osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.aidl diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java b/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java rename to osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl b/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl rename to osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java b/osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java rename to osmand-api/src/net/osmand/aidl/mapmarker/RemoveMapMarkersParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl b/osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl rename to osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.aidl diff --git a/OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java b/osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java rename to osmand-api/src/net/osmand/aidl/mapmarker/UpdateMapMarkerParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AMapWidget.aidl b/osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AMapWidget.aidl rename to osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AMapWidget.java b/osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AMapWidget.java rename to osmand-api/src/net/osmand/aidl/mapwidget/AMapWidget.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl rename to osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java b/osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java rename to osmand-api/src/net/osmand/aidl/mapwidget/AddMapWidgetParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl rename to osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java b/osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java rename to osmand-api/src/net/osmand/aidl/mapwidget/RemoveMapWidgetParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl b/osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl rename to osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java b/osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java rename to osmand-api/src/net/osmand/aidl/mapwidget/UpdateMapWidgetParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerFooterParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerHeaderParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerItem.java b/osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/NavDrawerItem.java rename to osmand-api/src/net/osmand/aidl/navdrawer/NavDrawerItem.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl b/osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl rename to osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java b/osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java rename to osmand-api/src/net/osmand/aidl/navdrawer/SetNavDrawerItemsParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ADirectionInfo.aidl b/osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ADirectionInfo.aidl rename to osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ADirectionInfo.java b/osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ADirectionInfo.java rename to osmand-api/src/net/osmand/aidl/navigation/ADirectionInfo.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java b/osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java rename to osmand-api/src/net/osmand/aidl/navigation/ANavigationUpdateParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.aidl diff --git a/OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java b/osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java rename to osmand-api/src/net/osmand/aidl/navigation/ANavigationVoiceRouterMessageParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/MuteNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/MuteNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/MuteNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateGpxParams.java b/osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateGpxParams.java rename to osmand-api/src/net/osmand/aidl/navigation/NavigateGpxParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/NavigateParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/NavigateParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateParams.java b/osmand-api/src/net/osmand/aidl/navigation/NavigateParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateParams.java rename to osmand-api/src/net/osmand/aidl/navigation/NavigateParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateSearchParams.java b/osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/NavigateSearchParams.java rename to osmand-api/src/net/osmand/aidl/navigation/NavigateSearchParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/OnVoiceNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/PauseNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/PauseNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/PauseNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/ResumeNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/ResumeNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/ResumeNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/StopNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/StopNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/StopNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/StopNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/StopNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl b/osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl rename to osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java b/osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java rename to osmand-api/src/net/osmand/aidl/navigation/UnmuteNavigationParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl b/osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl rename to osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StartAudioRecordingParams.java b/osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StartAudioRecordingParams.java rename to osmand-api/src/net/osmand/aidl/note/StartAudioRecordingParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl b/osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl rename to osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StartVideoRecordingParams.java b/osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StartVideoRecordingParams.java rename to osmand-api/src/net/osmand/aidl/note/StartVideoRecordingParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StopRecordingParams.aidl b/osmand-api/src/net/osmand/aidl/note/StopRecordingParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StopRecordingParams.aidl rename to osmand-api/src/net/osmand/aidl/note/StopRecordingParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/StopRecordingParams.java b/osmand-api/src/net/osmand/aidl/note/StopRecordingParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/StopRecordingParams.java rename to osmand-api/src/net/osmand/aidl/note/StopRecordingParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl b/osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl rename to osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/note/TakePhotoNoteParams.java b/osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/note/TakePhotoNoteParams.java rename to osmand-api/src/net/osmand/aidl/note/TakePhotoNoteParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.aidl b/osmand-api/src/net/osmand/aidl/plugins/PluginParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.aidl rename to osmand-api/src/net/osmand/aidl/plugins/PluginParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.java b/osmand-api/src/net/osmand/aidl/plugins/PluginParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/plugins/PluginParams.java rename to osmand-api/src/net/osmand/aidl/plugins/PluginParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/search/SearchParams.aidl b/osmand-api/src/net/osmand/aidl/search/SearchParams.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/search/SearchParams.aidl rename to osmand-api/src/net/osmand/aidl/search/SearchParams.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/search/SearchParams.java b/osmand-api/src/net/osmand/aidl/search/SearchParams.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/search/SearchParams.java rename to osmand-api/src/net/osmand/aidl/search/SearchParams.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/search/SearchResult.aidl b/osmand-api/src/net/osmand/aidl/search/SearchResult.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/search/SearchResult.aidl rename to osmand-api/src/net/osmand/aidl/search/SearchResult.aidl diff --git a/OsmAnd-telegram/src/net/osmand/aidl/search/SearchResult.java b/osmand-api/src/net/osmand/aidl/search/SearchResult.java similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/search/SearchResult.java rename to osmand-api/src/net/osmand/aidl/search/SearchResult.java diff --git a/OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl b/osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl similarity index 100% rename from OsmAnd-telegram/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl rename to osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.aidl diff --git a/OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java b/osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.java similarity index 100% rename from OsmAnd/src/net/osmand/aidl/tiles/ASqliteDbFile.java rename to osmand-api/src/net/osmand/aidl/tiles/ASqliteDbFile.java diff --git a/settings.gradle b/settings.gradle index 2b32c3618c..5ef3ed9f19 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -include ':OsmAnd-java', ':OsmAndCore-sample', ':OsmAnd-telegram' +include ':OsmAnd-java', ':OsmAndCore-sample', ':OsmAnd-telegram', ':osmand-api' include ':OsmAnd' include ':plugins:Osmand-Nautical' include ':plugins:Osmand-ParkingPlugin'