From f2dd32483744526af64ab7d9e1d65ad5b08f0c4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Fri, 27 Sep 2019 20:27:03 +0300 Subject: [android] Migrated code to Android X --- android/AndroidManifest.xml | 2 +- android/build.gradle | 5 ++-- android/gradle.properties | 2 ++ .../fragment_ads_removal_purchase_dialog.xml | 4 +-- .../res/layout-land/fragment_bookmark_payment.xml | 4 +-- android/res/layout-land/news_page.xml | 2 +- android/res/layout-w1020dp/activity_settings.xml | 4 +-- android/res/layout/about.xml | 4 +-- .../res/layout/activity_full_screen_gallery.xml | 2 +- android/res/layout/activity_map.xml | 10 ++++---- .../res/layout/bookmark_subscription_fragment.xml | 4 +-- android/res/layout/catalog_promo_container.xml | 6 ++--- android/res/layout/catalog_promo_item_card.xml | 4 +-- .../res/layout/catalog_promo_placeholder_card.xml | 4 +-- android/res/layout/dialog_edit_text.xml | 4 +-- .../fragment_ads_removal_purchase_dialog.xml | 4 +-- android/res/layout/fragment_auth_editor.xml | 8 +++--- .../res/layout/fragment_bookmark_categories.xml | 4 +-- .../layout/fragment_bookmark_categories_pager.xml | 4 +-- .../fragment_bookmark_category_restriction.xml | 4 +-- android/res/layout/fragment_bookmark_list.xml | 8 +++--- android/res/layout/fragment_bookmark_payment.xml | 4 +-- android/res/layout/fragment_bookmarks_catalog.xml | 4 +-- .../fragment_catalog_bookmark_categories.xml | 8 +++--- android/res/layout/fragment_detail_permissions.xml | 2 +- android/res/layout/fragment_discovery.xml | 16 ++++++------ android/res/layout/fragment_downloader.xml | 2 +- android/res/layout/fragment_driving_options.xml | 4 +-- android/res/layout/fragment_edit_bookmark.xml | 6 ++--- android/res/layout/fragment_edit_description.xml | 6 ++--- android/res/layout/fragment_editor.xml | 30 +++++++++++----------- android/res/layout/fragment_editor_host.xml | 6 ++--- android/res/layout/fragment_gallery.xml | 2 +- android/res/layout/fragment_news.xml | 4 +-- android/res/layout/fragment_osm_login.xml | 4 +-- .../layout/fragment_promo_after_booking_dialog.xml | 4 +-- android/res/layout/fragment_report.xml | 6 ++--- android/res/layout/fragment_review.xml | 2 +- android/res/layout/fragment_search.xml | 16 ++++++------ android/res/layout/fragment_search_filter.xml | 22 ++++++++-------- android/res/layout/fragment_timetable_advanced.xml | 10 ++++---- android/res/layout/fragment_timetable_picker.xml | 4 +-- android/res/layout/fragment_timetable_simple.xml | 4 +-- android/res/layout/fragment_toggle_map_layer.xml | 8 +++--- android/res/layout/fragment_ugc_editor.xml | 10 ++++---- android/res/layout/fragment_ugc_route_edit.xml | 6 ++--- android/res/layout/fragment_ugc_routes.xml | 2 +- .../res/layout/fragment_ugc_routes_properties.xml | 4 +-- .../layout/fragment_ugc_routes_sharing_options.xml | 10 ++++---- android/res/layout/item_category_description.xml | 4 +-- android/res/layout/item_discovery_expert.xml | 4 +-- android/res/layout/item_discovery_expert_error.xml | 4 +-- .../res/layout/item_discovery_expert_loading.xml | 4 +-- .../res/layout/item_discovery_hotel_product.xml | 4 +-- android/res/layout/item_discovery_search.xml | 4 +-- android/res/layout/item_discovery_simple_error.xml | 4 +-- .../res/layout/item_discovery_simple_loading.xml | 4 +-- android/res/layout/item_editor_input.xml | 6 ++--- android/res/layout/item_localized_name.xml | 4 +-- android/res/layout/item_timetable.xml | 6 ++--- android/res/layout/item_viator_loading.xml | 4 +-- android/res/layout/item_viator_product.xml | 4 +-- android/res/layout/news_page.xml | 2 +- android/res/layout/non_elevated_toolbar.xml | 4 +-- android/res/layout/place_page_details.xml | 2 +- android/res/layout/place_page_fat_shadow.xml | 2 +- android/res/layout/place_page_hotel_facilities.xml | 2 +- android/res/layout/place_page_hotel_gallery.xml | 2 +- android/res/layout/place_page_hotel_rating.xml | 2 +- android/res/layout/place_page_rating_records.xml | 2 +- android/res/layout/place_page_ugc.xml | 2 +- android/res/layout/position_chooser.xml | 6 ++--- android/res/layout/recycler_default.xml | 2 +- .../res/layout/routing_bottom_panel_transit.xml | 2 +- android/res/layout/routing_plan.xml | 4 +-- android/res/layout/subscription_offer_card.xml | 8 +++--- android/res/layout/tags_recycler.xml | 2 +- android/res/layout/taxi_panel.xml | 2 +- android/res/layout/toolbar_default.xml | 4 +-- android/res/layout/toolbar_extended.xml | 2 +- android/res/layout/toolbar_transparent.xml | 2 +- .../res/layout/toolbar_with_optional_search.xml | 4 +-- android/res/layout/toolbar_with_search.xml | 4 +-- .../layout/toolbar_with_search_no_elevation.xml | 4 +-- android/res/xml/prefs_main.xml | 28 ++++++++++---------- android/src/com/mapswithme/HotelUtils.java | 2 +- .../mapswithme/maps/AppBaseTransitionListener.java | 2 +- .../maps/DownloadResourcesLegacyActivity.java | 8 +++--- android/src/com/mapswithme/maps/Framework.java | 12 ++++----- .../src/com/mapswithme/maps/LightFramework.java | 4 +-- android/src/com/mapswithme/maps/MapFragment.java | 6 ++--- android/src/com/mapswithme/maps/MwmActivity.java | 20 +++++++-------- .../src/com/mapswithme/maps/MwmApplication.java | 4 +-- .../maps/NavigationButtonsAnimationController.java | 4 +-- android/src/com/mapswithme/maps/PanelAnimator.java | 6 ++--- .../src/com/mapswithme/maps/PrivateVariables.java | 2 +- .../maps/PurchaseOperationObservable.java | 2 +- .../src/com/mapswithme/maps/SplashActivity.java | 12 ++++----- .../com/mapswithme/maps/WebContainerDelegate.java | 2 +- .../maps/adapter/AdapterPositionConverter.java | 2 +- .../maps/adapter/OnItemClickListener.java | 2 +- .../maps/adapter/RecyclerCompositeAdapter.java | 4 +-- .../adapter/RepeatablePairPositionConverter.java | 4 +-- .../maps/adapter/TagGroupNameAdapter.java | 4 +-- .../com/mapswithme/maps/adapter/TagsAdapter.java | 6 ++--- .../maps/adapter/TagsCompositeAdapter.java | 4 +-- .../src/com/mapswithme/maps/ads/AdDataAdapter.java | 4 +-- .../src/com/mapswithme/maps/ads/AdRegistrator.java | 2 +- android/src/com/mapswithme/maps/ads/AdTracker.java | 2 +- android/src/com/mapswithme/maps/ads/Banner.java | 2 +- android/src/com/mapswithme/maps/ads/BannerKey.java | 2 +- .../com/mapswithme/maps/ads/BaseMwmNativeAd.java | 2 +- .../mapswithme/maps/ads/BaseNativeAdLoader.java | 4 +-- .../com/mapswithme/maps/ads/CachedMwmNativeAd.java | 2 +- .../mapswithme/maps/ads/CachingNativeAdLoader.java | 6 ++--- .../maps/ads/CompoundNativeAdLoader.java | 6 ++--- .../com/mapswithme/maps/ads/DefaultAdTracker.java | 3 +-- .../com/mapswithme/maps/ads/FacebookAdError.java | 4 +-- .../com/mapswithme/maps/ads/FacebookAdsLoader.java | 4 +-- .../maps/ads/FacebookInvitesDialogFragment.java | 4 +-- .../com/mapswithme/maps/ads/FacebookNativeAd.java | 4 +-- android/src/com/mapswithme/maps/ads/Factory.java | 4 +-- .../src/com/mapswithme/maps/ads/LikesManager.java | 8 +++--- .../src/com/mapswithme/maps/ads/LocalAdInfo.java | 4 +-- .../src/com/mapswithme/maps/ads/MopubAdError.java | 2 +- .../src/com/mapswithme/maps/ads/MopubNativeAd.java | 4 +-- .../mapswithme/maps/ads/MopubNativeDownloader.java | 4 +-- .../src/com/mapswithme/maps/ads/MwmNativeAd.java | 4 +-- .../com/mapswithme/maps/ads/MyTargetAdError.java | 2 +- .../com/mapswithme/maps/ads/MyTargetAdsLoader.java | 4 +-- .../com/mapswithme/maps/ads/MyTargetNativeAd.java | 4 +-- .../src/com/mapswithme/maps/ads/NativeAdError.java | 2 +- .../com/mapswithme/maps/ads/NativeAdListener.java | 4 +-- .../com/mapswithme/maps/ads/NativeAdLoader.java | 4 +-- .../maps/ads/OnAdCacheModifiedListener.java | 2 +- .../maps/ads/RateStoreDialogFragment.java | 4 +-- .../mapswithme/maps/analytics/AppsFlyerUtils.java | 4 +-- .../analytics/ContextDependentEventLogger.java | 2 +- .../maps/analytics/DefaultEventLogger.java | 6 ++--- .../com/mapswithme/maps/analytics/EventLogger.java | 4 +-- .../maps/analytics/EventLoggerAggregator.java | 4 +-- .../maps/analytics/ExternalLibrariesMediator.java | 6 ++--- .../maps/analytics/FlurryEventLogger.java | 2 +- .../maps/analytics/MyTrackerEventLogger.java | 4 +-- .../maps/analytics/PushWooshEventLogger.java | 7 ++--- .../mapswithme/maps/api/ParsedSearchRequest.java | 4 +-- .../mapswithme/maps/api/ParsedUrlMwmRequest.java | 2 +- .../src/com/mapswithme/maps/auth/Authorizer.java | 8 +++--- .../maps/auth/BaseWebViewMwmFragment.java | 2 +- .../mapswithme/maps/auth/FacebookTokenHandler.java | 4 +-- .../mapswithme/maps/auth/GoogleTokenHandler.java | 4 +-- .../maps/auth/PassportAuthDialogFragment.java | 6 ++--- .../mapswithme/maps/auth/PhoneAuthActivity.java | 6 ++--- .../mapswithme/maps/auth/PhoneAuthFragment.java | 4 +-- .../mapswithme/maps/auth/PhoneTokenHandler.java | 4 +-- .../maps/auth/SocialAuthDialogFragment.java | 8 +++--- .../maps/auth/TargetFragmentCallback.java | 2 +- .../src/com/mapswithme/maps/auth/TokenHandler.java | 4 +-- .../background/AbstractLogBroadcastReceiver.java | 4 +-- .../maps/background/AppBackgroundTracker.java | 2 +- .../background/ConnectivityChangedReceiver.java | 2 +- .../maps/background/NotificationCandidate.java | 4 +-- .../background/NotificationChannelFactory.java | 2 +- .../background/NotificationChannelProvider.java | 2 +- .../maps/background/NotificationService.java | 4 +-- .../com/mapswithme/maps/background/Notifier.java | 8 +++--- .../OreoCompatNotificationChannelProvider.java | 2 +- .../StubNotificationChannelProvider.java | 2 +- .../mapswithme/maps/background/WorkerService.java | 4 +-- .../src/com/mapswithme/maps/base/BaseActivity.java | 4 +-- .../mapswithme/maps/base/BaseActivityDelegate.java | 4 +-- .../maps/base/BaseAsyncOperationFragment.java | 6 ++--- .../com/mapswithme/maps/base/BaseAuthFragment.java | 6 ++--- .../maps/base/BaseMwmDialogFragment.java | 8 +++--- .../maps/base/BaseMwmExtraTitleActivity.java | 4 +-- .../com/mapswithme/maps/base/BaseMwmFragment.java | 4 +-- .../maps/base/BaseMwmFragmentActivity.java | 18 ++++++------- .../mapswithme/maps/base/BaseMwmListFragment.java | 4 +-- .../maps/base/BaseMwmRecyclerFragment.java | 16 ++++++------ .../maps/base/BaseMwmToolbarFragment.java | 4 +-- .../mapswithme/maps/base/BaseToolbarActivity.java | 12 ++++----- .../maps/base/BaseToolbarAuthFragment.java | 7 +++-- .../src/com/mapswithme/maps/base/Detachable.java | 2 +- .../maps/base/FinishActivityToolbarController.java | 2 +- .../mapswithme/maps/base/MediaPlayerWrapper.java | 7 +++-- android/src/com/mapswithme/maps/base/Savable.java | 2 +- .../bookmarks/BaseBookmarkCategoriesFragment.java | 14 +++++----- .../bookmarks/BaseBookmarkCategoryAdapter.java | 4 +-- .../maps/bookmarks/BookmarkBackupController.java | 6 ++--- .../maps/bookmarks/BookmarkCategoriesActivity.java | 10 ++++---- .../maps/bookmarks/BookmarkCategoriesAdapter.java | 6 ++--- .../maps/bookmarks/BookmarkCategoriesFragment.java | 6 ++--- .../BookmarkCategoriesPageResProvider.java | 6 ++--- .../bookmarks/BookmarkCategoriesPagerFragment.java | 10 ++++---- .../maps/bookmarks/BookmarkDownloadCallback.java | 2 +- .../maps/bookmarks/BookmarkDownloadController.java | 2 +- .../maps/bookmarks/BookmarkDownloadReceiver.java | 6 ++--- .../maps/bookmarks/BookmarkListActivity.java | 8 +++--- .../maps/bookmarks/BookmarkListAdapter.java | 6 ++--- .../maps/bookmarks/BookmarkPaymentDataParser.java | 5 ++-- .../maps/bookmarks/BookmarksCatalogActivity.java | 6 ++--- .../maps/bookmarks/BookmarksCatalogFragment.java | 4 +-- .../BookmarksDownloadFragmentDelegate.java | 10 ++++---- .../maps/bookmarks/BookmarksDownloadManager.java | 4 +-- .../maps/bookmarks/BookmarksListFragment.java | 16 ++++++------ .../maps/bookmarks/BookmarksPageFactory.java | 4 +-- .../maps/bookmarks/BookmarksPagerAdapter.java | 8 +++--- .../maps/bookmarks/BookmarksToolbarController.java | 2 +- .../CachedBookmarkCategoriesFragment.java | 4 +-- .../maps/bookmarks/CatalogListenerDecorator.java | 8 +++--- .../maps/bookmarks/CategoryListCallback.java | 2 +- .../maps/bookmarks/CategoryValidator.java | 4 +-- .../bookmarks/ChooseBookmarkCategoryAdapter.java | 4 +-- .../bookmarks/ChooseBookmarkCategoryFragment.java | 8 +++--- .../ChooseBookmarksSortingTypeFragment.java | 10 ++++---- .../DefaultBookmarkDownloadController.java | 4 +-- .../src/com/mapswithme/maps/bookmarks/Holders.java | 8 +++--- .../InvalidSubscriptionAlertDialogCallback.java | 4 +-- .../maps/bookmarks/KmlImportController.java | 4 +-- .../maps/bookmarks/OnItemLongClickListener.java | 2 +- .../mapswithme/maps/bookmarks/OperationStatus.java | 2 +- .../maps/bookmarks/PaymentDataParser.java | 2 +- .../ShowOnMapCatalogCategoryFragment.java | 6 ++--- .../bookmarks/SystemDownloadCompletedReceiver.java | 4 +-- .../bookmarks/SystemDownloadCompletedService.java | 8 +++--- .../bookmarks/data/AbstractCategoriesSnapshot.java | 2 +- .../mapswithme/maps/bookmarks/data/Bookmark.java | 6 ++--- .../maps/bookmarks/data/BookmarkCategory.java | 11 ++++---- .../maps/bookmarks/data/BookmarkInfo.java | 6 ++--- .../maps/bookmarks/data/BookmarkManager.java | 10 ++++---- .../maps/bookmarks/data/BookmarkSharingResult.java | 4 +-- .../maps/bookmarks/data/CatalogCustomProperty.java | 3 +-- .../data/CatalogCustomPropertyOption.java | 2 +- .../data/CatalogPropertyOptionAndKey.java | 2 +- .../mapswithme/maps/bookmarks/data/CatalogTag.java | 2 +- .../maps/bookmarks/data/CatalogTagsGroup.java | 2 +- .../maps/bookmarks/data/CategoryDataSource.java | 4 +-- .../com/mapswithme/maps/bookmarks/data/Error.java | 2 +- .../mapswithme/maps/bookmarks/data/FeatureId.java | 2 +- .../maps/bookmarks/data/FilterStrategy.java | 2 +- .../com/mapswithme/maps/bookmarks/data/Icon.java | 6 ++--- .../mapswithme/maps/bookmarks/data/MapObject.java | 6 ++--- .../mapswithme/maps/bookmarks/data/Metadata.java | 6 ++--- .../maps/bookmarks/data/PaymentData.java | 4 +-- .../com/mapswithme/maps/bookmarks/data/Result.java | 2 +- .../maps/bookmarks/data/SortedBlock.java | 2 +- .../maps/content/AbstractContextualListener.java | 3 +-- .../com/mapswithme/maps/content/DataSource.java | 2 +- .../com/mapswithme/maps/dialog/AlertDialog.java | 22 ++++++++-------- .../maps/dialog/ConfirmationDialogFactory.java | 2 +- .../maps/dialog/DefaultDialogFactory.java | 2 +- .../com/mapswithme/maps/dialog/DialogFactory.java | 2 +- .../com/mapswithme/maps/dialog/DialogUtils.java | 8 +++--- .../maps/dialog/EditTextDialogFragment.java | 10 ++++---- .../maps/dialog/ProgressDialogFragment.java | 8 +++--- .../maps/dialog/ResolveDialogViewStrategy.java | 2 +- .../dialog/ResolveFragmentManagerStrategy.java | 8 +++--- .../maps/discovery/DiscoveryActivity.java | 4 +-- .../maps/discovery/DiscoveryFragment.java | 14 +++++----- .../maps/discovery/DiscoveryManager.java | 6 ++--- .../mapswithme/maps/discovery/DiscoveryParams.java | 6 ++--- .../maps/discovery/DiscoveryResultReceiver.java | 4 +-- .../com/mapswithme/maps/discovery/ItemType.java | 4 +-- .../com/mapswithme/maps/discovery/LocalExpert.java | 2 +- .../src/com/mapswithme/maps/discovery/Locals.java | 6 ++--- .../com/mapswithme/maps/discovery/LocalsError.java | 4 +-- .../mapswithme/maps/downloader/BottomPanel.java | 2 +- .../mapswithme/maps/downloader/CountryItem.java | 2 +- .../maps/downloader/CountrySuggestFragment.java | 2 +- .../maps/downloader/DownloaderActivity.java | 2 +- .../maps/downloader/DownloaderAdapter.java | 16 ++++++------ .../maps/downloader/DownloaderFragment.java | 8 +++--- .../maps/downloader/DownloaderPromoBanner.java | 4 +-- .../downloader/DownloaderPromoBannerStats.java | 2 +- .../maps/downloader/DownloaderStatusIcon.java | 4 +-- .../ExpandRetryConfirmationListener.java | 4 +-- .../com/mapswithme/maps/downloader/MapManager.java | 10 ++++---- .../maps/downloader/OnmapDownloader.java | 4 +-- .../RetryFailedDownloadConfirmationListener.java | 2 +- .../maps/downloader/UpdaterDialogFragment.java | 14 +++++----- .../maps/editor/AdvancedTimetableFragment.java | 6 ++--- .../mapswithme/maps/editor/AuthDialogFragment.java | 2 +- .../com/mapswithme/maps/editor/AuthFragment.java | 4 +-- .../com/mapswithme/maps/editor/CuisineAdapter.java | 4 +-- .../mapswithme/maps/editor/CuisineFragment.java | 3 +-- android/src/com/mapswithme/maps/editor/Editor.java | 8 +++--- .../com/mapswithme/maps/editor/EditorActivity.java | 7 ++--- .../com/mapswithme/maps/editor/EditorFragment.java | 18 ++++++------- .../mapswithme/maps/editor/EditorHostFragment.java | 12 ++++----- .../maps/editor/FeatureCategoryActivity.java | 2 +- .../maps/editor/FeatureCategoryAdapter.java | 6 ++--- .../maps/editor/FeatureCategoryFragment.java | 6 ++--- .../maps/editor/HoursMinutesPickerFragment.java | 12 ++++----- .../mapswithme/maps/editor/LanguagesAdapter.java | 4 +-- .../mapswithme/maps/editor/LanguagesFragment.java | 3 +-- .../maps/editor/MultilanguageAdapter.java | 6 ++--- .../com/mapswithme/maps/editor/OpeningHours.java | 8 +++--- .../mapswithme/maps/editor/OsmAuthActivity.java | 2 +- .../mapswithme/maps/editor/OsmAuthFragment.java | 4 +-- .../maps/editor/OsmAuthFragmentDelegate.java | 10 ++++---- .../src/com/mapswithme/maps/editor/OsmOAuth.java | 8 +++--- .../mapswithme/maps/editor/ProfileActivity.java | 2 +- .../mapswithme/maps/editor/ProfileFragment.java | 10 ++++---- .../com/mapswithme/maps/editor/ReportActivity.java | 2 +- .../com/mapswithme/maps/editor/ReportFragment.java | 6 ++--- .../maps/editor/SimpleTimetableAdapter.java | 12 ++++----- .../maps/editor/SimpleTimetableFragment.java | 4 +-- .../com/mapswithme/maps/editor/StreetAdapter.java | 4 +-- .../com/mapswithme/maps/editor/StreetFragment.java | 8 +++--- .../maps/editor/TimetableChangedListener.java | 2 +- .../maps/editor/TimetableContainerFragment.java | 12 ++++----- .../mapswithme/maps/editor/TimetableProvider.java | 2 +- .../com/mapswithme/maps/editor/ViralFragment.java | 2 +- .../maps/editor/data/FeatureCategory.java | 2 +- .../mapswithme/maps/editor/data/HoursMinutes.java | 2 +- .../com/mapswithme/maps/editor/data/Language.java | 2 +- .../mapswithme/maps/editor/data/LocalizedName.java | 2 +- .../maps/editor/data/LocalizedStreet.java | 2 +- .../maps/editor/data/TimeFormatUtils.java | 4 +-- .../com/mapswithme/maps/editor/data/Timetable.java | 4 +-- .../mapswithme/maps/gallery/AdapterStrategy.java | 4 +-- .../src/com/mapswithme/maps/gallery/Constants.java | 2 +- .../maps/gallery/FullScreenGalleryActivity.java | 12 ++++----- .../maps/gallery/FullScreenGalleryFragment.java | 2 +- .../mapswithme/maps/gallery/GalleryActivity.java | 4 +-- .../mapswithme/maps/gallery/GalleryAdapter.java | 4 +-- .../mapswithme/maps/gallery/GalleryFragment.java | 8 +++--- .../maps/gallery/GalleryPageAdapter.java | 8 +++--- .../src/com/mapswithme/maps/gallery/Holders.java | 12 ++++----- android/src/com/mapswithme/maps/gallery/Image.java | 4 +-- .../com/mapswithme/maps/gallery/ImageAdapter.java | 6 ++--- .../maps/gallery/ItemSelectedListener.java | 2 +- android/src/com/mapswithme/maps/gallery/Items.java | 4 +-- .../maps/gallery/LoadingAdapterStrategy.java | 4 +-- .../maps/gallery/OfflineAdapterStrategy.java | 4 +-- .../maps/gallery/RegularAdapterStrategy.java | 4 +-- .../gallery/SimpleSingleItemAdapterStrategy.java | 4 +-- .../maps/gallery/SingleItemAdapterStrategy.java | 6 ++--- .../gallery/impl/BaseItemSelectedListener.java | 2 +- .../gallery/impl/CatalogPromoAdapterStrategy.java | 4 +-- .../impl/CatalogPromoErrorAdapterStrategy.java | 4 +-- .../impl/CatalogPromoLoadingAdapterStrategy.java | 4 +-- .../com/mapswithme/maps/gallery/impl/Factory.java | 4 +-- .../maps/gallery/impl/HotelAdapterStrategy.java | 4 +-- .../gallery/impl/LocalExpertsAdapterStrategy.java | 4 +-- .../impl/LocalExpertsErrorAdapterStrategy.java | 4 +-- .../impl/LocalExpertsLoadingAdapterStrategy.java | 4 +-- .../gallery/impl/LoggableItemSelectedListener.java | 2 +- .../gallery/impl/RegularCatalogPromoListener.java | 2 +- .../gallery/impl/SearchBasedAdapterStrategy.java | 4 +-- .../gallery/impl/SimpleErrorAdapterStrategy.java | 4 +-- .../gallery/impl/SimpleLoadingAdapterStrategy.java | 4 +-- .../mapswithme/maps/gdpr/MwmOptOutActivity.java | 2 +- .../com/mapswithme/maps/gdpr/OptOutFragment.java | 4 +-- .../src/com/mapswithme/maps/geofence/Factory.java | 2 +- .../mapswithme/maps/geofence/GeoFenceFeature.java | 2 +- .../mapswithme/maps/geofence/GeofenceLocation.java | 2 +- .../mapswithme/maps/geofence/GeofenceRegistry.java | 2 +- .../maps/geofence/GeofenceRegistryImpl.java | 2 +- .../geofence/GeofenceTransitionsIntentService.java | 4 +-- .../src/com/mapswithme/maps/intent/Factory.java | 8 +++--- .../mapswithme/maps/intent/IntentProcessor.java | 4 +-- .../src/com/mapswithme/maps/intent/MapTask.java | 2 +- .../maps/location/AndroidNativeProvider.java | 4 +-- .../maps/location/BaseLocationListener.java | 2 +- .../maps/location/BaseLocationProvider.java | 2 +- .../maps/location/DefaultLocationFixChecker.java | 2 +- .../maps/location/FusedLocationFixChecker.java | 2 +- .../maps/location/GoogleFusedLocationProvider.java | 2 +- .../maps/location/LocationFixChecker.java | 2 +- .../mapswithme/maps/location/LocationHelper.java | 7 +++-- .../mapswithme/maps/location/LocationState.java | 4 +-- .../mapswithme/maps/location/PlatformSocket.java | 4 +-- .../com/mapswithme/maps/location/SensorData.java | 2 +- .../com/mapswithme/maps/location/SensorHelper.java | 2 +- .../mapswithme/maps/location/TrackRecorder.java | 2 +- .../maps/location/TrackRecorderWakeService.java | 4 +-- .../maps/location/TransitionListener.java | 2 +- .../mapswithme/maps/maplayer/BottomSheetItem.java | 6 ++--- .../maps/maplayer/MapLayerCompositeController.java | 4 +-- android/src/com/mapswithme/maps/maplayer/Mode.java | 2 +- .../maps/maplayer/ToggleMapLayerDialog.java | 24 ++++++++--------- .../subway/OnTransitSchemeChangedListener.java | 4 +-- .../maps/maplayer/subway/SubwayManager.java | 2 +- .../maplayer/subway/SubwayMapLayerController.java | 2 +- .../maps/maplayer/subway/TransitSchemeState.java | 2 +- .../maps/maplayer/traffic/TrafficManager.java | 4 +-- .../maps/maplayer/traffic/TrafficState.java | 4 +-- .../maplayer/traffic/widget/TrafficButton.java | 2 +- .../traffic/widget/TrafficButtonController.java | 4 +-- .../mapswithme/maps/metrics/UserActionsLogger.java | 2 +- .../com/mapswithme/maps/news/BaseNewsFragment.java | 22 ++++++++-------- .../maps/news/IntroductionDialogFragment.java | 4 +-- .../maps/news/IntroductionScreenFactory.java | 6 ++--- .../src/com/mapswithme/maps/news/NewsFragment.java | 10 ++++---- .../news/OnIntroductionButtonClickListener.java | 2 +- .../src/com/mapswithme/maps/news/PromoButton.java | 2 +- .../maps/news/WelcomeDialogFragment.java | 10 ++++---- .../permissions/BasePermissionsDialogFragment.java | 20 +++++++-------- .../maps/permissions/PermissionsAdapter.java | 10 ++++---- .../PermissionsDetailDialogFragment.java | 20 +++++++-------- .../permissions/PermissionsDialogFragment.java | 20 +++++++-------- .../StoragePermissionsDialogFragment.java | 12 ++++----- .../maps/promo/CatalogPromoController.java | 8 +++--- android/src/com/mapswithme/maps/promo/Promo.java | 6 ++--- .../mapswithme/maps/promo/PromoAfterBooking.java | 2 +- .../maps/promo/PromoBookingDialogFragment.java | 4 +-- .../mapswithme/maps/promo/PromoCityGallery.java | 6 ++--- .../src/com/mapswithme/maps/promo/PromoEntity.java | 4 +-- .../AbstractBookmarkValidationCallback.java | 4 +-- .../AbstractProductDetailsLoadingCallback.java | 2 +- .../maps/purchase/AbstractPurchaseController.java | 4 +-- .../maps/purchase/AdsRemovalPaymentState.java | 6 ++--- .../AdsRemovalPurchaseControllerProvider.java | 2 +- .../maps/purchase/AdsRemovalPurchaseDialog.java | 12 ++++----- .../maps/purchase/BillingConnection.java | 2 +- .../mapswithme/maps/purchase/BillingManager.java | 2 +- .../maps/purchase/BookmarkPaymentActivity.java | 6 ++--- .../maps/purchase/BookmarkPaymentFragment.java | 4 +-- .../maps/purchase/BookmarkPaymentState.java | 2 +- .../maps/purchase/BookmarkPurchaseCallback.java | 4 +-- .../maps/purchase/BookmarkPurchaseController.java | 4 +-- .../purchase/BookmarkSubscriptionActivity.java | 6 ++--- .../purchase/BookmarkSubscriptionFragment.java | 10 ++++---- .../purchase/BookmarkSubscriptionPaymentState.java | 2 +- .../maps/purchase/ConsumePurchaseRequest.java | 4 +-- .../purchase/CoreStartTransactionObserver.java | 2 +- .../maps/purchase/CoreValidationObserver.java | 2 +- .../maps/purchase/DefaultPurchaseValidator.java | 4 +-- .../purchase/FailedBookmarkPurchaseController.java | 4 +-- .../maps/purchase/LaunchBillingFlowRequest.java | 2 +- .../maps/purchase/PlayStoreBillingCallback.java | 2 +- .../maps/purchase/PlayStoreBillingConnection.java | 4 +-- .../maps/purchase/PlayStoreBillingManager.java | 4 +-- .../maps/purchase/PlayStoreBillingRequest.java | 4 +-- .../mapswithme/maps/purchase/ProductDetails.java | 2 +- .../mapswithme/maps/purchase/PurchaseCallback.java | 2 +- .../maps/purchase/PurchaseController.java | 2 +- .../mapswithme/maps/purchase/PurchaseFactory.java | 4 +-- .../maps/purchase/PurchaseStateActivator.java | 2 +- .../mapswithme/maps/purchase/PurchaseUtils.java | 6 ++--- .../maps/purchase/PurchaseValidator.java | 4 +-- .../maps/purchase/QueryExistingPurchases.java | 4 +-- .../maps/purchase/QueryProductDetailsRequest.java | 4 +-- .../maps/purchase/StatefulPurchaseCallback.java | 4 +-- .../maps/purchase/SubsProductDetailsCallback.java | 4 +-- .../purchase/SubscriptionPurchaseController.java | 2 +- .../mapswithme/maps/purchase/SubscriptionType.java | 2 +- .../maps/purchase/ValidationCallback.java | 2 +- android/src/com/mapswithme/maps/review/Review.java | 4 +-- .../com/mapswithme/maps/review/ReviewActivity.java | 4 +-- .../com/mapswithme/maps/review/ReviewAdapter.java | 8 +++--- .../com/mapswithme/maps/review/ReviewFragment.java | 6 ++--- .../routing/BaseRoutingErrorDialogFragment.java | 4 +-- .../maps/routing/NavigationController.java | 4 +-- .../com/mapswithme/maps/routing/RouteMarkData.java | 2 +- .../mapswithme/maps/routing/RoutePointInfo.java | 3 +-- .../maps/routing/RoutingBottomMenuController.java | 16 ++++++------ .../mapswithme/maps/routing/RoutingController.java | 18 ++++++------- .../maps/routing/RoutingErrorDialogFragment.java | 6 ++--- .../com/mapswithme/maps/routing/RoutingInfo.java | 2 +- .../maps/routing/RoutingMapsDownloadFragment.java | 4 +-- .../mapswithme/maps/routing/RoutingOptions.java | 2 +- .../maps/routing/RoutingPlanController.java | 10 ++++---- .../maps/routing/RoutingPlanFragment.java | 4 +-- .../maps/routing/RoutingPlanInplaceController.java | 4 +-- .../com/mapswithme/maps/routing/SearchWheel.java | 14 +++++----- .../mapswithme/maps/routing/TransitRouteInfo.java | 2 +- .../maps/routing/TransitStepAdapter.java | 4 +-- .../mapswithme/maps/routing/TransitStepInfo.java | 6 ++--- .../mapswithme/maps/routing/TransitStepType.java | 2 +- .../mapswithme/maps/routing/TransitStepView.java | 14 +++++----- .../maps/scheduling/ConnectivityJobScheduler.java | 2 +- .../maps/scheduling/FirebaseJobService.java | 2 +- .../maps/scheduling/JobServiceDelegate.java | 2 +- .../maps/scheduling/NativeJobService.java | 2 +- .../com/mapswithme/maps/search/BookingFilter.java | 2 +- .../maps/search/BookingFilterParams.java | 4 +-- .../mapswithme/maps/search/CategoriesAdapter.java | 14 +++++----- .../maps/search/DisplayedCategories.java | 2 +- .../com/mapswithme/maps/search/FilterActivity.java | 6 ++--- .../com/mapswithme/maps/search/FilterFragment.java | 8 +++--- .../com/mapswithme/maps/search/FilterUtils.java | 6 ++--- .../search/FloatingSearchToolbarController.java | 2 +- .../com/mapswithme/maps/search/HiddenCommand.java | 2 +- .../com/mapswithme/maps/search/HotelsFilter.java | 4 +-- .../mapswithme/maps/search/HotelsFilterHolder.java | 2 +- .../mapswithme/maps/search/HotelsTypeAdapter.java | 10 ++++---- .../maps/search/MegafonPromoProcessor.java | 2 +- .../maps/search/NativeBookingFilterListener.java | 2 +- .../maps/search/NativeBookmarkSearchListener.java | 2 +- .../maps/search/NativeSearchListener.java | 2 +- .../src/com/mapswithme/maps/search/Popularity.java | 2 +- .../mapswithme/maps/search/PopularityProvider.java | 2 +- .../mapswithme/maps/search/PriceFilterView.java | 14 +++++----- .../com/mapswithme/maps/search/PromoCategory.java | 6 ++--- .../mapswithme/maps/search/RatingFilterView.java | 10 ++++---- .../com/mapswithme/maps/search/SearchActivity.java | 14 +++++----- .../com/mapswithme/maps/search/SearchAdapter.java | 12 ++++----- .../maps/search/SearchAnimationController.java | 4 +-- .../maps/search/SearchCategoriesFragment.java | 4 +-- .../com/mapswithme/maps/search/SearchEngine.java | 7 +++-- .../maps/search/SearchFilterController.java | 8 +++--- .../com/mapswithme/maps/search/SearchFragment.java | 22 ++++++++-------- .../maps/search/SearchHistoryAdapter.java | 2 +- .../maps/search/SearchHistoryFragment.java | 12 ++++----- .../com/mapswithme/maps/search/SearchRecents.java | 2 +- .../com/mapswithme/maps/search/SearchResult.java | 2 +- .../src/com/mapswithme/maps/search/TabAdapter.java | 12 ++++----- .../mapswithme/maps/settings/AboutFragment.java | 6 ++--- .../maps/settings/BaseSettingsFragment.java | 4 +-- .../maps/settings/BaseXmlSettingsFragment.java | 8 +++--- .../maps/settings/CopyrightFragment.java | 2 +- .../maps/settings/DrivingOptionsActivity.java | 4 +-- .../maps/settings/DrivingOptionsFragment.java | 4 +-- .../com/mapswithme/maps/settings/HelpFragment.java | 4 +-- .../mapswithme/maps/settings/SettingsActivity.java | 14 +++++----- .../maps/settings/SettingsPrefsFragment.java | 22 ++++++++-------- .../maps/settings/StoragePathFragment.java | 2 +- .../maps/settings/StoragePathManager.java | 6 ++--- .../src/com/mapswithme/maps/sound/TtsPlayer.java | 4 +-- .../maps/taxi/DefaultFormatPriceStrategy.java | 2 +- .../mapswithme/maps/taxi/FormatPriceStrategy.java | 2 +- .../taxi/LocaleDependentFormatPriceStrategy.java | 2 +- .../src/com/mapswithme/maps/taxi/TaxiAdapter.java | 4 +-- android/src/com/mapswithme/maps/taxi/TaxiInfo.java | 2 +- .../com/mapswithme/maps/taxi/TaxiInfoError.java | 2 +- .../src/com/mapswithme/maps/taxi/TaxiManager.java | 6 ++--- android/src/com/mapswithme/maps/taxi/TaxiType.java | 6 ++--- .../maps/tips/AbstractClickInterceptor.java | 2 +- .../com/mapswithme/maps/tips/ClickInterceptor.java | 2 +- .../maps/tips/ClickInterceptorFactory.java | 2 +- .../tips/ImmersiveModeCompatPromptBackground.java | 4 +-- android/src/com/mapswithme/maps/tips/Tutorial.java | 8 +++--- .../maps/tips/TutorialClickListener.java | 2 +- .../src/com/mapswithme/maps/ugc/EditParams.java | 4 +-- android/src/com/mapswithme/maps/ugc/Impress.java | 4 +-- android/src/com/mapswithme/maps/ugc/UGC.java | 6 ++--- .../src/com/mapswithme/maps/ugc/UGCController.java | 8 +++--- .../com/mapswithme/maps/ugc/UGCEditorActivity.java | 6 ++--- .../com/mapswithme/maps/ugc/UGCEditorFragment.java | 10 ++++---- .../com/mapswithme/maps/ugc/UGCRatingAdapter.java | 6 ++--- .../maps/ugc/UGCRatingRecordsAdapter.java | 6 ++--- .../com/mapswithme/maps/ugc/UGCReviewAdapter.java | 6 ++--- android/src/com/mapswithme/maps/ugc/UGCUpdate.java | 4 +-- .../BaseEditUserBookmarkCategoryFragment.java | 8 +++--- .../maps/ugc/routes/BaseUgcRouteActivity.java | 2 +- .../routes/EditCategoryDescriptionActivity.java | 2 +- .../routes/EditCategoryDescriptionFragment.java | 2 +- .../maps/ugc/routes/EditCategoryNameActivity.java | 2 +- .../maps/ugc/routes/EditCategoryNameFragment.java | 2 +- .../ugc/routes/SendLinkPlaceholderActivity.java | 2 +- .../ugc/routes/SendLinkPlaceholderFragment.java | 8 +++--- .../mapswithme/maps/ugc/routes/TagsResFactory.java | 2 +- .../ugc/routes/UgcRouteEditSettingsActivity.java | 4 +-- .../ugc/routes/UgcRouteEditSettingsFragment.java | 4 +-- .../ugc/routes/UgcRoutePropertiesActivity.java | 2 +- .../ugc/routes/UgcRoutePropertiesFragment.java | 4 +-- .../ugc/routes/UgcRouteSharingOptionsActivity.java | 4 +-- .../maps/ugc/routes/UgcRouteTagsActivity.java | 2 +- .../maps/ugc/routes/UgcRouteTagsFragment.java | 12 ++++----- .../maps/ugc/routes/UgcSharingOptionsFragment.java | 8 +++--- .../src/com/mapswithme/maps/widget/ArrowView.java | 2 +- .../mapswithme/maps/widget/BookmarkBackupView.java | 4 +-- .../maps/widget/CustomTextInputLayout.java | 6 ++--- .../src/com/mapswithme/maps/widget/DotPager.java | 10 ++++---- .../src/com/mapswithme/maps/widget/FadeView.java | 2 +- .../mapswithme/maps/widget/PlaceholderView.java | 8 +++--- .../src/com/mapswithme/maps/widget/RatingView.java | 8 +++--- .../maps/widget/RotateByAlphaDrawable.java | 4 +-- .../com/mapswithme/maps/widget/RotateDrawable.java | 6 ++--- .../maps/widget/RoutingToolbarButton.java | 6 ++--- .../maps/widget/SearchToolbarController.java | 2 +- .../maps/widget/StackedButtonDialogFragment.java | 10 ++++---- .../maps/widget/StackedButtonsDialog.java | 8 +++--- .../mapswithme/maps/widget/ToolbarController.java | 12 ++++----- .../mapswithme/maps/widget/WheelProgressView.java | 8 +++--- .../com/mapswithme/maps/widget/menu/BaseMenu.java | 8 +++--- .../com/mapswithme/maps/widget/menu/MainMenu.java | 2 +- .../mapswithme/maps/widget/menu/MenuToggle.java | 6 ++--- .../maps/widget/menu/MyPositionButton.java | 4 +-- .../com/mapswithme/maps/widget/menu/NavMenu.java | 4 +-- .../maps/widget/placepage/BannerController.java | 6 ++--- .../placepage/BookmarkColorDialogFragment.java | 4 +-- .../placepage/BottomSheetPlacePageController.java | 10 ++++---- .../maps/widget/placepage/DirectionFragment.java | 2 +- .../widget/placepage/EditBookmarkFragment.java | 10 ++++---- .../widget/placepage/EditDescriptionFragment.java | 6 ++--- .../placepage/ErrorCatalogPromoListener.java | 4 +-- .../maps/widget/placepage/FacilitiesAdapter.java | 5 ++-- .../maps/widget/placepage/GalleryAdapter.java | 6 ++--- .../maps/widget/placepage/HotelPriceInfo.java | 2 +- .../maps/widget/placepage/NativeAdWrapper.java | 6 ++--- .../maps/widget/placepage/NearbyAdapter.java | 4 +-- .../widget/placepage/PlaceDescriptionActivity.java | 4 +-- .../widget/placepage/PlaceDescriptionFragment.java | 4 +-- .../maps/widget/placepage/PlacePageButtons.java | 6 ++--- .../maps/widget/placepage/PlacePageController.java | 2 +- .../maps/widget/placepage/PlacePageView.java | 18 ++++++------- .../maps/widget/placepage/ReviewAdapter.java | 4 +-- .../maps/widget/placepage/RoutingModeListener.java | 2 +- .../maps/widget/placepage/Sponsored.java | 8 +++--- .../maps/widget/placepage/ToolbarBehavior.java | 4 +-- .../widget/recycler/DotDividerItemDecoration.java | 6 ++--- .../widget/recycler/GridDividerItemDecoration.java | 4 +-- .../recycler/HotelDividerItemDecoration.java | 4 +-- .../maps/widget/recycler/ItemDecoratorFactory.java | 10 ++++---- .../widget/recycler/MultilineLayoutManager.java | 6 ++--- .../widget/recycler/SingleChangeItemAnimator.java | 12 ++++----- .../recycler/SpanningLinearLayoutManager.java | 6 ++--- .../recycler/SponsoredDividerItemDecoration.java | 8 ++++-- .../maps/widget/recycler/TagItemDecoration.java | 4 +-- .../maps/widget/recycler/TagLayoutManager.java | 2 +- .../widget/recycler/UgcRouteTagItemDecorator.java | 4 +-- android/src/com/mapswithme/util/Animations.java | 4 +-- android/src/com/mapswithme/util/BatteryState.java | 6 ++--- .../src/com/mapswithme/util/BottomSheetHelper.java | 12 ++++----- .../util/ClientCertTLSSocketFactory.java | 4 +-- android/src/com/mapswithme/util/Config.java | 2 +- .../src/com/mapswithme/util/ConnectionState.java | 4 +-- android/src/com/mapswithme/util/Counters.java | 6 ++--- .../src/com/mapswithme/util/CrashlyticsUtils.java | 2 +- android/src/com/mapswithme/util/DateUtils.java | 2 +- android/src/com/mapswithme/util/Graphics.java | 13 +++++----- android/src/com/mapswithme/util/HttpClient.java | 2 +- android/src/com/mapswithme/util/HttpUploader.java | 4 +-- android/src/com/mapswithme/util/KeyValue.java | 2 +- android/src/com/mapswithme/util/Language.java | 2 +- android/src/com/mapswithme/util/Listeners.java | 2 +- android/src/com/mapswithme/util/LocationUtils.java | 2 +- android/src/com/mapswithme/util/NetworkPolicy.java | 4 +-- .../src/com/mapswithme/util/PermissionsUtils.java | 6 ++--- .../src/com/mapswithme/util/PowerManagment.java | 2 +- .../util/PreLollipopSSLSocketFactory.java | 2 +- android/src/com/mapswithme/util/Predicate.java | 2 +- android/src/com/mapswithme/util/SecureStorage.java | 4 +-- .../com/mapswithme/util/SharedPropertiesUtils.java | 4 +-- .../src/com/mapswithme/util/SponsoredLinks.java | 2 +- android/src/com/mapswithme/util/StorageUtils.java | 6 ++--- android/src/com/mapswithme/util/ThemeSwitcher.java | 6 ++--- android/src/com/mapswithme/util/ThemeUtils.java | 10 ++++---- android/src/com/mapswithme/util/TypeConverter.java | 2 +- android/src/com/mapswithme/util/UTM.java | 2 +- android/src/com/mapswithme/util/UiUtils.java | 22 ++++++++-------- android/src/com/mapswithme/util/Utils.java | 16 ++++++------ .../src/com/mapswithme/util/log/BaseLogger.java | 2 +- .../mapswithme/util/log/FileLoggerStrategy.java | 2 +- .../src/com/mapswithme/util/log/LoggerFactory.java | 4 +-- .../src/com/mapswithme/util/log/ZipLogsTask.java | 4 +-- .../util/push/GCMListenerRouterService.java | 4 +-- .../push/GcmInstanceIDRouterListenerService.java | 2 +- .../com/mapswithme/util/sharing/BaseShareable.java | 4 +-- .../util/sharing/BookmarkInfoShareable.java | 4 +-- .../util/sharing/LocalFileShareable.java | 2 +- .../util/sharing/MapObjectShareable.java | 7 +++-- .../com/mapswithme/util/sharing/ShareOption.java | 6 ++--- .../util/sharing/ShareableInfoProvider.java | 2 +- .../com/mapswithme/util/sharing/SharingHelper.java | 8 +++--- .../com/mapswithme/util/sharing/SharingTarget.java | 2 +- .../com/mapswithme/util/sharing/TargetUtils.java | 4 +-- .../util/sharing/ViralEditorShareable.java | 4 +-- .../com/mapswithme/util/statistics/Analytics.java | 2 +- .../mapswithme/util/statistics/GalleryType.java | 2 +- .../mapswithme/util/statistics/MytargetHelper.java | 6 ++--- .../util/statistics/PlacePageTracker.java | 4 +-- .../util/statistics/PushwooshHelper.java | 4 +-- .../util/statistics/StatisticValueConverter.java | 2 +- .../com/mapswithme/util/statistics/Statistics.java | 7 +++-- .../com/mopub/nativeads/MopubNativeAdFactory.java | 4 +-- 669 files changed, 1694 insertions(+), 1711 deletions(-) (limited to 'android') diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 9ee89a73e1..4346774cdd 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -586,7 +586,7 @@ diff --git a/android/build.gradle b/android/build.gradle index f9a6329c98..fdeeb9bcbf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -80,7 +80,7 @@ dependencies { } implementation fileTree(dir: '3rd_party', include: '*.jar') // BottomSheet - implementation 'com.cocosw:bottomsheet:1.3.1@aar' + implementation 'com.cocosw:bottomsheet:1.5.0@aar' // LinearLayoutManager allowing wrap_content of RecyclerView-s // TODO remove this library when default LinearLayoutManager will be fixed. implementation 'org.solovyev.android.views:linear-layout-manager:0.5@aar' @@ -92,7 +92,7 @@ dependencies { implementation 'com.appsflyer:af-android-sdk:4.9.0' implementation 'com.android.installreferrer:installreferrer:1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'com.android.billingclient:billing:1.1' implementation 'uk.co.samuelwall:material-tap-target-prompt:2.12.1' implementation 'com.firebase:firebase-jobdispatcher:0.8.5' @@ -135,7 +135,6 @@ configurations.all { force 'com.android.support:support-compat:' + propSupportLibraryVersion force 'com.android.support:support-fragment:' + propSupportLibraryVersion - force 'com.google.android.gms:play-services-ads:18.2.0' force 'com.google.android.gms:play-services-location:17.0.0' force 'com.google.android.gms:play-services-analytics:17.0.0' force 'com.google.android.gms:play-services-plus:17.0.0' diff --git a/android/gradle.properties b/android/gradle.properties index 143ed788b5..de7c9eea41 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -26,3 +26,5 @@ propObbFontsOutput build/fonts.obb org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-Xmx3g +android.useAndroidX=true +android.enableJetifier=true diff --git a/android/res/layout-land/fragment_ads_removal_purchase_dialog.xml b/android/res/layout-land/fragment_ads_removal_purchase_dialog.xml index 0258ea8ce4..30f10acc5b 100644 --- a/android/res/layout-land/fragment_ads_removal_purchase_dialog.xml +++ b/android/res/layout-land/fragment_ads_removal_purchase_dialog.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout-land/fragment_bookmark_payment.xml b/android/res/layout-land/fragment_bookmark_payment.xml index 5b898fdb3c..199f807479 100644 --- a/android/res/layout-land/fragment_bookmark_payment.xml +++ b/android/res/layout-land/fragment_bookmark_payment.xml @@ -11,7 +11,7 @@ android:layout_alignParentLeft="true" android:scaleType="centerCrop" android:src="@drawable/img_guides_placeholder_land"/> - - + diff --git a/android/res/layout-land/news_page.xml b/android/res/layout-land/news_page.xml index eb8def11b2..b020e10e01 100644 --- a/android/res/layout-land/news_page.xml +++ b/android/res/layout-land/news_page.xml @@ -80,7 +80,7 @@ android:textAppearance="@style/MwmTextAppearance.Body3" tools:text="Switch block subtitle"/> - - - + diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index bee6a9d262..78a8be42b5 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent"> - @@ -93,7 +93,7 @@ style="@style/MwmWidget.TextView.Item" android:text="@string/copyright"/> - + diff --git a/android/res/layout/activity_full_screen_gallery.xml b/android/res/layout/activity_full_screen_gallery.xml index 69411ca818..fb84009b92 100644 --- a/android/res/layout/activity_full_screen_gallery.xml +++ b/android/res/layout/activity_full_screen_gallery.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:background="@android:color/black"> - diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml index be3b2dbd62..4e6820b1aa 100644 --- a/android/res/layout/activity_map.xml +++ b/android/res/layout/activity_map.xml @@ -1,5 +1,5 @@ - - - - - + + diff --git a/android/res/layout/bookmark_subscription_fragment.xml b/android/res/layout/bookmark_subscription_fragment.xml index d6ef039e29..b272756a34 100644 --- a/android/res/layout/bookmark_subscription_fragment.xml +++ b/android/res/layout/bookmark_subscription_fragment.xml @@ -14,7 +14,7 @@ android:layout_gravity="center" android:visibility="gone" tools:visibility="visible"/> - - + diff --git a/android/res/layout/catalog_promo_container.xml b/android/res/layout/catalog_promo_container.xml index d00920b142..370747cc8b 100644 --- a/android/res/layout/catalog_promo_container.xml +++ b/android/res/layout/catalog_promo_container.xml @@ -81,7 +81,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/divider_height" layout="@layout/list_divider"/> - - - + - - + diff --git a/android/res/layout/catalog_promo_placeholder_card.xml b/android/res/layout/catalog_promo_placeholder_card.xml index d83debf197..e9f28dbde5 100644 --- a/android/res/layout/catalog_promo_placeholder_card.xml +++ b/android/res/layout/catalog_promo_placeholder_card.xml @@ -7,7 +7,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/dialog_edit_text.xml b/android/res/layout/dialog_edit_text.xml index d90f6d92d2..575e5b32fd 100644 --- a/android/res/layout/dialog_edit_text.xml +++ b/android/res/layout/dialog_edit_text.xml @@ -13,7 +13,7 @@ android:layout_marginBottom="@dimen/margin_base" android:textAppearance="@style/MwmTextAppearance.Title"/> - @@ -27,6 +27,6 @@ android:inputType="text|textCapSentences" android:singleLine="true"/> - + diff --git a/android/res/layout/fragment_ads_removal_purchase_dialog.xml b/android/res/layout/fragment_ads_removal_purchase_dialog.xml index eaa185e818..358b646084 100644 --- a/android/res/layout/fragment_ads_removal_purchase_dialog.xml +++ b/android/res/layout/fragment_ads_removal_purchase_dialog.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/fragment_auth_editor.xml b/android/res/layout/fragment_auth_editor.xml index 1ad179dff4..60d8d126d3 100644 --- a/android/res/layout/fragment_auth_editor.xml +++ b/android/res/layout/fragment_auth_editor.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - - + - @@ -203,7 +203,7 @@ tools:text="-42"/> - + - - + diff --git a/android/res/layout/fragment_bookmark_categories_pager.xml b/android/res/layout/fragment_bookmark_categories_pager.xml index 8fb96bf4ea..c1c81a5ec1 100644 --- a/android/res/layout/fragment_bookmark_categories_pager.xml +++ b/android/res/layout/fragment_bookmark_categories_pager.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - - diff --git a/android/res/layout/fragment_bookmark_category_restriction.xml b/android/res/layout/fragment_bookmark_category_restriction.xml index 6263331199..beebd49ff6 100644 --- a/android/res/layout/fragment_bookmark_category_restriction.xml +++ b/android/res/layout/fragment_bookmark_category_restriction.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - + - - - - + diff --git a/android/res/layout/fragment_bookmark_payment.xml b/android/res/layout/fragment_bookmark_payment.xml index 48d07e79e8..8d4cb44e8a 100644 --- a/android/res/layout/fragment_bookmark_payment.xml +++ b/android/res/layout/fragment_bookmark_payment.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/fragment_bookmarks_catalog.xml b/android/res/layout/fragment_bookmarks_catalog.xml index 2da1296a85..8c422c71a3 100644 --- a/android/res/layout/fragment_bookmarks_catalog.xml +++ b/android/res/layout/fragment_bookmarks_catalog.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/fragment_catalog_bookmark_categories.xml b/android/res/layout/fragment_catalog_bookmark_categories.xml index 1247f198aa..1538746eb0 100644 --- a/android/res/layout/fragment_catalog_bookmark_categories.xml +++ b/android/res/layout/fragment_catalog_bookmark_categories.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - + - - - - - @@ -69,7 +69,7 @@ android:layout_marginBottom="@dimen/margin_half_plus" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - @@ -87,7 +87,7 @@ android:layout_marginBottom="@dimen/margin_half_plus" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - @@ -122,5 +122,5 @@ android:visibility="gone" tools:visibility="visible"/> - + diff --git a/android/res/layout/fragment_downloader.xml b/android/res/layout/fragment_downloader.xml index c049ced412..6261b90e05 100644 --- a/android/res/layout/fragment_downloader.xml +++ b/android/res/layout/fragment_downloader.xml @@ -23,7 +23,7 @@ android:layout_below="@id/toolbar" android:layout_above="@id/action"/> - - - + - - + - \ No newline at end of file + diff --git a/android/res/layout/fragment_edit_description.xml b/android/res/layout/fragment_edit_description.xml index 92640a6d43..5264b4bc08 100644 --- a/android/res/layout/fragment_edit_description.xml +++ b/android/res/layout/fragment_edit_description.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - - + - \ No newline at end of file + diff --git a/android/res/layout/fragment_editor.xml b/android/res/layout/fragment_editor.xml index 0fb8651c58..a97a0a7d42 100644 --- a/android/res/layout/fragment_editor.xml +++ b/android/res/layout/fragment_editor.xml @@ -1,5 +1,5 @@ - - @@ -68,17 +68,17 @@ - + - - + - @@ -155,9 +155,9 @@ - + - @@ -259,7 +259,7 @@ android:layout_toStartOf="@+id/sw__wifi" android:text="@string/wifi"/> - - + - @@ -323,9 +323,9 @@ - + - - + - + diff --git a/android/res/layout/fragment_editor_host.xml b/android/res/layout/fragment_editor_host.xml index 93c4182332..6b475248a8 100644 --- a/android/res/layout/fragment_editor_host.xml +++ b/android/res/layout/fragment_editor_host.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - \ No newline at end of file + diff --git a/android/res/layout/fragment_gallery.xml b/android/res/layout/fragment_gallery.xml index 3e09892448..3392ae3118 100644 --- a/android/res/layout/fragment_gallery.xml +++ b/android/res/layout/fragment_gallery.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - \ No newline at end of file + diff --git a/android/res/layout/fragment_osm_login.xml b/android/res/layout/fragment_osm_login.xml index ffb7c66c0f..320a485fd9 100644 --- a/android/res/layout/fragment_osm_login.xml +++ b/android/res/layout/fragment_osm_login.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - \ No newline at end of file + diff --git a/android/res/layout/fragment_promo_after_booking_dialog.xml b/android/res/layout/fragment_promo_after_booking_dialog.xml index b4a0752203..4a52d0f7e0 100644 --- a/android/res/layout/fragment_promo_after_booking_dialog.xml +++ b/android/res/layout/fragment_promo_after_booking_dialog.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/fragment_report.xml b/android/res/layout/fragment_report.xml index 5b1884acf5..3947942b99 100644 --- a/android/res/layout/fragment_report.xml +++ b/android/res/layout/fragment_report.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + - \ No newline at end of file + diff --git a/android/res/layout/fragment_review.xml b/android/res/layout/fragment_review.xml index a8d0336aee..cd16511aaf 100644 --- a/android/res/layout/fragment_review.xml +++ b/android/res/layout/fragment_review.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="?cardBackground"> - - - - - + - + - - - + diff --git a/android/res/layout/fragment_search_filter.xml b/android/res/layout/fragment_search_filter.xml index 9b0ed42017..a9f6520707 100644 --- a/android/res/layout/fragment_search_filter.xml +++ b/android/res/layout/fragment_search_filter.xml @@ -1,5 +1,5 @@ - - - - - - - - + + + - - + - + diff --git a/android/res/layout/fragment_timetable_advanced.xml b/android/res/layout/fragment_timetable_advanced.xml index c17c58f8cb..cca693bab6 100644 --- a/android/res/layout/fragment_timetable_advanced.xml +++ b/android/res/layout/fragment_timetable_advanced.xml @@ -13,7 +13,7 @@ android:orientation="vertical" android:padding="@dimen/margin_half"> - - + - - + - \ No newline at end of file + diff --git a/android/res/layout/fragment_timetable_picker.xml b/android/res/layout/fragment_timetable_picker.xml index df2e1922ec..a725167075 100644 --- a/android/res/layout/fragment_timetable_picker.xml +++ b/android/res/layout/fragment_timetable_picker.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - \ No newline at end of file + diff --git a/android/res/layout/fragment_timetable_simple.xml b/android/res/layout/fragment_timetable_simple.xml index 045a584034..ae6219be25 100644 --- a/android/res/layout/fragment_timetable_simple.xml +++ b/android/res/layout/fragment_timetable_simple.xml @@ -1,5 +1,5 @@ - \ No newline at end of file + android:scrollbars="vertical"/> diff --git a/android/res/layout/fragment_toggle_map_layer.xml b/android/res/layout/fragment_toggle_map_layer.xml index 7f029faa2f..c25cd75ce4 100644 --- a/android/res/layout/fragment_toggle_map_layer.xml +++ b/android/res/layout/fragment_toggle_map_layer.xml @@ -1,5 +1,5 @@ - - - + - + diff --git a/android/res/layout/fragment_ugc_editor.xml b/android/res/layout/fragment_ugc_editor.xml index 9f3ddced6f..1448d0822f 100644 --- a/android/res/layout/fragment_ugc_editor.xml +++ b/android/res/layout/fragment_ugc_editor.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - - + @@ -31,7 +31,7 @@ android:background="?cardBackground" android:layout_width="match_parent" android:layout_height="wrap_content"> - - - + diff --git a/android/res/layout/fragment_ugc_route_edit.xml b/android/res/layout/fragment_ugc_route_edit.xml index b356082346..e8df8810ae 100644 --- a/android/res/layout/fragment_ugc_route_edit.xml +++ b/android/res/layout/fragment_ugc_route_edit.xml @@ -5,13 +5,13 @@ android:background="?cardBackground" android:layout_width="match_parent" android:layout_height="match_parent"> - - - + diff --git a/android/res/layout/fragment_ugc_routes.xml b/android/res/layout/fragment_ugc_routes.xml index 4182aed8b4..2f37fb535f 100644 --- a/android/res/layout/fragment_ugc_routes.xml +++ b/android/res/layout/fragment_ugc_routes.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall"/> - - - + diff --git a/android/res/layout/fragment_ugc_routes_sharing_options.xml b/android/res/layout/fragment_ugc_routes_sharing_options.xml index 458c885843..d820519600 100644 --- a/android/res/layout/fragment_ugc_routes_sharing_options.xml +++ b/android/res/layout/fragment_ugc_routes_sharing_options.xml @@ -6,7 +6,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - - + @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/cardBackground"> - - + diff --git a/android/res/layout/item_category_description.xml b/android/res/layout/item_category_description.xml index e6564ec5e6..fdf358e909 100644 --- a/android/res/layout/item_category_description.xml +++ b/android/res/layout/item_category_description.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/item_discovery_expert.xml b/android/res/layout/item_discovery_expert.xml index 2f58dded01..4231d9541a 100644 --- a/android/res/layout/item_discovery_expert.xml +++ b/android/res/layout/item_discovery_expert.xml @@ -6,7 +6,7 @@ android:layout_width="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_expert_error.xml b/android/res/layout/item_discovery_expert_error.xml index f0e9bd41c7..e1cba0432d 100644 --- a/android/res/layout/item_discovery_expert_error.xml +++ b/android/res/layout/item_discovery_expert_error.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_expert_loading.xml b/android/res/layout/item_discovery_expert_loading.xml index cc59ab5b11..55598fdb3a 100644 --- a/android/res/layout/item_discovery_expert_loading.xml +++ b/android/res/layout/item_discovery_expert_loading.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_hotel_product.xml b/android/res/layout/item_discovery_hotel_product.xml index ec63bb94cc..f4f4778bd6 100644 --- a/android/res/layout/item_discovery_hotel_product.xml +++ b/android/res/layout/item_discovery_hotel_product.xml @@ -6,7 +6,7 @@ android:layout_width="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_search.xml b/android/res/layout/item_discovery_search.xml index 5d0e072102..83f0001121 100644 --- a/android/res/layout/item_discovery_search.xml +++ b/android/res/layout/item_discovery_search.xml @@ -7,7 +7,7 @@ android:layout_width="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_simple_error.xml b/android/res/layout/item_discovery_simple_error.xml index fcf8c35c5c..208c9d876b 100644 --- a/android/res/layout/item_discovery_simple_error.xml +++ b/android/res/layout/item_discovery_simple_error.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_discovery_simple_loading.xml b/android/res/layout/item_discovery_simple_loading.xml index e6db81f056..65d640ef62 100644 --- a/android/res/layout/item_discovery_simple_loading.xml +++ b/android/res/layout/item_discovery_simple_loading.xml @@ -5,7 +5,7 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_editor_input.xml b/android/res/layout/item_editor_input.xml index 2f8e24a69a..dc4597b582 100644 --- a/android/res/layout/item_editor_input.xml +++ b/android/res/layout/item_editor_input.xml @@ -9,7 +9,7 @@ style="@style/MwmWidget.Editor.MetadataIcon" tools:src="@drawable/ic_phone"/> - - + - \ No newline at end of file + diff --git a/android/res/layout/item_localized_name.xml b/android/res/layout/item_localized_name.xml index 1354e96461..897e5a579e 100644 --- a/android/res/layout/item_localized_name.xml +++ b/android/res/layout/item_localized_name.xml @@ -8,7 +8,7 @@ android:gravity="center_vertical" android:orientation="horizontal"> - - + - - @@ -287,4 +287,4 @@ - \ No newline at end of file + diff --git a/android/res/layout/item_viator_loading.xml b/android/res/layout/item_viator_loading.xml index ffa5254164..400fe038b1 100644 --- a/android/res/layout/item_viator_loading.xml +++ b/android/res/layout/item_viator_loading.xml @@ -5,12 +5,12 @@ android:layout_height="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/item_viator_product.xml b/android/res/layout/item_viator_product.xml index c2719b402c..e45ed99dfd 100644 --- a/android/res/layout/item_viator_product.xml +++ b/android/res/layout/item_viator_product.xml @@ -6,7 +6,7 @@ android:layout_width="wrap_content" android:padding="@dimen/margin_quarter" android:clipToPadding="false"> - - + diff --git a/android/res/layout/news_page.xml b/android/res/layout/news_page.xml index c952596b41..2bcac49a8c 100644 --- a/android/res/layout/news_page.xml +++ b/android/res/layout/news_page.xml @@ -81,7 +81,7 @@ tools:text="Switch block subtitle"/> - - \ No newline at end of file + android:theme="@style/MwmWidget.ToolbarTheme"/> diff --git a/android/res/layout/place_page_details.xml b/android/res/layout/place_page_details.xml index 2e280d14e4..10465c97db 100644 --- a/android/res/layout/place_page_details.xml +++ b/android/res/layout/place_page_details.xml @@ -103,7 +103,7 @@ - diff --git a/android/res/layout/place_page_fat_shadow.xml b/android/res/layout/place_page_fat_shadow.xml index 59f542ffe3..c26f26bf34 100644 --- a/android/res/layout/place_page_fat_shadow.xml +++ b/android/res/layout/place_page_fat_shadow.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" tools:showIn="@layout/place_page_ugc"> - - - - - - - - + - \ No newline at end of file + diff --git a/android/res/layout/recycler_default.xml b/android/res/layout/recycler_default.xml index d35baaa452..a00ff59786 100644 --- a/android/res/layout/recycler_default.xml +++ b/android/res/layout/recycler_default.xml @@ -1,5 +1,5 @@ - - - - + - - + - - + diff --git a/android/res/layout/tags_recycler.xml b/android/res/layout/tags_recycler.xml index 7d8ce26d59..1c7c916c18 100644 --- a/android/res/layout/tags_recycler.xml +++ b/android/res/layout/tags_recycler.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + android:theme="@style/MwmWidget.ToolbarTheme"/> diff --git a/android/res/layout/toolbar_extended.xml b/android/res/layout/toolbar_extended.xml index f0ac7db8bf..8c55531b96 100644 --- a/android/res/layout/toolbar_extended.xml +++ b/android/res/layout/toolbar_extended.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - - - - + diff --git a/android/res/layout/toolbar_with_search.xml b/android/res/layout/toolbar_with_search.xml index 454a5e095f..f9b1e6247e 100644 --- a/android/res/layout/toolbar_with_search.xml +++ b/android/res/layout/toolbar_with_search.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/layout/toolbar_with_search_no_elevation.xml b/android/res/layout/toolbar_with_search_no_elevation.xml index 5e117e39ff..c7074f2a11 100644 --- a/android/res/layout/toolbar_with_search_no_elevation.xml +++ b/android/res/layout/toolbar_with_search_no_elevation.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/res/xml/prefs_main.xml b/android/res/xml/prefs_main.xml index df25a5f769..7cab98cceb 100644 --- a/android/res/xml/prefs_main.xml +++ b/android/res/xml/prefs_main.xml @@ -1,12 +1,12 @@ - - @@ -45,7 +45,7 @@ android:title="@string/whatsnew_transliteration_title" android:defaultValue="false" android:order="7"/> - - + - + - @@ -132,7 +132,7 @@ android:key="@string/pref_auto_zoom" android:title="@string/pref_map_auto_zoom" android:order="3"/> - - + - - + @@ -191,8 +191,8 @@ android:title="@string/about_menu_title" android:fragment="com.mapswithme.maps.settings.AboutFragment" android:order="2"/> - - + @@ -210,5 +210,5 @@ android:title="@string/opt_out_fabric" android:summary="@string/opt_out_fabric_description"> - - + + diff --git a/android/src/com/mapswithme/HotelUtils.java b/android/src/com/mapswithme/HotelUtils.java index 556878e5c2..1f04228161 100644 --- a/android/src/com/mapswithme/HotelUtils.java +++ b/android/src/com/mapswithme/HotelUtils.java @@ -1,7 +1,7 @@ package com.mapswithme; import android.content.res.Resources; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.ForegroundColorSpan; diff --git a/android/src/com/mapswithme/maps/AppBaseTransitionListener.java b/android/src/com/mapswithme/maps/AppBaseTransitionListener.java index 223e4291d7..cfa6200fe7 100644 --- a/android/src/com/mapswithme/maps/AppBaseTransitionListener.java +++ b/android/src/com/mapswithme/maps/AppBaseTransitionListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.mapswithme.maps.background.AppBackgroundTracker; diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java index 62e28df4aa..e9e17ccafc 100644 --- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java +++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java @@ -6,10 +6,10 @@ import android.graphics.Color; import android.location.Location; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/android/src/com/mapswithme/maps/Framework.java b/android/src/com/mapswithme/maps/Framework.java index 8694e7f9bc..a56487c477 100644 --- a/android/src/com/mapswithme/maps/Framework.java +++ b/android/src/com/mapswithme/maps/Framework.java @@ -2,12 +2,12 @@ package com.mapswithme.maps; import android.graphics.Bitmap; import android.location.Location; -import android.support.annotation.IntDef; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Size; -import android.support.annotation.UiThread; +import androidx.annotation.IntDef; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Size; +import androidx.annotation.UiThread; import android.text.TextUtils; import com.mapswithme.maps.ads.Banner; diff --git a/android/src/com/mapswithme/maps/LightFramework.java b/android/src/com/mapswithme/maps/LightFramework.java index 71a6a57cc3..94f206d730 100644 --- a/android/src/com/mapswithme/maps/LightFramework.java +++ b/android/src/com/mapswithme/maps/LightFramework.java @@ -1,7 +1,7 @@ package com.mapswithme.maps; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.background.NotificationCandidate; import com.mapswithme.maps.bookmarks.data.FeatureId; diff --git a/android/src/com/mapswithme/maps/MapFragment.java b/android/src/com/mapswithme/maps/MapFragment.java index 8ca8467273..83112076d5 100644 --- a/android/src/com/mapswithme/maps/MapFragment.java +++ b/android/src/com/mapswithme/maps/MapFragment.java @@ -4,9 +4,9 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 733858a818..fd5eb78c69 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -9,16 +9,16 @@ import android.content.Intent; import android.location.Location; import android.os.Build; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.MotionEvent; import android.view.View; diff --git a/android/src/com/mapswithme/maps/MwmApplication.java b/android/src/com/mapswithme/maps/MwmApplication.java index a40ba7e8d4..4d9cf92124 100644 --- a/android/src/com/mapswithme/maps/MwmApplication.java +++ b/android/src/com/mapswithme/maps/MwmApplication.java @@ -5,8 +5,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; -import android.support.multidex.MultiDex; +import androidx.annotation.NonNull; +import androidx.multidex.MultiDex; import com.appsflyer.AppsFlyerLib; import com.mapswithme.maps.analytics.ExternalLibrariesMediator; diff --git a/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java b/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java index e30b90f48b..6c300ac307 100644 --- a/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java +++ b/android/src/com/mapswithme/maps/NavigationButtonsAnimationController.java @@ -1,8 +1,8 @@ package com.mapswithme.maps; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.location.LocationHelper; diff --git a/android/src/com/mapswithme/maps/PanelAnimator.java b/android/src/com/mapswithme/maps/PanelAnimator.java index a874aa3e90..04d747d592 100644 --- a/android/src/com/mapswithme/maps/PanelAnimator.java +++ b/android/src/com/mapswithme/maps/PanelAnimator.java @@ -3,9 +3,9 @@ package com.mapswithme.maps; import android.animation.Animator; import android.animation.ValueAnimator; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.View; import android.view.animation.AccelerateInterpolator; diff --git a/android/src/com/mapswithme/maps/PrivateVariables.java b/android/src/com/mapswithme/maps/PrivateVariables.java index 35938cb31e..a7cc591c2d 100644 --- a/android/src/com/mapswithme/maps/PrivateVariables.java +++ b/android/src/com/mapswithme/maps/PrivateVariables.java @@ -1,6 +1,6 @@ package com.mapswithme.maps; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Interface to re-use some important variables from C++. diff --git a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java index f98548d64d..7ea85eb8cb 100644 --- a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java +++ b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java @@ -1,7 +1,7 @@ package com.mapswithme.maps; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import com.mapswithme.maps.purchase.CoreStartTransactionObserver; diff --git a/android/src/com/mapswithme/maps/SplashActivity.java b/android/src/com/mapswithme/maps/SplashActivity.java index 41f4a1a2ea..2ec148806b 100644 --- a/android/src/com/mapswithme/maps/SplashActivity.java +++ b/android/src/com/mapswithme/maps/SplashActivity.java @@ -5,12 +5,12 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.mapswithme.maps.ads.Banner; diff --git a/android/src/com/mapswithme/maps/WebContainerDelegate.java b/android/src/com/mapswithme/maps/WebContainerDelegate.java index 4ce6571f32..636b4c3bb9 100644 --- a/android/src/com/mapswithme/maps/WebContainerDelegate.java +++ b/android/src/com/mapswithme/maps/WebContainerDelegate.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import android.content.Intent; import android.net.MailTo; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.webkit.WebView; import android.webkit.WebViewClient; diff --git a/android/src/com/mapswithme/maps/adapter/AdapterPositionConverter.java b/android/src/com/mapswithme/maps/adapter/AdapterPositionConverter.java index 6d032b19f8..cc00b002b5 100644 --- a/android/src/com/mapswithme/maps/adapter/AdapterPositionConverter.java +++ b/android/src/com/mapswithme/maps/adapter/AdapterPositionConverter.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface AdapterPositionConverter { diff --git a/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java b/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java index 927152b769..268c4bc7b7 100644 --- a/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java +++ b/android/src/com/mapswithme/maps/adapter/OnItemClickListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.adapter; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; public interface OnItemClickListener diff --git a/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java b/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java index 8138bf7827..9a0cb0e768 100644 --- a/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/RecyclerCompositeAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java b/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java index 7a4bec07e5..16dc1c0f97 100644 --- a/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java +++ b/android/src/com/mapswithme/maps/adapter/RepeatablePairPositionConverter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java b/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java index 7d35b45fd9..edd8a956c7 100644 --- a/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagGroupNameAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.adapter; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/adapter/TagsAdapter.java b/android/src/com/mapswithme/maps/adapter/TagsAdapter.java index 547c602d53..62ddb70e91 100644 --- a/android/src/com/mapswithme/maps/adapter/TagsAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagsAdapter.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.adapter; import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.StateListDrawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java b/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java index 06c151b722..f55f03cd14 100644 --- a/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java +++ b/android/src/com/mapswithme/maps/adapter/TagsCompositeAdapter.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.adapter; import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/ads/AdDataAdapter.java b/android/src/com/mapswithme/maps/ads/AdDataAdapter.java index 34ff58c51a..0ebb2d6af4 100644 --- a/android/src/com/mapswithme/maps/ads/AdDataAdapter.java +++ b/android/src/com/mapswithme/maps/ads/AdDataAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mopub.nativeads.BaseNativeAd; import com.mopub.nativeads.StaticNativeAd; diff --git a/android/src/com/mapswithme/maps/ads/AdRegistrator.java b/android/src/com/mapswithme/maps/ads/AdRegistrator.java index 8c8eb73606..46c7fcf5f9 100644 --- a/android/src/com/mapswithme/maps/ads/AdRegistrator.java +++ b/android/src/com/mapswithme/maps/ads/AdRegistrator.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.mopub.nativeads.BaseNativeAd; diff --git a/android/src/com/mapswithme/maps/ads/AdTracker.java b/android/src/com/mapswithme/maps/ads/AdTracker.java index 54b4c9e4a0..a3d8bef1f3 100644 --- a/android/src/com/mapswithme/maps/ads/AdTracker.java +++ b/android/src/com/mapswithme/maps/ads/AdTracker.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Represents a interface to track an ad visibility on the screen. diff --git a/android/src/com/mapswithme/maps/ads/Banner.java b/android/src/com/mapswithme/maps/ads/Banner.java index cb32715f9c..dfc0a6456f 100644 --- a/android/src/com/mapswithme/maps/ads/Banner.java +++ b/android/src/com/mapswithme/maps/ads/Banner.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.ads; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public final class Banner implements Parcelable { diff --git a/android/src/com/mapswithme/maps/ads/BannerKey.java b/android/src/com/mapswithme/maps/ads/BannerKey.java index 337dfb0e5e..eea05298d5 100644 --- a/android/src/com/mapswithme/maps/ads/BannerKey.java +++ b/android/src/com/mapswithme/maps/ads/BannerKey.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import net.jcip.annotations.Immutable; diff --git a/android/src/com/mapswithme/maps/ads/BaseMwmNativeAd.java b/android/src/com/mapswithme/maps/ads/BaseMwmNativeAd.java index 1841462408..4a26803bff 100644 --- a/android/src/com/mapswithme/maps/ads/BaseMwmNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/BaseMwmNativeAd.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java index b4cce62121..45e1277476 100644 --- a/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/BaseNativeAdLoader.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.CallSuper; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.Nullable; abstract class BaseNativeAdLoader implements NativeAdLoader { diff --git a/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java b/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java index 10a99ab034..342f338919 100644 --- a/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/CachedMwmNativeAd.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public abstract class CachedMwmNativeAd extends BaseMwmNativeAd { diff --git a/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java index 885809fe1c..76780483e7 100644 --- a/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/CachingNativeAdLoader.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.ads; import android.content.Context; import android.os.SystemClock; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java b/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java index 7c89b6c0d9..7eec439baf 100644 --- a/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/CompoundNativeAdLoader.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ads; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.util.concurrency.UiThread; @@ -52,7 +52,7 @@ public class CompoundNativeAdLoader extends BaseNativeAdLoader implements Native mAdTracker = adTracker; } - @android.support.annotation.UiThread + @androidx.annotation.UiThread public void loadAd(@NonNull Context context, @NonNull List banners) { LOGGER.i(TAG, "Load ads for " + banners); diff --git a/android/src/com/mapswithme/maps/ads/DefaultAdTracker.java b/android/src/com/mapswithme/maps/ads/DefaultAdTracker.java index fd0eda7fdc..debe8c1204 100644 --- a/android/src/com/mapswithme/maps/ads/DefaultAdTracker.java +++ b/android/src/com/mapswithme/maps/ads/DefaultAdTracker.java @@ -1,14 +1,13 @@ package com.mapswithme.maps.ads; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.BrokenBarrierException; public class DefaultAdTracker implements AdTracker, OnAdCacheModifiedListener { diff --git a/android/src/com/mapswithme/maps/ads/FacebookAdError.java b/android/src/com/mapswithme/maps/ads/FacebookAdError.java index 9bfcd7cdc7..9275f411e4 100644 --- a/android/src/com/mapswithme/maps/ads/FacebookAdError.java +++ b/android/src/com/mapswithme/maps/ads/FacebookAdError.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.facebook.ads.AdError; diff --git a/android/src/com/mapswithme/maps/ads/FacebookAdsLoader.java b/android/src/com/mapswithme/maps/ads/FacebookAdsLoader.java index f876b313a2..edabfb4737 100644 --- a/android/src/com/mapswithme/maps/ads/FacebookAdsLoader.java +++ b/android/src/com/mapswithme/maps/ads/FacebookAdsLoader.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ads; import android.content.Context; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.facebook.ads.Ad; import com.facebook.ads.AdError; diff --git a/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java b/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java index 785b52a8dc..23104861b1 100644 --- a/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java +++ b/android/src/com/mapswithme/maps/ads/FacebookInvitesDialogFragment.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.ads; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java b/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java index 2319c28e92..1ffe01ad1f 100644 --- a/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/FacebookNativeAd.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/ads/Factory.java b/android/src/com/mapswithme/maps/ads/Factory.java index 11c6776505..c7f6ed9d9c 100644 --- a/android/src/com/mapswithme/maps/ads/Factory.java +++ b/android/src/com/mapswithme/maps/ads/Factory.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class Factory { diff --git a/android/src/com/mapswithme/maps/ads/LikesManager.java b/android/src/com/mapswithme/maps/ads/LikesManager.java index 53e009604f..de5efd43b5 100644 --- a/android/src/com/mapswithme/maps/ads/LikesManager.java +++ b/android/src/com/mapswithme/maps/ads/LikesManager.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import android.util.SparseArray; import com.mapswithme.maps.BuildConfig; diff --git a/android/src/com/mapswithme/maps/ads/LocalAdInfo.java b/android/src/com/mapswithme/maps/ads/LocalAdInfo.java index ab64050800..0b4b04e16b 100644 --- a/android/src/com/mapswithme/maps/ads/LocalAdInfo.java +++ b/android/src/com/mapswithme/maps/ads/LocalAdInfo.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ads; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/ads/MopubAdError.java b/android/src/com/mapswithme/maps/ads/MopubAdError.java index 9b110c78e0..0e1ea9740d 100644 --- a/android/src/com/mapswithme/maps/ads/MopubAdError.java +++ b/android/src/com/mapswithme/maps/ads/MopubAdError.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; class MopubAdError implements NativeAdError { diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java index 828aac0c4d..18cf17e440 100644 --- a/android/src/com/mapswithme/maps/ads/MopubNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/MopubNativeAd.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java index aa34fb8c96..0732766b2d 100644 --- a/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java +++ b/android/src/com/mapswithme/maps/ads/MopubNativeDownloader.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ads; import android.content.Context; import android.location.Location; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ads/MwmNativeAd.java b/android/src/com/mapswithme/maps/ads/MwmNativeAd.java index 2230153783..9db8b92a35 100644 --- a/android/src/com/mapswithme/maps/ads/MwmNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/MwmNativeAd.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; /** diff --git a/android/src/com/mapswithme/maps/ads/MyTargetAdError.java b/android/src/com/mapswithme/maps/ads/MyTargetAdError.java index dd7014e1a5..355b6e787a 100644 --- a/android/src/com/mapswithme/maps/ads/MyTargetAdError.java +++ b/android/src/com/mapswithme/maps/ads/MyTargetAdError.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; class MyTargetAdError implements NativeAdError diff --git a/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java b/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java index 83f2f32dba..8662b09bbb 100644 --- a/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java +++ b/android/src/com/mapswithme/maps/ads/MyTargetAdsLoader.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ads; import android.content.Context; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.PrivateVariables; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java index 96eeb7d2f2..5e8d7b9a20 100644 --- a/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java +++ b/android/src/com/mapswithme/maps/ads/MyTargetNativeAd.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/ads/NativeAdError.java b/android/src/com/mapswithme/maps/ads/NativeAdError.java index a6c7fe404f..811b544a48 100644 --- a/android/src/com/mapswithme/maps/ads/NativeAdError.java +++ b/android/src/com/mapswithme/maps/ads/NativeAdError.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public interface NativeAdError { diff --git a/android/src/com/mapswithme/maps/ads/NativeAdListener.java b/android/src/com/mapswithme/maps/ads/NativeAdListener.java index 4739132f8f..6c02d6ccda 100644 --- a/android/src/com/mapswithme/maps/ads/NativeAdListener.java +++ b/android/src/com/mapswithme/maps/ads/NativeAdListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; public interface NativeAdListener { diff --git a/android/src/com/mapswithme/maps/ads/NativeAdLoader.java b/android/src/com/mapswithme/maps/ads/NativeAdLoader.java index 6af86636ab..e7e252fa66 100644 --- a/android/src/com/mapswithme/maps/ads/NativeAdLoader.java +++ b/android/src/com/mapswithme/maps/ads/NativeAdLoader.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ads; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; interface NativeAdLoader { diff --git a/android/src/com/mapswithme/maps/ads/OnAdCacheModifiedListener.java b/android/src/com/mapswithme/maps/ads/OnAdCacheModifiedListener.java index e4ebd95d31..01e7511b3b 100644 --- a/android/src/com/mapswithme/maps/ads/OnAdCacheModifiedListener.java +++ b/android/src/com/mapswithme/maps/ads/OnAdCacheModifiedListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ads; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * A common listener to make all interested observers be able to watch for ads cache modifications. diff --git a/android/src/com/mapswithme/maps/ads/RateStoreDialogFragment.java b/android/src/com/mapswithme/maps/ads/RateStoreDialogFragment.java index 7841e04742..da6f9cfb5b 100644 --- a/android/src/com/mapswithme/maps/ads/RateStoreDialogFragment.java +++ b/android/src/com/mapswithme/maps/ads/RateStoreDialogFragment.java @@ -9,8 +9,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.text.format.DateUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/analytics/AppsFlyerUtils.java b/android/src/com/mapswithme/maps/analytics/AppsFlyerUtils.java index edab355b55..66370c05e5 100644 --- a/android/src/com/mapswithme/maps/analytics/AppsFlyerUtils.java +++ b/android/src/com/mapswithme/maps/analytics/AppsFlyerUtils.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.analytics; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Map; diff --git a/android/src/com/mapswithme/maps/analytics/ContextDependentEventLogger.java b/android/src/com/mapswithme/maps/analytics/ContextDependentEventLogger.java index 3e060b718a..bf34b19ee7 100644 --- a/android/src/com/mapswithme/maps/analytics/ContextDependentEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/ContextDependentEventLogger.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.analytics; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; abstract class ContextDependentEventLogger implements EventLogger { diff --git a/android/src/com/mapswithme/maps/analytics/DefaultEventLogger.java b/android/src/com/mapswithme/maps/analytics/DefaultEventLogger.java index 8a3b4761b2..3fd9e36583 100644 --- a/android/src/com/mapswithme/maps/analytics/DefaultEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/DefaultEventLogger.java @@ -2,10 +2,8 @@ package com.mapswithme.maps.analytics; import android.app.Activity; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -import com.mapswithme.maps.analytics.ContextDependentEventLogger; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Map; diff --git a/android/src/com/mapswithme/maps/analytics/EventLogger.java b/android/src/com/mapswithme/maps/analytics/EventLogger.java index 36faf46fd2..4ac22ff5b8 100644 --- a/android/src/com/mapswithme/maps/analytics/EventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/EventLogger.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.analytics; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Map; diff --git a/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java b/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java index eed8800784..5ca2f3ff81 100644 --- a/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java +++ b/android/src/com/mapswithme/maps/analytics/EventLoggerAggregator.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.analytics; import android.app.Activity; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java b/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java index 3f6e7fa92f..26be0636de 100644 --- a/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java +++ b/android/src/com/mapswithme/maps/analytics/ExternalLibrariesMediator.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.analytics; import android.app.Application; import android.os.AsyncTask; import android.os.CountDownTimer; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.TextUtils; import com.appsflyer.AppsFlyerConversionListener; diff --git a/android/src/com/mapswithme/maps/analytics/FlurryEventLogger.java b/android/src/com/mapswithme/maps/analytics/FlurryEventLogger.java index 8a3f536d91..3ef69250ee 100644 --- a/android/src/com/mapswithme/maps/analytics/FlurryEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/FlurryEventLogger.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.analytics; import android.app.Activity; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.flurry.android.FlurryAgent; diff --git a/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java b/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java index 4997b10135..24793cc29f 100644 --- a/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/MyTrackerEventLogger.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.analytics; import android.app.Activity; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.PrivateVariables; diff --git a/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java b/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java index 15103a48d2..150dd07336 100644 --- a/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java @@ -1,9 +1,10 @@ package com.mapswithme.maps.analytics; import android.app.Application; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.BuildConfig; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/api/ParsedSearchRequest.java b/android/src/com/mapswithme/maps/api/ParsedSearchRequest.java index e5322bce7a..d9f748412f 100644 --- a/android/src/com/mapswithme/maps/api/ParsedSearchRequest.java +++ b/android/src/com/mapswithme/maps/api/ParsedSearchRequest.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.api; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Represents url_scheme::SearchRequest from core. diff --git a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java index fe4556571a..284da47c61 100644 --- a/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java +++ b/android/src/com/mapswithme/maps/api/ParsedUrlMwmRequest.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.api; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/auth/Authorizer.java b/android/src/com/mapswithme/maps/auth/Authorizer.java index bad07e3ae0..56530d02c6 100644 --- a/android/src/com/mapswithme/maps/auth/Authorizer.java +++ b/android/src/com/mapswithme/maps/auth/Authorizer.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.auth; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java b/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java index a47a18b64e..44fcb38f6f 100644 --- a/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java +++ b/android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.auth; -import android.support.annotation.IdRes; +import androidx.annotation.IdRes; import android.view.View; import android.webkit.WebView; diff --git a/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java b/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java index 7e3640a8dd..8d2a16a3f6 100644 --- a/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/FacebookTokenHandler.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.facebook.AccessToken; diff --git a/android/src/com/mapswithme/maps/auth/GoogleTokenHandler.java b/android/src/com/mapswithme/maps/auth/GoogleTokenHandler.java index c7b391c06b..edf1d42a2e 100644 --- a/android/src/com/mapswithme/maps/auth/GoogleTokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/GoogleTokenHandler.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.google.android.gms.auth.api.signin.GoogleSignIn; diff --git a/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java b/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java index 1500d87494..049f4fb74a 100644 --- a/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.auth; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.Framework; import com.mapswithme.maps.background.Notifier; diff --git a/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java b/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java index 3477318fd1..9f8ab89972 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java +++ b/android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmExtraTitleActivity; diff --git a/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java b/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java index 7ee31524e1..e008f8b35c 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java +++ b/android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java b/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java index 67b03d5203..58631dfe22 100644 --- a/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java index 57fbc3bea5..40cf9f8c76 100644 --- a/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java @@ -6,10 +6,10 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.Html; import android.text.TextUtils; import android.text.method.LinkMovementMethod; diff --git a/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java b/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java index 16b774c7a0..08ec7fc7c7 100644 --- a/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java +++ b/android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public interface TargetFragmentCallback { diff --git a/android/src/com/mapswithme/maps/auth/TokenHandler.java b/android/src/com/mapswithme/maps/auth/TokenHandler.java index 2f09c019c2..8b9acf54a5 100644 --- a/android/src/com/mapswithme/maps/auth/TokenHandler.java +++ b/android/src/com/mapswithme/maps/auth/TokenHandler.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.auth; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java index c98f80b79b..1a11d8a4ef 100644 --- a/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java +++ b/android/src/com/mapswithme/maps/background/AbstractLogBroadcastReceiver.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.background; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; + import android.text.TextUtils; import android.util.Log; diff --git a/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java b/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java index 800300f9be..85148a1609 100644 --- a/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java +++ b/android/src/com/mapswithme/maps/background/AppBackgroundTracker.java @@ -164,7 +164,7 @@ public final class AppBackgroundTracker mVisibleAppLaunchListeners.unregister(listener); } - @android.support.annotation.UiThread + @androidx.annotation.UiThread public Activity getTopActivity() { return (mActivities.size() == 0 ? null : mActivities.get(mActivities.keyAt(0)).get()); diff --git a/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java b/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java index 3abe644a1d..c31ce494ed 100644 --- a/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java +++ b/android/src/com/mapswithme/maps/background/ConnectivityChangedReceiver.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.background; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class ConnectivityChangedReceiver extends AbstractLogBroadcastReceiver { diff --git a/android/src/com/mapswithme/maps/background/NotificationCandidate.java b/android/src/com/mapswithme/maps/background/NotificationCandidate.java index 13bc755cb2..b9b4774650 100644 --- a/android/src/com/mapswithme/maps/background/NotificationCandidate.java +++ b/android/src/com/mapswithme/maps/background/NotificationCandidate.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.background; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.io.Serializable; import java.lang.annotation.Retention; diff --git a/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java b/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java index 57a6acd396..697fad3faa 100644 --- a/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java +++ b/android/src/com/mapswithme/maps/background/NotificationChannelFactory.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.background; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/background/NotificationChannelProvider.java b/android/src/com/mapswithme/maps/background/NotificationChannelProvider.java index 20ed05e2fd..109df8aff1 100644 --- a/android/src/com/mapswithme/maps/background/NotificationChannelProvider.java +++ b/android/src/com/mapswithme/maps/background/NotificationChannelProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.background; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface NotificationChannelProvider { diff --git a/android/src/com/mapswithme/maps/background/NotificationService.java b/android/src/com/mapswithme/maps/background/NotificationService.java index 684b5d5733..c82d59902d 100644 --- a/android/src/com/mapswithme/maps/background/NotificationService.java +++ b/android/src/com/mapswithme/maps/background/NotificationService.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.background; import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; -import android.support.v4.app.JobIntentService; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; import com.mapswithme.maps.LightFramework; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/background/Notifier.java b/android/src/com/mapswithme/maps/background/Notifier.java index 15a4c34f4f..8342da5db9 100644 --- a/android/src/com/mapswithme/maps/background/Notifier.java +++ b/android/src/com/mapswithme/maps/background/Notifier.java @@ -6,10 +6,10 @@ import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java b/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java index 8da1210294..c6874e76ee 100644 --- a/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java +++ b/android/src/com/mapswithme/maps/background/OreoCompatNotificationChannelProvider.java @@ -5,7 +5,7 @@ import android.app.Application; import android.app.NotificationChannel; import android.app.NotificationManager; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java b/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java index 656ec6ad5e..6b63573124 100644 --- a/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java +++ b/android/src/com/mapswithme/maps/background/StubNotificationChannelProvider.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.background; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class StubNotificationChannelProvider implements NotificationChannelProvider { diff --git a/android/src/com/mapswithme/maps/background/WorkerService.java b/android/src/com/mapswithme/maps/background/WorkerService.java index f931924616..f4c96e7729 100644 --- a/android/src/com/mapswithme/maps/background/WorkerService.java +++ b/android/src/com/mapswithme/maps/background/WorkerService.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.background; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.JobIntentService; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; import android.text.TextUtils; import android.util.Log; diff --git a/android/src/com/mapswithme/maps/base/BaseActivity.java b/android/src/com/mapswithme/maps/base/BaseActivity.java index 09f71017c6..bc6dfcc38b 100644 --- a/android/src/com/mapswithme/maps/base/BaseActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseActivity.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; public interface BaseActivity { diff --git a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java index d56d500560..70b9b5685f 100644 --- a/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java +++ b/android/src/com/mapswithme/maps/base/BaseActivityDelegate.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/android/src/com/mapswithme/maps/base/BaseAsyncOperationFragment.java b/android/src/com/mapswithme/maps/base/BaseAsyncOperationFragment.java index 84b330841b..33021867a2 100644 --- a/android/src/com/mapswithme/maps/base/BaseAsyncOperationFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseAsyncOperationFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.R; import com.mapswithme.maps.dialog.ProgressDialogFragment; diff --git a/android/src/com/mapswithme/maps/base/BaseAuthFragment.java b/android/src/com/mapswithme/maps/base/BaseAuthFragment.java index 5de2a95309..dea4d45454 100644 --- a/android/src/com/mapswithme/maps/base/BaseAuthFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseAuthFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.base; import android.content.Intent; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.auth.Authorizer; import com.mapswithme.maps.auth.TargetFragmentCallback; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java index 5167669a8c..f13ad548a6 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmDialogFragment.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.base; import android.app.Application; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.DialogFragment; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java index 909bf8e98e..6c5a9d96bf 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmExtraTitleActivity.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.appcompat.widget.Toolbar; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java index 9369de031d..0d31bf5337 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.View; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java index 8e1a15cf77..3b9d3498fc 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmFragmentActivity.java @@ -4,15 +4,15 @@ import android.app.Activity; import android.content.Intent; import android.media.AudioManager; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java index 2afc9b5607..7938290b52 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmListFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.base; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.ListFragment; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.ListFragment; +import androidx.appcompat.widget.Toolbar; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java index 0ae6022fa0..3bad1a08ea 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmRecyclerFragment.java @@ -2,14 +2,14 @@ package com.mapswithme.maps.base; import android.content.Context; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java b/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java index 1bdf255c91..7046dcd5cf 100644 --- a/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseMwmToolbarFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.base; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.widget.ToolbarController; diff --git a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java index 8a8c5e772e..064c7f18ac 100644 --- a/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java +++ b/android/src/com/mapswithme/maps/base/BaseToolbarActivity.java @@ -1,12 +1,12 @@ package com.mapswithme.maps.base; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v7.widget.Toolbar; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.appcompat.widget.Toolbar; import com.mapswithme.maps.R; import com.mapswithme.util.UiUtils; diff --git a/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java b/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java index c06ecc8fb6..d44861b7fc 100644 --- a/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java +++ b/android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java @@ -1,13 +1,12 @@ package com.mapswithme.maps.base; import android.content.Intent; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.auth.Authorizer; import com.mapswithme.maps.auth.TargetFragmentCallback; -import com.mapswithme.maps.base.BaseMwmToolbarFragment; /** * A base toolbar fragment which is responsible for the authorization flow, diff --git a/android/src/com/mapswithme/maps/base/Detachable.java b/android/src/com/mapswithme/maps/base/Detachable.java index d78682ad3f..bcce00a75e 100644 --- a/android/src/com/mapswithme/maps/base/Detachable.java +++ b/android/src/com/mapswithme/maps/base/Detachable.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.base; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface Detachable { diff --git a/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java b/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java index 17e53af83d..5a65da259f 100644 --- a/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java +++ b/android/src/com/mapswithme/maps/base/FinishActivityToolbarController.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.base; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.mapswithme.maps.widget.ToolbarController; diff --git a/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java b/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java index eecb6a8e0e..82f051a4f8 100644 --- a/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java +++ b/android/src/com/mapswithme/maps/base/MediaPlayerWrapper.java @@ -4,12 +4,11 @@ import android.app.Application; import android.content.Context; import android.media.MediaPlayer; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RawRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RawRes; import com.mapswithme.maps.MwmApplication; -import com.mapswithme.maps.R; public class MediaPlayerWrapper { diff --git a/android/src/com/mapswithme/maps/base/Savable.java b/android/src/com/mapswithme/maps/base/Savable.java index fba26ee9bf..cda2a318c1 100644 --- a/android/src/com/mapswithme/maps/base/Savable.java +++ b/android/src/com/mapswithme/maps/base/Savable.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.base; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface Savable { diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java index 6c9c4ded9f..36d8bf5911 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java @@ -3,13 +3,13 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.MenuRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import android.view.View; diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java index 6427011b7f..5ec367efe0 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoryAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java index f00cd8e5e1..bd37cf8683 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.bookmarks; import android.app.ProgressDialog; import android.content.DialogInterface; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; import android.view.View; import android.widget.Button; import android.widget.Toast; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java index 13b70a8850..4420a8a721 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesActivity.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java index c942b664bd..b5d15ccc4a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java index d27280696b..188e16da54 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.bookmarks; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; import android.view.View; import com.cocosw.bottomsheet.BottomSheet; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPageResProvider.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPageResProvider.java index 85c4ab8afe..993cc79c23 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPageResProvider.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPageResProvider.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java index d619cc67b2..d18bf6eb2a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.bookmarks; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadCallback.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadCallback.java index a57fb9f281..074b3254cf 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.bookmarks.data.PaymentData; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java index b37dd1d0f3..30ceb95245 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.Detachable; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java index 27268436d2..419b74ea83 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java @@ -4,9 +4,9 @@ import android.app.Application; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import com.mapswithme.maps.background.AbstractLogBroadcastReceiver; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java index f6f17ee01e..1a7261937c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListActivity.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java index fde971b536..55340b3742 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.bookmarks; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkPaymentDataParser.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkPaymentDataParser.java index 8bc2e57188..b6a519c43c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarkPaymentDataParser.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkPaymentDataParser.java @@ -1,10 +1,9 @@ package com.mapswithme.maps.bookmarks; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; -import android.util.Log; import com.mapswithme.maps.bookmarks.data.PaymentData; import com.mapswithme.util.CrashlyticsUtils; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java index 8cfe37af68..298a58c168 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.appcompat.widget.Toolbar; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java index 01eb553516..9cbcdedc94 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java @@ -8,8 +8,8 @@ import android.net.Uri; import android.net.http.SslError; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java index c08d7d157b..701f4859c1 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java @@ -4,13 +4,13 @@ import android.app.Activity; import android.app.Application; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.widget.Toast; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.R; import com.mapswithme.maps.auth.Authorizer; import com.mapswithme.maps.auth.TargetFragmentCallback; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java index aebea855e9..85bfb7c081 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.bookmarks; import android.app.DownloadManager; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java index f87dc17348..e86e04292e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java @@ -4,14 +4,14 @@ import android.app.Activity; import android.content.Intent; import android.location.Location; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java index 17d3165509..324fcfb299 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java index 26eaf66388..c89b474524 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import java.util.List; diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java index a77d85a1a0..712207637f 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java +++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksToolbarController.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.mapswithme.maps.widget.SearchToolbarController; diff --git a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java index dbb99ec1e2..22cc9a724c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java b/android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java index 7a0904ebdd..f0718b247a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java +++ b/android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java b/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java index db3452dd9a..332d9f1d9d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java b/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java index c02e588421..f26ae7a57d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java +++ b/android/src/com/mapswithme/maps/bookmarks/CategoryValidator.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java index 26631084eb..dd4d912647 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryAdapter.java @@ -1,14 +1,14 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RadioButton; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java index 72338daa8d..0257d6467a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarkCategoryFragment.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java index 8d137b29e6..70417c4057 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ChooseBookmarksSortingTypeFragment.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java b/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java index 22e2990f8d..9ec11b31d2 100644 --- a/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java +++ b/android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.bookmarks; import android.app.Application; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/bookmarks/Holders.java b/android/src/com/mapswithme/maps/bookmarks/Holders.java index ce09d001e6..eb1c4313ce 100644 --- a/android/src/com/mapswithme/maps/bookmarks/Holders.java +++ b/android/src/com/mapswithme/maps/bookmarks/Holders.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.bookmarks; import android.content.Context; import android.graphics.drawable.Drawable; import android.location.Location; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.PluralsRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.PluralsRes; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.Layout; import android.text.Spanned; diff --git a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java index b31014d947..7f07d7bb41 100644 --- a/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java +++ b/android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.bookmarks.data.BookmarkManager; import com.mapswithme.maps.dialog.AlertDialogCallback; diff --git a/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java b/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java index 8c1ede41ab..eb3bf2c1e5 100644 --- a/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java +++ b/android/src/com/mapswithme/maps/bookmarks/KmlImportController.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.bookmarks; import android.app.Activity; import android.app.ProgressDialog; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java b/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java index f95f137e81..67b07fe69d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java +++ b/android/src/com/mapswithme/maps/bookmarks/OnItemLongClickListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; public interface OnItemLongClickListener diff --git a/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java b/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java index eae310ada2..59070a6dfe 100644 --- a/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java +++ b/android/src/com/mapswithme/maps/bookmarks/OperationStatus.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.Error; import com.mapswithme.maps.bookmarks.data.Result; diff --git a/android/src/com/mapswithme/maps/bookmarks/PaymentDataParser.java b/android/src/com/mapswithme/maps/bookmarks/PaymentDataParser.java index 7e8ec49256..34b2bc1c27 100644 --- a/android/src/com/mapswithme/maps/bookmarks/PaymentDataParser.java +++ b/android/src/com/mapswithme/maps/bookmarks/PaymentDataParser.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.bookmarks.data.PaymentData; diff --git a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java index f7e6bc2cc7..25ccba3876 100644 --- a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java @@ -4,9 +4,9 @@ import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java index 76414b1ed4..b1a839dd0c 100644 --- a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java +++ b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedReceiver.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.bookmarks; import android.app.DownloadManager; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.JobIntentService; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; import com.mapswithme.maps.background.AbstractLogBroadcastReceiver; import com.mapswithme.maps.scheduling.JobIdMap; diff --git a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java index 9f8fa16a10..c77049ad69 100644 --- a/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java +++ b/android/src/com/mapswithme/maps/bookmarks/SystemDownloadCompletedService.java @@ -6,10 +6,10 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.JobIntentService; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.JobIntentService; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java b/android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java index e89b845581..a34c2f18a6 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; import java.util.Collections; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java index 1e767e6a76..9763f7fb9e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.bookmarks.data; import android.annotation.SuppressLint; import android.os.Parcel; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.Framework; import com.mapswithme.maps.ads.Banner; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java index 17e721abb3..68f2838399 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkCategory.java @@ -4,17 +4,16 @@ import android.content.Context; import android.content.res.Resources; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.PluralsRes; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.PluralsRes; +import androidx.annotation.StringRes; import android.text.TextUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarksPageFactory; import com.mapswithme.util.TypeConverter; -import com.mapswithme.util.UiUtils; public class BookmarkCategory implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java index c0526a06b5..748bb421b2 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkInfo.java @@ -1,9 +1,7 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import com.mapswithme.maps.Framework; import com.mapswithme.util.GeoUtils; import com.mapswithme.util.sharing.ShareableInfoProvider; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java index 2fb425a49b..5ad166c786 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; import com.mapswithme.maps.base.DataChangedListener; import com.mapswithme.maps.base.Observable; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkSharingResult.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkSharingResult.java index 5563e0cbb0..a0d7a81a57 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkSharingResult.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkSharingResult.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java index 6bcbefb7a3..a5ef6c4e43 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java @@ -2,9 +2,8 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java index f91b604834..186a2f2314 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class CatalogCustomPropertyOption implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java index 9d728ab5d1..5d64eba702 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class CatalogPropertyOptionAndKey implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java index ba20345f7e..e44e7114f6 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTag.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.bookmarks.data; import android.graphics.Color; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class CatalogTag implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTagsGroup.java b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTagsGroup.java index 951b3d5b8e..fa462f700d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CatalogTagsGroup.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CatalogTagsGroup.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; import java.util.Collections; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java index a47c6401bd..bd4172a1e5 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/CategoryDataSource.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.content.DataSource; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Error.java b/android/src/com/mapswithme/maps/bookmarks/data/Error.java index 24579d69f6..6f98bd6102 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Error.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Error.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.net.HttpURLConnection; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java b/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java index 7191edfab8..46261f653e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/FeatureId.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.mapswithme.maps.LightFramework; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/FilterStrategy.java b/android/src/com/mapswithme/maps/bookmarks/data/FilterStrategy.java index cd254717aa..bba0655f9b 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/FilterStrategy.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/FilterStrategy.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.Predicate; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Icon.java b/android/src/com/mapswithme/maps/bookmarks/data/Icon.java index b568340151..e1096c0049 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Icon.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Icon.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java index 9748a75bc6..f51e58db12 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/MapObject.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.ads.Banner; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java index 3b8fe72a5d..d9a849824a 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Metadata.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/android/src/com/mapswithme/maps/bookmarks/data/PaymentData.java b/android/src/com/mapswithme/maps/bookmarks/data/PaymentData.java index c9148b8013..5ea913fb94 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/PaymentData.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/PaymentData.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class PaymentData implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Result.java b/android/src/com/mapswithme/maps/bookmarks/data/Result.java index d15e8afae9..fbdeb3a0b7 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/Result.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/Result.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public class Result implements Parcelable { diff --git a/android/src/com/mapswithme/maps/bookmarks/data/SortedBlock.java b/android/src/com/mapswithme/maps/bookmarks/data/SortedBlock.java index 5b094fc640..7bcd4ccf8e 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/SortedBlock.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/SortedBlock.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.bookmarks.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/content/AbstractContextualListener.java b/android/src/com/mapswithme/maps/content/AbstractContextualListener.java index 180a0cfb32..fbcf945fa7 100644 --- a/android/src/com/mapswithme/maps/content/AbstractContextualListener.java +++ b/android/src/com/mapswithme/maps/content/AbstractContextualListener.java @@ -2,8 +2,7 @@ package com.mapswithme.maps.content; import android.app.Application; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; public class AbstractContextualListener { diff --git a/android/src/com/mapswithme/maps/content/DataSource.java b/android/src/com/mapswithme/maps/content/DataSource.java index 39bb883119..4be6142e36 100644 --- a/android/src/com/mapswithme/maps/content/DataSource.java +++ b/android/src/com/mapswithme/maps/content/DataSource.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.content; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface DataSource { diff --git a/android/src/com/mapswithme/maps/dialog/AlertDialog.java b/android/src/com/mapswithme/maps/dialog/AlertDialog.java index 6f24a55cc5..86c24f7292 100644 --- a/android/src/com/mapswithme/maps/dialog/AlertDialog.java +++ b/android/src/com/mapswithme/maps/dialog/AlertDialog.java @@ -4,16 +4,16 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatDialog; +import androidx.annotation.DrawableRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.AppCompatDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; @@ -404,7 +404,7 @@ public class AlertDialog extends BaseMwmDialogFragment int messageId = args.getInt(ARG_MESSAGE_ID); int positiveButtonId = args.getInt(ARG_POSITIVE_BUTTON_ID); int negativeButtonId = args.getInt(ARG_NEGATIVE_BUTTON_ID); - android.support.v7.app.AlertDialog.Builder builder = + androidx.appcompat.app.AlertDialog.Builder builder = DialogUtils.buildAlertDialog(instance.getContext(), titleId, messageId); builder.setPositiveButton(positiveButtonId, (dialog, which) -> instance.onPositiveClicked(which)); diff --git a/android/src/com/mapswithme/maps/dialog/ConfirmationDialogFactory.java b/android/src/com/mapswithme/maps/dialog/ConfirmationDialogFactory.java index ca268a83cc..cb56dfb106 100644 --- a/android/src/com/mapswithme/maps/dialog/ConfirmationDialogFactory.java +++ b/android/src/com/mapswithme/maps/dialog/ConfirmationDialogFactory.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.dialog; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class ConfirmationDialogFactory implements DialogFactory { diff --git a/android/src/com/mapswithme/maps/dialog/DefaultDialogFactory.java b/android/src/com/mapswithme/maps/dialog/DefaultDialogFactory.java index b8adac6c7d..4dc7400b47 100644 --- a/android/src/com/mapswithme/maps/dialog/DefaultDialogFactory.java +++ b/android/src/com/mapswithme/maps/dialog/DefaultDialogFactory.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.dialog; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class DefaultDialogFactory implements DialogFactory { diff --git a/android/src/com/mapswithme/maps/dialog/DialogFactory.java b/android/src/com/mapswithme/maps/dialog/DialogFactory.java index cdb5cc540a..bcb0dc1c17 100644 --- a/android/src/com/mapswithme/maps/dialog/DialogFactory.java +++ b/android/src/com/mapswithme/maps/dialog/DialogFactory.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.dialog; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface DialogFactory { diff --git a/android/src/com/mapswithme/maps/dialog/DialogUtils.java b/android/src/com/mapswithme/maps/dialog/DialogUtils.java index a6db8100d8..59331e21be 100644 --- a/android/src/com/mapswithme/maps/dialog/DialogUtils.java +++ b/android/src/com/mapswithme/maps/dialog/DialogUtils.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java index 53f8233d5e..807310f7aa 100644 --- a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java +++ b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java @@ -4,11 +4,11 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.InputFilter; import android.text.TextUtils; import android.view.View; diff --git a/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java b/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java index 9ed8961114..40dc384877 100644 --- a/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java +++ b/android/src/com/mapswithme/maps/dialog/ProgressDialogFragment.java @@ -4,10 +4,10 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java b/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java index 8edf2f82f0..bc0f435cdd 100644 --- a/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java +++ b/android/src/com/mapswithme/maps/dialog/ResolveDialogViewStrategy.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.dialog; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface ResolveDialogViewStrategy { diff --git a/android/src/com/mapswithme/maps/dialog/ResolveFragmentManagerStrategy.java b/android/src/com/mapswithme/maps/dialog/ResolveFragmentManagerStrategy.java index d1fb149fe5..68c76adfef 100644 --- a/android/src/com/mapswithme/maps/dialog/ResolveFragmentManagerStrategy.java +++ b/android/src/com/mapswithme/maps/dialog/ResolveFragmentManagerStrategy.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.dialog; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; public interface ResolveFragmentManagerStrategy { diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java b/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java index 37903f41b4..ef95ae785c 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.discovery; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.maps.activity.CustomNavigateUpListener; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java index 6d1a1a59d0..ee6b15ba03 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java @@ -7,13 +7,13 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.IdRes; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.IdRes; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java index ca848c88c7..232c8077f8 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryManager.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.discovery; import android.annotation.SuppressLint; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.promo.PromoCityGallery; import com.mapswithme.maps.search.SearchResult; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryParams.java b/android/src/com/mapswithme/maps/discovery/DiscoveryParams.java index 4840511488..f2d6668d60 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryParams.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryParams.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.discovery; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/discovery/DiscoveryResultReceiver.java b/android/src/com/mapswithme/maps/discovery/DiscoveryResultReceiver.java index bf04dbff02..550729f3bf 100644 --- a/android/src/com/mapswithme/maps/discovery/DiscoveryResultReceiver.java +++ b/android/src/com/mapswithme/maps/discovery/DiscoveryResultReceiver.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.discovery; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; import com.mapswithme.maps.promo.PromoCityGallery; import com.mapswithme.maps.search.SearchResult; diff --git a/android/src/com/mapswithme/maps/discovery/ItemType.java b/android/src/com/mapswithme/maps/discovery/ItemType.java index f8bc654cca..30dd58a5a1 100644 --- a/android/src/com/mapswithme/maps/discovery/ItemType.java +++ b/android/src/com/mapswithme/maps/discovery/ItemType.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.discovery; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.maps.search.SearchResult; diff --git a/android/src/com/mapswithme/maps/discovery/LocalExpert.java b/android/src/com/mapswithme/maps/discovery/LocalExpert.java index 7f26cc6104..3689bd3307 100644 --- a/android/src/com/mapswithme/maps/discovery/LocalExpert.java +++ b/android/src/com/mapswithme/maps/discovery/LocalExpert.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.discovery; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public final class LocalExpert implements Parcelable { diff --git a/android/src/com/mapswithme/maps/discovery/Locals.java b/android/src/com/mapswithme/maps/discovery/Locals.java index c7271cd2c5..3b17fe9e96 100644 --- a/android/src/com/mapswithme/maps/discovery/Locals.java +++ b/android/src/com/mapswithme/maps/discovery/Locals.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.discovery; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.NetworkPolicy; import com.mapswithme.util.concurrency.UiThread; diff --git a/android/src/com/mapswithme/maps/discovery/LocalsError.java b/android/src/com/mapswithme/maps/discovery/LocalsError.java index 9e064dfd5b..977df7fa71 100644 --- a/android/src/com/mapswithme/maps/discovery/LocalsError.java +++ b/android/src/com/mapswithme/maps/discovery/LocalsError.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.discovery; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/downloader/BottomPanel.java b/android/src/com/mapswithme/maps/downloader/BottomPanel.java index 9812d9df62..4cb48fb563 100644 --- a/android/src/com/mapswithme/maps/downloader/BottomPanel.java +++ b/android/src/com/mapswithme/maps/downloader/BottomPanel.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.downloader; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.view.View; import android.widget.Button; diff --git a/android/src/com/mapswithme/maps/downloader/CountryItem.java b/android/src/com/mapswithme/maps/downloader/CountryItem.java index c02438937a..9aab8abc9d 100644 --- a/android/src/com/mapswithme/maps/downloader/CountryItem.java +++ b/android/src/com/mapswithme/maps/downloader/CountryItem.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.downloader; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; /** diff --git a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java index 7968c817ad..aa96c1158a 100644 --- a/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java +++ b/android/src/com/mapswithme/maps/downloader/CountrySuggestFragment.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.downloader; import android.location.Location; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java b/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java index 7477a98173..6bbf011c53 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.downloader; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.base.OnBackPressListener; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java index 76158898af..12a4ac27eb 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderAdapter.java @@ -5,14 +5,14 @@ import android.content.DialogInterface; import android.content.Intent; import android.graphics.Typeface; import android.location.Location; -import android.support.annotation.DrawableRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.style.StyleSpan; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java index 7b78710363..9c7d8cd151 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderFragment.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.downloader; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.WindowManager; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java index c4e94f4ccf..3db5b124a1 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBanner.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.downloader; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import com.mapswithme.util.statistics.StatisticValueConverter; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBannerStats.java b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBannerStats.java index b12896d703..ef6deae5fd 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderPromoBannerStats.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderPromoBannerStats.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.downloader; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.statistics.Statistics; diff --git a/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java b/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java index 72f0a8a9c6..53f0b1775e 100644 --- a/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java +++ b/android/src/com/mapswithme/maps/downloader/DownloaderStatusIcon.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.downloader; -import android.support.annotation.AttrRes; -import android.support.annotation.DrawableRes; +import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import android.util.SparseIntArray; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java b/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java index 98e7eb11b2..36aae9dcd0 100644 --- a/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java +++ b/android/src/com/mapswithme/maps/downloader/ExpandRetryConfirmationListener.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.downloader; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java index c02a81d220..af7baa5a55 100644 --- a/android/src/com/mapswithme/maps/downloader/MapManager.java +++ b/android/src/com/mapswithme/maps/downloader/MapManager.java @@ -3,11 +3,11 @@ package com.mapswithme.maps.downloader; import android.app.Activity; import android.app.Application; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.annotation.UiThread; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.annotation.UiThread; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java index 24eb6ad0c5..6d6f1a13ac 100644 --- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java +++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.downloader; import android.location.Location; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java b/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java index 1a01a1540b..12ec5ec394 100644 --- a/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java +++ b/android/src/com/mapswithme/maps/downloader/RetryFailedDownloadConfirmationListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.downloader; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.background.Notifier; diff --git a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java index 1a81ee02a9..82ed88d5b9 100644 --- a/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java +++ b/android/src/com/mapswithme/maps/downloader/UpdaterDialogFragment.java @@ -3,13 +3,13 @@ package com.mapswithme.maps.downloader; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.view.View; import android.view.Window; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java index 94b4b98e88..34588f69d6 100644 --- a/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java +++ b/android/src/com/mapswithme/maps/editor/AdvancedTimetableFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; diff --git a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java index 5884bf4401..29dafe9787 100644 --- a/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthDialogFragment.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.editor; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/AuthFragment.java b/android/src/com/mapswithme/maps/editor/AuthFragment.java index c49b9911e7..9eb6abb614 100644 --- a/android/src/com/mapswithme/maps/editor/AuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/AuthFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/CuisineAdapter.java b/android/src/com/mapswithme/maps/editor/CuisineAdapter.java index b4a6a6146e..b0f856586c 100644 --- a/android/src/com/mapswithme/maps/editor/CuisineAdapter.java +++ b/android/src/com/mapswithme/maps/editor/CuisineAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.editor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/CuisineFragment.java b/android/src/com/mapswithme/maps/editor/CuisineFragment.java index c91897e4c1..d9004d07d9 100644 --- a/android/src/com/mapswithme/maps/editor/CuisineFragment.java +++ b/android/src/com/mapswithme/maps/editor/CuisineFragment.java @@ -1,7 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/editor/Editor.java b/android/src/com/mapswithme/maps/editor/Editor.java index 86379cc1c8..e92eab8152 100644 --- a/android/src/com/mapswithme/maps/editor/Editor.java +++ b/android/src/com/mapswithme/maps/editor/Editor.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.editor; import android.content.Context; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Size; -import android.support.annotation.WorkerThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Size; +import androidx.annotation.WorkerThread; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/editor/EditorActivity.java b/android/src/com/mapswithme/maps/editor/EditorActivity.java index e4fbf76168..5913c37882 100644 --- a/android/src/com/mapswithme/maps/editor/EditorActivity.java +++ b/android/src/com/mapswithme/maps/editor/EditorActivity.java @@ -2,13 +2,10 @@ package com.mapswithme.maps.editor; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; -import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragmentActivity; -import com.mapswithme.util.ThemeUtils; public class EditorActivity extends BaseMwmFragmentActivity { diff --git a/android/src/com/mapswithme/maps/editor/EditorFragment.java b/android/src/com/mapswithme/maps/editor/EditorFragment.java index 5e62fea92a..bae79707b2 100644 --- a/android/src/com/mapswithme/maps/editor/EditorFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorFragment.java @@ -4,15 +4,15 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.design.widget.TextInputLayout; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.CallSuper; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import com.google.android.material.textfield.TextInputLayout; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SwitchCompat; import android.text.InputType; import android.text.TextUtils; import android.util.SparseArray; diff --git a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java index 884f92566b..9cb252d7cf 100644 --- a/android/src/com/mapswithme/maps/editor/EditorHostFragment.java +++ b/android/src/com/mapswithme/maps/editor/EditorHostFragment.java @@ -4,12 +4,12 @@ import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java index eee4f4dddd..6fffcb6ea6 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryActivity.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.editor; import android.content.Intent; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.editor.data.FeatureCategory; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java index ec14e08caa..c124dea07e 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java index 36ddf284a3..480a873baf 100644 --- a/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java +++ b/android/src/com/mapswithme/maps/editor/FeatureCategoryFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java index b1168cfb63..d7a1b04071 100644 --- a/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java +++ b/android/src/com/mapswithme/maps/editor/HoursMinutesPickerFragment.java @@ -6,12 +6,12 @@ import android.content.Context; import android.content.DialogInterface; import android.content.res.ColorStateList; import android.os.Bundle; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AlertDialog; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AlertDialog; import android.text.format.DateFormat; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java b/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java index 6f8c5c107e..a5d7fc2960 100644 --- a/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java +++ b/android/src/com/mapswithme/maps/editor/LanguagesAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.editor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java index 1f5f4a5d54..f3ef40d903 100644 --- a/android/src/com/mapswithme/maps/editor/LanguagesFragment.java +++ b/android/src/com/mapswithme/maps/editor/LanguagesFragment.java @@ -1,8 +1,7 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; import com.mapswithme.maps.editor.data.Language; diff --git a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java index 8964bbec2a..bd0e0c118d 100644 --- a/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java +++ b/android/src/com/mapswithme/maps/editor/MultilanguageAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor; -import android.support.annotation.NonNull; -import android.support.design.widget.TextInputLayout; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.textfield.TextInputLayout; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/OpeningHours.java b/android/src/com/mapswithme/maps/editor/OpeningHours.java index 3f57ba400c..eee1d94012 100644 --- a/android/src/com/mapswithme/maps/editor/OpeningHours.java +++ b/android/src/com/mapswithme/maps/editor/OpeningHours.java @@ -1,10 +1,8 @@ package com.mapswithme.maps.editor; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; - -import java.sql.Time; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.editor.data.Timespan; import com.mapswithme.maps.editor.data.Timetable; diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java b/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java index b214f40fc6..e0814f2fd7 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java index 1cb3702253..44b5a8c72c 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragment.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.graphics.LightingColorFilter; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java index baedfde668..8943962ebd 100644 --- a/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java +++ b/android/src/com/mapswithme/maps/editor/OsmAuthFragmentDelegate.java @@ -3,11 +3,11 @@ package com.mapswithme.maps.editor; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.Nullable; -import android.support.annotation.Size; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.IdRes; +import androidx.annotation.Nullable; +import androidx.annotation.Size; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/editor/OsmOAuth.java b/android/src/com/mapswithme/maps/editor/OsmOAuth.java index 1c84eaec12..22728f543c 100644 --- a/android/src/com/mapswithme/maps/editor/OsmOAuth.java +++ b/android/src/com/mapswithme/maps/editor/OsmOAuth.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.editor; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; -import android.support.annotation.Size; -import android.support.annotation.WorkerThread; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import androidx.annotation.Size; +import androidx.annotation.WorkerThread; import java.lang.ref.WeakReference; diff --git a/android/src/com/mapswithme/maps/editor/ProfileActivity.java b/android/src/com/mapswithme/maps/editor/ProfileActivity.java index ec1d92b59d..9929ec3e82 100644 --- a/android/src/com/mapswithme/maps/editor/ProfileActivity.java +++ b/android/src/com/mapswithme/maps/editor/ProfileActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/editor/ProfileFragment.java b/android/src/com/mapswithme/maps/editor/ProfileFragment.java index 949cab078b..45b44cf3b0 100644 --- a/android/src/com/mapswithme/maps/editor/ProfileFragment.java +++ b/android/src/com/mapswithme/maps/editor/ProfileFragment.java @@ -4,11 +4,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; import android.text.format.DateUtils; import android.view.View; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/editor/ReportActivity.java b/android/src/com/mapswithme/maps/editor/ReportActivity.java index 11fbced37c..ed1caff174 100644 --- a/android/src/com/mapswithme/maps/editor/ReportActivity.java +++ b/android/src/com/mapswithme/maps/editor/ReportActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/editor/ReportFragment.java b/android/src/com/mapswithme/maps/editor/ReportFragment.java index 231d26a4de..87aab4130a 100644 --- a/android/src/com/mapswithme/maps/editor/ReportFragment.java +++ b/android/src/com/mapswithme/maps/editor/ReportFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java index d8c1d5702d..cbff560534 100644 --- a/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java +++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableAdapter.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.editor; -import android.support.annotation.IdRes; -import android.support.annotation.IntRange; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.IdRes; +import androidx.annotation.IntRange; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SwitchCompat; import android.util.SparseArray; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java index 19fc385306..91c896524f 100644 --- a/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java +++ b/android/src/com/mapswithme/maps/editor/SimpleTimetableFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/StreetAdapter.java b/android/src/com/mapswithme/maps/editor/StreetAdapter.java index cd31cff64d..df90ee5f26 100644 --- a/android/src/com/mapswithme/maps/editor/StreetAdapter.java +++ b/android/src/com/mapswithme/maps/editor/StreetAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/StreetFragment.java b/android/src/com/mapswithme/maps/editor/StreetFragment.java index f3a575dc7c..ce57372135 100644 --- a/android/src/com/mapswithme/maps/editor/StreetFragment.java +++ b/android/src/com/mapswithme/maps/editor/StreetFragment.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.editor; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java b/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java index 1fa12e4210..7e5d6f1d29 100644 --- a/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java +++ b/android/src/com/mapswithme/maps/editor/TimetableChangedListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; interface TimetableChangedListener { diff --git a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java index 545ffe00b0..b1af53acfa 100644 --- a/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java +++ b/android/src/com/mapswithme/maps/editor/TimetableContainerFragment.java @@ -2,12 +2,12 @@ package com.mapswithme.maps.editor; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/editor/TimetableProvider.java b/android/src/com/mapswithme/maps/editor/TimetableProvider.java index f3b26c94d5..d89e14a982 100644 --- a/android/src/com/mapswithme/maps/editor/TimetableProvider.java +++ b/android/src/com/mapswithme/maps/editor/TimetableProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; interface TimetableProvider { diff --git a/android/src/com/mapswithme/maps/editor/ViralFragment.java b/android/src/com/mapswithme/maps/editor/ViralFragment.java index 6bc6641dcb..97a1b352f5 100644 --- a/android/src/com/mapswithme/maps/editor/ViralFragment.java +++ b/android/src/com/mapswithme/maps/editor/ViralFragment.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.editor; import android.annotation.SuppressLint; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java b/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java index a401c170bd..cc642ffd9f 100644 --- a/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java +++ b/android/src/com/mapswithme/maps/editor/data/FeatureCategory.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.editor.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class FeatureCategory implements Parcelable { diff --git a/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java b/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java index 0800beee84..ca95432c8e 100644 --- a/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java +++ b/android/src/com/mapswithme/maps/editor/data/HoursMinutes.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.editor.data; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntRange; +import androidx.annotation.IntRange; import android.text.format.DateFormat; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/editor/data/Language.java b/android/src/com/mapswithme/maps/editor/data/Language.java index f2dca4d4be..6981c648d9 100644 --- a/android/src/com/mapswithme/maps/editor/data/Language.java +++ b/android/src/com/mapswithme/maps/editor/data/Language.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; // Corresponds to StringUtf8Multilang::Lang in core. public class Language diff --git a/android/src/com/mapswithme/maps/editor/data/LocalizedName.java b/android/src/com/mapswithme/maps/editor/data/LocalizedName.java index 3ff3ed4c17..e984e8a0ec 100644 --- a/android/src/com/mapswithme/maps/editor/data/LocalizedName.java +++ b/android/src/com/mapswithme/maps/editor/data/LocalizedName.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class LocalizedName { diff --git a/android/src/com/mapswithme/maps/editor/data/LocalizedStreet.java b/android/src/com/mapswithme/maps/editor/data/LocalizedStreet.java index 138a01a751..40ae98f682 100644 --- a/android/src/com/mapswithme/maps/editor/data/LocalizedStreet.java +++ b/android/src/com/mapswithme/maps/editor/data/LocalizedStreet.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.editor.data; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class LocalizedStreet { diff --git a/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java b/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java index e1da7521d7..894e6285c2 100644 --- a/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java +++ b/android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.editor.data; import android.content.res.Resources; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import java.text.DateFormatSymbols; import java.util.Locale; diff --git a/android/src/com/mapswithme/maps/editor/data/Timetable.java b/android/src/com/mapswithme/maps/editor/data/Timetable.java index f37b254762..9dbf69bf25 100644 --- a/android/src/com/mapswithme/maps/editor/data/Timetable.java +++ b/android/src/com/mapswithme/maps/editor/data/Timetable.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.editor.data; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; public class Timetable { diff --git a/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java index 9c11d8f24c..960add4537 100644 --- a/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/AdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import java.util.ArrayList; diff --git a/android/src/com/mapswithme/maps/gallery/Constants.java b/android/src/com/mapswithme/maps/gallery/Constants.java index a668895d3c..9f2d34dd9a 100644 --- a/android/src/com/mapswithme/maps/gallery/Constants.java +++ b/android/src/com/mapswithme/maps/gallery/Constants.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java index 06ae40dcb4..278b344c77 100644 --- a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java +++ b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java @@ -4,12 +4,12 @@ import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v4.graphics.drawable.RoundedBitmapDrawable; -import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.View; diff --git a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java index f9353b1187..5f1abc426e 100644 --- a/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java +++ b/android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryActivity.java b/android/src/com/mapswithme/maps/gallery/GalleryActivity.java index bd9b7b6805..5f1ddcf661 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryActivity.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryActivity.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.gallery; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmExtraTitleActivity; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java index e86da19c65..7d593cf717 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.ViewGroup; public class GalleryAdapter, I extends Items.Item> diff --git a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java index dbfae12720..f643cfd249 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryFragment.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryFragment.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.gallery; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java b/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java index 14724038d5..78572e8e57 100644 --- a/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.gallery; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import java.util.List; diff --git a/android/src/com/mapswithme/maps/gallery/Holders.java b/android/src/com/mapswithme/maps/gallery/Holders.java index fa836d2694..e727d114bc 100644 --- a/android/src/com/mapswithme/maps/gallery/Holders.java +++ b/android/src/com/mapswithme/maps/gallery/Holders.java @@ -6,12 +6,12 @@ import android.graphics.Bitmap; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.shapes.RectShape; import android.net.Uri; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.graphics.drawable.RoundedBitmapDrawable; -import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.RoundedBitmapDrawable; +import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.view.View; diff --git a/android/src/com/mapswithme/maps/gallery/Image.java b/android/src/com/mapswithme/maps/gallery/Image.java index 8812814779..1b89cb7838 100644 --- a/android/src/com/mapswithme/maps/gallery/Image.java +++ b/android/src/com/mapswithme/maps/gallery/Image.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.gallery; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class Image implements Parcelable { diff --git a/android/src/com/mapswithme/maps/gallery/ImageAdapter.java b/android/src/com/mapswithme/maps/gallery/ImageAdapter.java index ff0d977ac8..c860ba8b12 100644 --- a/android/src/com/mapswithme/maps/gallery/ImageAdapter.java +++ b/android/src/com/mapswithme/maps/gallery/ImageAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/ItemSelectedListener.java b/android/src/com/mapswithme/maps/gallery/ItemSelectedListener.java index 13caa5736c..4b96fb31c1 100644 --- a/android/src/com/mapswithme/maps/gallery/ItemSelectedListener.java +++ b/android/src/com/mapswithme/maps/gallery/ItemSelectedListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface ItemSelectedListener { diff --git a/android/src/com/mapswithme/maps/gallery/Items.java b/android/src/com/mapswithme/maps/gallery/Items.java index e5b1e9dbb4..54e78e3065 100644 --- a/android/src/com/mapswithme/maps/gallery/Items.java +++ b/android/src/com/mapswithme/maps/gallery/Items.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java index 4d1cd99050..3dbb2d04e2 100644 --- a/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/LoadingAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; public abstract class LoadingAdapterStrategy diff --git a/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java index 1b15a97f93..3ef2547a48 100644 --- a/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/OfflineAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java index e0cef59261..7fc34d03bc 100644 --- a/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.ViewGroup; import java.util.List; diff --git a/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java index 22da1f3173..dadd450aa4 100644 --- a/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.gallery; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java index 4b1cf4be75..750423b655 100644 --- a/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.gallery; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java b/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java index b42739f708..3525ce8f5b 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java +++ b/android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.gallery.ItemSelectedListener; import com.mapswithme.maps.gallery.Items; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java index 9f27734670..25f00338b5 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java index c4fc9bead9..6454700cb1 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java index 5688710bc6..d47c366bf5 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/Factory.java b/android/src/com/mapswithme/maps/gallery/impl/Factory.java index 752ba187fb..7140b2d891 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/Factory.java +++ b/android/src/com/mapswithme/maps/gallery/impl/Factory.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.gallery.impl; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.R; import com.mapswithme.maps.discovery.LocalExpert; diff --git a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java index 8d28c87d11..d9079c683b 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java index a819b2d2a7..1cd929266f 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java index a5cb734f25..34376d5ab9 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java index 48b6465df1..870b2606b2 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java b/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java index 28149256f9..892cae6892 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java +++ b/android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.discovery.ItemType; import com.mapswithme.maps.gallery.Items; diff --git a/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java b/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java index 684738364d..440b4aa756 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java +++ b/android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java index 067c9d3b5e..fdd13d15b9 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java index 47debc43f9..b2966e8aa7 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java b/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java index bc7e0b5b93..16511f1311 100644 --- a/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java +++ b/android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.gallery.impl; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/gdpr/MwmOptOutActivity.java b/android/src/com/mapswithme/maps/gdpr/MwmOptOutActivity.java index de38ef7662..5f0a82eebb 100644 --- a/android/src/com/mapswithme/maps/gdpr/MwmOptOutActivity.java +++ b/android/src/com/mapswithme/maps/gdpr/MwmOptOutActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.gdpr; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/gdpr/OptOutFragment.java b/android/src/com/mapswithme/maps/gdpr/OptOutFragment.java index c21570533a..bb8c9f303e 100644 --- a/android/src/com/mapswithme/maps/gdpr/OptOutFragment.java +++ b/android/src/com/mapswithme/maps/gdpr/OptOutFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.gdpr; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/geofence/Factory.java b/android/src/com/mapswithme/maps/geofence/Factory.java index 1cfcbc91e0..282c5a61f0 100644 --- a/android/src/com/mapswithme/maps/geofence/Factory.java +++ b/android/src/com/mapswithme/maps/geofence/Factory.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.geofence; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.android.gms.location.Geofence; import com.mapswithme.maps.bookmarks.data.FeatureId; diff --git a/android/src/com/mapswithme/maps/geofence/GeoFenceFeature.java b/android/src/com/mapswithme/maps/geofence/GeoFenceFeature.java index f838761ea6..2a46a1cffa 100644 --- a/android/src/com/mapswithme/maps/geofence/GeoFenceFeature.java +++ b/android/src/com/mapswithme/maps/geofence/GeoFenceFeature.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.geofence; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.bookmarks.data.FeatureId; diff --git a/android/src/com/mapswithme/maps/geofence/GeofenceLocation.java b/android/src/com/mapswithme/maps/geofence/GeofenceLocation.java index 17ee4b32c9..7fa80e1afc 100644 --- a/android/src/com/mapswithme/maps/geofence/GeofenceLocation.java +++ b/android/src/com/mapswithme/maps/geofence/GeofenceLocation.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.geofence; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class GeofenceLocation { diff --git a/android/src/com/mapswithme/maps/geofence/GeofenceRegistry.java b/android/src/com/mapswithme/maps/geofence/GeofenceRegistry.java index 1e0f1f3f37..09a073c252 100644 --- a/android/src/com/mapswithme/maps/geofence/GeofenceRegistry.java +++ b/android/src/com/mapswithme/maps/geofence/GeofenceRegistry.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.geofence; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.location.LocationPermissionNotGrantedException; diff --git a/android/src/com/mapswithme/maps/geofence/GeofenceRegistryImpl.java b/android/src/com/mapswithme/maps/geofence/GeofenceRegistryImpl.java index 6070610960..7871db2903 100644 --- a/android/src/com/mapswithme/maps/geofence/GeofenceRegistryImpl.java +++ b/android/src/com/mapswithme/maps/geofence/GeofenceRegistryImpl.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.geofence; import android.app.Application; import android.app.PendingIntent; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.android.gms.location.Geofence; import com.google.android.gms.location.GeofencingClient; diff --git a/android/src/com/mapswithme/maps/geofence/GeofenceTransitionsIntentService.java b/android/src/com/mapswithme/maps/geofence/GeofenceTransitionsIntentService.java index 54b5b4e817..5d02518fbb 100644 --- a/android/src/com/mapswithme/maps/geofence/GeofenceTransitionsIntentService.java +++ b/android/src/com/mapswithme/maps/geofence/GeofenceTransitionsIntentService.java @@ -6,8 +6,8 @@ import android.content.Intent; import android.location.Location; import android.os.Handler; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.v4.app.JobIntentService; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; import com.google.android.gms.location.Geofence; import com.google.android.gms.location.GeofencingEvent; diff --git a/android/src/com/mapswithme/maps/intent/Factory.java b/android/src/com/mapswithme/maps/intent/Factory.java index 82df218fdc..2f06cbb0a5 100644 --- a/android/src/com/mapswithme/maps/intent/Factory.java +++ b/android/src/com/mapswithme/maps/intent/Factory.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.intent; import android.content.ContentResolver; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import com.crashlytics.android.Crashlytics; diff --git a/android/src/com/mapswithme/maps/intent/IntentProcessor.java b/android/src/com/mapswithme/maps/intent/IntentProcessor.java index 2ba1bc031a..3f38ab3b44 100644 --- a/android/src/com/mapswithme/maps/intent/IntentProcessor.java +++ b/android/src/com/mapswithme/maps/intent/IntentProcessor.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.intent; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public interface IntentProcessor { diff --git a/android/src/com/mapswithme/maps/intent/MapTask.java b/android/src/com/mapswithme/maps/intent/MapTask.java index b674861f54..f9563c8cd0 100644 --- a/android/src/com/mapswithme/maps/intent/MapTask.java +++ b/android/src/com/mapswithme/maps/intent/MapTask.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmActivity; diff --git a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java index 54017d6893..6f03248e0d 100644 --- a/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java +++ b/android/src/com/mapswithme/maps/location/AndroidNativeProvider.java @@ -4,8 +4,8 @@ import android.content.Context; import android.location.Location; import android.location.LocationListener; import android.location.LocationManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/location/BaseLocationListener.java b/android/src/com/mapswithme/maps/location/BaseLocationListener.java index de2769d55a..03afd97e9c 100644 --- a/android/src/com/mapswithme/maps/location/BaseLocationListener.java +++ b/android/src/com/mapswithme/maps/location/BaseLocationListener.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.location; import android.location.Location; import android.location.LocationListener; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/location/BaseLocationProvider.java b/android/src/com/mapswithme/maps/location/BaseLocationProvider.java index 5b02bddf54..179caef083 100644 --- a/android/src/com/mapswithme/maps/location/BaseLocationProvider.java +++ b/android/src/com/mapswithme/maps/location/BaseLocationProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java b/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java index 99ceccd9ea..0685dfa03e 100644 --- a/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/DefaultLocationFixChecker.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.LocationUtils; diff --git a/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java b/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java index fe4ba5cf7e..c21ae5fa35 100644 --- a/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/FusedLocationFixChecker.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class FusedLocationFixChecker extends DefaultLocationFixChecker { diff --git a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java index ee8a5cad3e..d47af6a315 100644 --- a/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java +++ b/android/src/com/mapswithme/maps/location/GoogleFusedLocationProvider.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.location; import android.location.Location; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.api.GoogleApiClient; diff --git a/android/src/com/mapswithme/maps/location/LocationFixChecker.java b/android/src/com/mapswithme/maps/location/LocationFixChecker.java index 5df6a6ec18..f7365e6c57 100644 --- a/android/src/com/mapswithme/maps/location/LocationFixChecker.java +++ b/android/src/com/mapswithme/maps/location/LocationFixChecker.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.location; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; interface LocationFixChecker { diff --git a/android/src/com/mapswithme/maps/location/LocationHelper.java b/android/src/com/mapswithme/maps/location/LocationHelper.java index dd59f5e9c0..e6f9619445 100644 --- a/android/src/com/mapswithme/maps/location/LocationHelper.java +++ b/android/src/com/mapswithme/maps/location/LocationHelper.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.location; import android.app.Activity; import android.location.Location; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; @@ -20,7 +20,6 @@ import com.mapswithme.util.PermissionsUtils; import com.mapswithme.util.Utils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; -import com.mapswithme.util.statistics.PushwooshHelper; public enum LocationHelper { diff --git a/android/src/com/mapswithme/maps/location/LocationState.java b/android/src/com/mapswithme/maps/location/LocationState.java index 8c6b464f3e..2cc0de5255 100644 --- a/android/src/com/mapswithme/maps/location/LocationState.java +++ b/android/src/com/mapswithme/maps/location/LocationState.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.location; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/location/PlatformSocket.java b/android/src/com/mapswithme/maps/location/PlatformSocket.java index 002e783efc..47c3a32a44 100644 --- a/android/src/com/mapswithme/maps/location/PlatformSocket.java +++ b/android/src/com/mapswithme/maps/location/PlatformSocket.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.location; import android.annotation.SuppressLint; import android.net.SSLCertificateSocketFactory; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.BuildConfig; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/maps/location/SensorData.java b/android/src/com/mapswithme/maps/location/SensorData.java index bbacc081ea..72720f9d38 100644 --- a/android/src/com/mapswithme/maps/location/SensorData.java +++ b/android/src/com/mapswithme/maps/location/SensorData.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.location; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; class SensorData { diff --git a/android/src/com/mapswithme/maps/location/SensorHelper.java b/android/src/com/mapswithme/maps/location/SensorHelper.java index a36d2dce8f..bab4837647 100644 --- a/android/src/com/mapswithme/maps/location/SensorHelper.java +++ b/android/src/com/mapswithme/maps/location/SensorHelper.java @@ -9,7 +9,7 @@ import android.hardware.SensorManager; import android.location.Location; import android.os.Handler; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.LocationUtils; diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java index be334be490..8653de8a69 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorder.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.location.Location; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.background.AppBackgroundTracker; diff --git a/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java b/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java index c6d7ca1e65..1867fb7d47 100644 --- a/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java +++ b/android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java @@ -4,8 +4,8 @@ import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.JobIntentService; +import androidx.annotation.NonNull; +import androidx.core.app.JobIntentService; import android.util.Log; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/location/TransitionListener.java b/android/src/com/mapswithme/maps/location/TransitionListener.java index 9d7b685f1b..6ba132b5e9 100644 --- a/android/src/com/mapswithme/maps/location/TransitionListener.java +++ b/android/src/com/mapswithme/maps/location/TransitionListener.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.location; import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.background.AppBackgroundTracker; diff --git a/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java b/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java index ccbfb67c70..5398cb1ec6 100644 --- a/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java +++ b/android/src/com/mapswithme/maps/maplayer/BottomSheetItem.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.maplayer; import android.content.Context; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java index 5e0a51d99b..b359fe8fbf 100644 --- a/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java +++ b/android/src/com/mapswithme/maps/maplayer/MapLayerCompositeController.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.maplayer; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; import android.view.View; import com.mapswithme.maps.maplayer.subway.SubwayMapLayerController; diff --git a/android/src/com/mapswithme/maps/maplayer/Mode.java b/android/src/com/mapswithme/maps/maplayer/Mode.java index e0db7b281c..349919b2eb 100644 --- a/android/src/com/mapswithme/maps/maplayer/Mode.java +++ b/android/src/com/mapswithme/maps/maplayer/Mode.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.maplayer; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.maplayer.subway.SubwayManager; import com.mapswithme.maps.maplayer.traffic.TrafficManager; diff --git a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java index 7a489fcb95..7f8676468e 100644 --- a/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java +++ b/android/src/com/mapswithme/maps/maplayer/ToggleMapLayerDialog.java @@ -4,17 +4,16 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.BottomSheetBehavior; -import android.support.design.widget.BottomSheetDialog; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; @@ -26,7 +25,6 @@ import com.mapswithme.maps.R; import com.mapswithme.maps.adapter.OnItemClickListener; import com.mapswithme.maps.maplayer.subway.OnSubwayLayerToggleListener; import com.mapswithme.maps.maplayer.traffic.OnTrafficLayerToggleListener; -import com.mapswithme.maps.metrics.UserActionsLogger; import com.mapswithme.maps.widget.recycler.SpanningLinearLayoutManager; import java.util.Arrays; @@ -55,7 +53,7 @@ public class ToggleMapLayerDialog extends DialogFragment private void onShow(@NonNull DialogInterface dialogInterface) { BottomSheetDialog dialog = (BottomSheetDialog) dialogInterface; - View bottomSheet = dialog.findViewById(android.support.design.R.id.design_bottom_sheet); + View bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet); BottomSheetBehavior behavior = BottomSheetBehavior.from(Objects.requireNonNull(bottomSheet)); behavior.setState(BottomSheetBehavior.STATE_EXPANDED); } diff --git a/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java b/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java index 71cda22edf..4b51994761 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/OnTransitSchemeChangedListener.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.maplayer.subway; import android.app.Application; import android.content.Context; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; import com.mapswithme.maps.content.AbstractContextualListener; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java b/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java index fc320644ef..40f8aa31d6 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/SubwayManager.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.maplayer.subway; import android.app.Application; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java b/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java index d2e38b17c4..150fb77571 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/SubwayMapLayerController.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.maplayer.subway; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java b/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java index 5b85891ce1..367e6b705c 100644 --- a/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java +++ b/android/src/com/mapswithme/maps/maplayer/subway/TransitSchemeState.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.maplayer.subway; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.Toast; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java index fd0de9ed79..7b43a332b2 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficManager.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.maplayer.traffic; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficState.java b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficState.java index 52458121b9..69b4be9589 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/TrafficState.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/TrafficState.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.maplayer.traffic; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; import com.mapswithme.util.statistics.Statistics; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java index f704bb02c7..4b98ed2b27 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButton.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.widget.ImageButton; import android.widget.RelativeLayout; diff --git a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java index e032ab5b74..c8ca5cf53a 100644 --- a/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java +++ b/android/src/com/mapswithme/maps/maplayer/traffic/widget/TrafficButtonController.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.widget.Toast; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java b/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java index 864d095319..ea5550d27b 100644 --- a/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java +++ b/android/src/com/mapswithme/maps/metrics/UserActionsLogger.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.metrics; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.discovery.DiscoveryUserEvent; import com.mapswithme.maps.tips.TutorialAction; diff --git a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java index 7d7d293a87..448808ac9f 100644 --- a/android/src/com/mapswithme/maps/news/BaseNewsFragment.java +++ b/android/src/com/mapswithme/maps/news/BaseNewsFragment.java @@ -4,17 +4,17 @@ import android.app.Dialog; import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.ArrayRes; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.ArrayRes; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.widget.SwitchCompat; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/news/IntroductionDialogFragment.java b/android/src/com/mapswithme/maps/news/IntroductionDialogFragment.java index 49152240b3..968aea60f2 100644 --- a/android/src/com/mapswithme/maps/news/IntroductionDialogFragment.java +++ b/android/src/com/mapswithme/maps/news/IntroductionDialogFragment.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.news; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentManager; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/news/IntroductionScreenFactory.java b/android/src/com/mapswithme/maps/news/IntroductionScreenFactory.java index ad47b8e02b..d7b6bdf791 100644 --- a/android/src/com/mapswithme/maps/news/IntroductionScreenFactory.java +++ b/android/src/com/mapswithme/maps/news/IntroductionScreenFactory.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.news; import android.app.Activity; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.BookmarkCategoriesActivity; diff --git a/android/src/com/mapswithme/maps/news/NewsFragment.java b/android/src/com/mapswithme/maps/news/NewsFragment.java index dc8c2b9edf..c3d1aca504 100644 --- a/android/src/com/mapswithme/maps/news/NewsFragment.java +++ b/android/src/com/mapswithme/maps/news/NewsFragment.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.news; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/news/OnIntroductionButtonClickListener.java b/android/src/com/mapswithme/maps/news/OnIntroductionButtonClickListener.java index 0d0c9dc435..377cc61bbf 100644 --- a/android/src/com/mapswithme/maps/news/OnIntroductionButtonClickListener.java +++ b/android/src/com/mapswithme/maps/news/OnIntroductionButtonClickListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.news; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface OnIntroductionButtonClickListener { diff --git a/android/src/com/mapswithme/maps/news/PromoButton.java b/android/src/com/mapswithme/maps/news/PromoButton.java index 2ded7b54f3..a1819e87fb 100644 --- a/android/src/com/mapswithme/maps/news/PromoButton.java +++ b/android/src/com/mapswithme/maps/news/PromoButton.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.news; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class PromoButton { diff --git a/android/src/com/mapswithme/maps/news/WelcomeDialogFragment.java b/android/src/com/mapswithme/maps/news/WelcomeDialogFragment.java index 34eaae7e58..328fcd1d22 100644 --- a/android/src/com/mapswithme/maps/news/WelcomeDialogFragment.java +++ b/android/src/com/mapswithme/maps/news/WelcomeDialogFragment.java @@ -5,11 +5,11 @@ import android.app.Dialog; import android.content.DialogInterface; import android.content.res.Resources; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.View; diff --git a/android/src/com/mapswithme/maps/permissions/BasePermissionsDialogFragment.java b/android/src/com/mapswithme/maps/permissions/BasePermissionsDialogFragment.java index 7e2958a1f1..c18da37de7 100644 --- a/android/src/com/mapswithme/maps/permissions/BasePermissionsDialogFragment.java +++ b/android/src/com/mapswithme/maps/permissions/BasePermissionsDialogFragment.java @@ -2,16 +2,16 @@ package com.mapswithme.maps.permissions; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.view.View; import android.view.Window; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/permissions/PermissionsAdapter.java b/android/src/com/mapswithme/maps/permissions/PermissionsAdapter.java index 5106f9ac3e..dbe59b7225 100644 --- a/android/src/com/mapswithme/maps/permissions/PermissionsAdapter.java +++ b/android/src/com/mapswithme/maps/permissions/PermissionsAdapter.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.permissions; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java b/android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java index ab7e5136b0..05f50cc0d6 100644 --- a/android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java +++ b/android/src/com/mapswithme/maps/permissions/PermissionsDetailDialogFragment.java @@ -2,16 +2,16 @@ package com.mapswithme.maps.permissions; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java b/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java index 1ad2ff2ae8..1b7b2ec3f6 100644 --- a/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java +++ b/android/src/com/mapswithme/maps/permissions/PermissionsDialogFragment.java @@ -1,16 +1,16 @@ package com.mapswithme.maps.permissions; import android.content.DialogInterface; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java b/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java index f6e4f1c9f9..f5ffa0d4df 100644 --- a/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java +++ b/android/src/com/mapswithme/maps/permissions/StoragePermissionsDialogFragment.java @@ -6,12 +6,12 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.view.View; import android.view.Window; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java index c8c67813d2..ed16cc9bf3 100644 --- a/android/src/com/mapswithme/maps/promo/CatalogPromoController.java +++ b/android/src/com/mapswithme/maps/promo/CatalogPromoController.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.promo; import android.annotation.SuppressLint; import android.app.Activity; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Html; import android.text.TextUtils; import android.view.View; diff --git a/android/src/com/mapswithme/maps/promo/Promo.java b/android/src/com/mapswithme/maps/promo/Promo.java index 529f019dc8..d229672cff 100644 --- a/android/src/com/mapswithme/maps/promo/Promo.java +++ b/android/src/com/mapswithme/maps/promo/Promo.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.promo; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.NetworkPolicy; import com.mapswithme.util.UTM; diff --git a/android/src/com/mapswithme/maps/promo/PromoAfterBooking.java b/android/src/com/mapswithme/maps/promo/PromoAfterBooking.java index 3d71b15f78..44743895dd 100644 --- a/android/src/com/mapswithme/maps/promo/PromoAfterBooking.java +++ b/android/src/com/mapswithme/maps/promo/PromoAfterBooking.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.promo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class PromoAfterBooking { diff --git a/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java b/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java index f481aa79e9..2f91e888fe 100644 --- a/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java +++ b/android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.promo; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java index e20d84d522..dcf7d53a27 100644 --- a/android/src/com/mapswithme/maps/promo/PromoCityGallery.java +++ b/android/src/com/mapswithme/maps/promo/PromoCityGallery.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.promo; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public final class PromoCityGallery { diff --git a/android/src/com/mapswithme/maps/promo/PromoEntity.java b/android/src/com/mapswithme/maps/promo/PromoEntity.java index 7edb031624..a74db21256 100644 --- a/android/src/com/mapswithme/maps/promo/PromoEntity.java +++ b/android/src/com/mapswithme/maps/promo/PromoEntity.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.promo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.gallery.RegularAdapterStrategy; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkValidationCallback.java b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkValidationCallback.java index 8cda259c81..26788899d6 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractBookmarkValidationCallback.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractBookmarkValidationCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractProductDetailsLoadingCallback.java b/android/src/com/mapswithme/maps/purchase/AbstractProductDetailsLoadingCallback.java index 4029691bc1..3b9babac9a 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractProductDetailsLoadingCallback.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractProductDetailsLoadingCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java b/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java index d9a1775c2e..75c31e4507 100644 --- a/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.purchase; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.Purchase; diff --git a/android/src/com/mapswithme/maps/purchase/AdsRemovalPaymentState.java b/android/src/com/mapswithme/maps/purchase/AdsRemovalPaymentState.java index 552dde4806..a5f0752520 100644 --- a/android/src/com/mapswithme/maps/purchase/AdsRemovalPaymentState.java +++ b/android/src/com/mapswithme/maps/purchase/AdsRemovalPaymentState.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseControllerProvider.java b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseControllerProvider.java index 7be3e53a2c..5c59fddbb5 100644 --- a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseControllerProvider.java +++ b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseControllerProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; public interface AdsRemovalPurchaseControllerProvider { diff --git a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java index bd39b19aae..265a348dc4 100644 --- a/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java +++ b/android/src/com/mapswithme/maps/purchase/AdsRemovalPurchaseDialog.java @@ -4,12 +4,12 @@ import android.content.Context; import android.content.DialogInterface; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/purchase/BillingConnection.java b/android/src/com/mapswithme/maps/purchase/BillingConnection.java index 0b9a198aca..259aadf52d 100644 --- a/android/src/com/mapswithme/maps/purchase/BillingConnection.java +++ b/android/src/com/mapswithme/maps/purchase/BillingConnection.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Represents a billing connection abstraction. diff --git a/android/src/com/mapswithme/maps/purchase/BillingManager.java b/android/src/com/mapswithme/maps/purchase/BillingManager.java index 92a155c3bd..44713fd872 100644 --- a/android/src/com/mapswithme/maps/purchase/BillingManager.java +++ b/android/src/com/mapswithme/maps/purchase/BillingManager.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java index fc2babcf70..9c90866053 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.purchase; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.data.PaymentData; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java index 449dfaf66c..d9c9290bf5 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.purchase; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java index 61ae85edc1..a40c4e0c3e 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; import com.mapswithme.maps.dialog.AlertDialog; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseCallback.java b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseCallback.java index a1449aa0ae..a1947e816f 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseCallback.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java index 5a0f951527..dac458346f 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java index 4ded5554b6..e22b4d3581 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.purchase; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.util.statistics.Statistics; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java index 4b740f2d0d..f4846051fe 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.purchase; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.widget.CardView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.cardview.widget.CardView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java index ca17c43791..f5a7226edd 100644 --- a/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java +++ b/android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java b/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java index f472bcaf9f..0a6554cdfe 100644 --- a/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java +++ b/android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; diff --git a/android/src/com/mapswithme/maps/purchase/CoreStartTransactionObserver.java b/android/src/com/mapswithme/maps/purchase/CoreStartTransactionObserver.java index f00d57e6d4..fd51af9f5a 100644 --- a/android/src/com/mapswithme/maps/purchase/CoreStartTransactionObserver.java +++ b/android/src/com/mapswithme/maps/purchase/CoreStartTransactionObserver.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface CoreStartTransactionObserver { diff --git a/android/src/com/mapswithme/maps/purchase/CoreValidationObserver.java b/android/src/com/mapswithme/maps/purchase/CoreValidationObserver.java index a6deb8001d..5070eaeebd 100644 --- a/android/src/com/mapswithme/maps/purchase/CoreValidationObserver.java +++ b/android/src/com/mapswithme/maps/purchase/CoreValidationObserver.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface CoreValidationObserver { diff --git a/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java index d82ac859ed..d6861a141e 100644 --- a/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java +++ b/android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Base64; diff --git a/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java b/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java index 20b765c2b7..42854fa25f 100644 --- a/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.purchase; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java b/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java index 40996399cd..c2c148abd7 100644 --- a/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java +++ b/android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingFlowParams; diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java index 14c5b88e08..3638cbd7aa 100644 --- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java +++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.Purchase; diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java index 7c68da472d..927e41f0fe 100644 --- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java +++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingClientStateListener; diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java index f04d02420b..b6932e9004 100644 --- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java +++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.BillingClient.BillingResponse; diff --git a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingRequest.java b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingRequest.java index bb4b1611db..de19c5406c 100644 --- a/android/src/com/mapswithme/maps/purchase/PlayStoreBillingRequest.java +++ b/android/src/com/mapswithme/maps/purchase/PlayStoreBillingRequest.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; diff --git a/android/src/com/mapswithme/maps/purchase/ProductDetails.java b/android/src/com/mapswithme/maps/purchase/ProductDetails.java index 865467842d..d9a95a1ba9 100644 --- a/android/src/com/mapswithme/maps/purchase/ProductDetails.java +++ b/android/src/com/mapswithme/maps/purchase/ProductDetails.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.purchase; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class ProductDetails implements Parcelable { diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseCallback.java b/android/src/com/mapswithme/maps/purchase/PurchaseCallback.java index 159170382a..6bf570b36c 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseCallback.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseController.java b/android/src/com/mapswithme/maps/purchase/PurchaseController.java index d54ebf10f8..40a0c9d723 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseController.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java b/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java index 0275d320ee..da6831122d 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseFactory.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.mapswithme.maps.PrivateVariables; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseStateActivator.java b/android/src/com/mapswithme/maps/purchase/PurchaseStateActivator.java index 98827e476e..89648a071f 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseStateActivator.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseStateActivator.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface PurchaseStateActivator { diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java b/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java index 2937096283..bc608dface 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseUtils.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.text.TextUtils; import com.android.billingclient.api.Purchase; diff --git a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java index 26a25498a7..8e6d98897d 100644 --- a/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java +++ b/android/src/com/mapswithme/maps/purchase/PurchaseValidator.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.purchase; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/purchase/QueryExistingPurchases.java b/android/src/com/mapswithme/maps/purchase/QueryExistingPurchases.java index 493428547a..fc9e6e34a7 100644 --- a/android/src/com/mapswithme/maps/purchase/QueryExistingPurchases.java +++ b/android/src/com/mapswithme/maps/purchase/QueryExistingPurchases.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.Purchase; diff --git a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java index a029575558..dce2d7ef82 100644 --- a/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java +++ b/android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.BillingClient; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/StatefulPurchaseCallback.java b/android/src/com/mapswithme/maps/purchase/StatefulPurchaseCallback.java index de89406163..5c6eb42437 100644 --- a/android/src/com/mapswithme/maps/purchase/StatefulPurchaseCallback.java +++ b/android/src/com/mapswithme/maps/purchase/StatefulPurchaseCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.base.Detachable; diff --git a/android/src/com/mapswithme/maps/purchase/SubsProductDetailsCallback.java b/android/src/com/mapswithme/maps/purchase/SubsProductDetailsCallback.java index ff324dabb1..b98adb74ec 100644 --- a/android/src/com/mapswithme/maps/purchase/SubsProductDetailsCallback.java +++ b/android/src/com/mapswithme/maps/purchase/SubsProductDetailsCallback.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.billingclient.api.Purchase; import com.android.billingclient.api.SkuDetails; diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java index 9e9e477781..b303dafdd1 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.purchase; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.android.billingclient.api.Purchase; diff --git a/android/src/com/mapswithme/maps/purchase/SubscriptionType.java b/android/src/com/mapswithme/maps/purchase/SubscriptionType.java index ee2deaacf3..4c6d910a8a 100644 --- a/android/src/com/mapswithme/maps/purchase/SubscriptionType.java +++ b/android/src/com/mapswithme/maps/purchase/SubscriptionType.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.PrivateVariables; diff --git a/android/src/com/mapswithme/maps/purchase/ValidationCallback.java b/android/src/com/mapswithme/maps/purchase/ValidationCallback.java index a64bd220b2..c7dc5f7f71 100644 --- a/android/src/com/mapswithme/maps/purchase/ValidationCallback.java +++ b/android/src/com/mapswithme/maps/purchase/ValidationCallback.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.purchase; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface ValidationCallback { diff --git a/android/src/com/mapswithme/maps/review/Review.java b/android/src/com/mapswithme/maps/review/Review.java index 9fef43ebe2..9a9cbfec25 100644 --- a/android/src/com/mapswithme/maps/review/Review.java +++ b/android/src/com/mapswithme/maps/review/Review.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.review; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class Review implements Parcelable { diff --git a/android/src/com/mapswithme/maps/review/ReviewActivity.java b/android/src/com/mapswithme/maps/review/ReviewActivity.java index 588580a961..528ee73ad4 100644 --- a/android/src/com/mapswithme/maps/review/ReviewActivity.java +++ b/android/src/com/mapswithme/maps/review/ReviewActivity.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.review; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmExtraTitleActivity; diff --git a/android/src/com/mapswithme/maps/review/ReviewAdapter.java b/android/src/com/mapswithme/maps/review/ReviewAdapter.java index eb067dc21d..44b667d9e6 100644 --- a/android/src/com/mapswithme/maps/review/ReviewAdapter.java +++ b/android/src/com/mapswithme/maps/review/ReviewAdapter.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.review; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; diff --git a/android/src/com/mapswithme/maps/review/ReviewFragment.java b/android/src/com/mapswithme/maps/review/ReviewFragment.java index cfb39156e1..5570ba4166 100644 --- a/android/src/com/mapswithme/maps/review/ReviewFragment.java +++ b/android/src/com/mapswithme/maps/review/ReviewFragment.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.review; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java index 07eff365f3..5adba934d9 100644 --- a/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java @@ -6,8 +6,8 @@ import android.content.DialogInterface; import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver; diff --git a/android/src/com/mapswithme/maps/routing/NavigationController.java b/android/src/com/mapswithme/maps/routing/NavigationController.java index 12044b33cf..7b82bafe14 100644 --- a/android/src/com/mapswithme/maps/routing/NavigationController.java +++ b/android/src/com/mapswithme/maps/routing/NavigationController.java @@ -8,8 +8,8 @@ import android.location.Location; import android.media.MediaPlayer; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; import android.view.View; diff --git a/android/src/com/mapswithme/maps/routing/RouteMarkData.java b/android/src/com/mapswithme/maps/routing/RouteMarkData.java index 8b8889ca49..3b35f9ce1c 100644 --- a/android/src/com/mapswithme/maps/routing/RouteMarkData.java +++ b/android/src/com/mapswithme/maps/routing/RouteMarkData.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.routing; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Represents RouteMarkData from core. diff --git a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java b/android/src/com/mapswithme/maps/routing/RoutePointInfo.java index 1c6f6b4fca..0ab104ff24 100644 --- a/android/src/com/mapswithme/maps/routing/RoutePointInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutePointInfo.java @@ -2,8 +2,7 @@ package com.mapswithme.maps.routing; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java index 894f41ef93..c5558a0f38 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingBottomMenuController.java @@ -8,14 +8,14 @@ import android.graphics.Bitmap; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index d6dc1b15fc..d8ebf76d7c 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -3,14 +3,14 @@ package com.mapswithme.maps.routing; import android.app.Activity; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.DimenRes; -import android.support.annotation.IntRange; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.util.Pair; -import android.support.v7.app.AlertDialog; +import androidx.annotation.DimenRes; +import androidx.annotation.IntRange; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.core.util.Pair; +import androidx.appcompat.app.AlertDialog; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.view.View; @@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit; import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_POINT_ADD; import static com.mapswithme.util.statistics.Statistics.EventName.ROUTING_POINT_REMOVE; -@android.support.annotation.UiThread +@androidx.annotation.UiThread public class RoutingController implements TaxiManager.TaxiListener { private static final String TAG = RoutingController.class.getSimpleName(); diff --git a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java index 19f258e4a1..8ac9f91fa0 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingErrorDialogFragment.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.routing; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.util.Pair; import android.view.View; import android.widget.Button; diff --git a/android/src/com/mapswithme/maps/routing/RoutingInfo.java b/android/src/com/mapswithme/maps/routing/RoutingInfo.java index 0c739952cf..7b75a49963 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingInfo.java +++ b/android/src/com/mapswithme/maps/routing/RoutingInfo.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.routing; import android.location.Location; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import android.widget.ImageView; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java b/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java index 28bddb3cd3..372f2c6d5f 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingMapsDownloadFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.routing; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/routing/RoutingOptions.java b/android/src/com/mapswithme/maps/routing/RoutingOptions.java index c82d86c601..fcb240e9cb 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingOptions.java +++ b/android/src/com/mapswithme/maps/routing/RoutingOptions.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.routing; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.settings.RoadType; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index beaf645650..8f410590aa 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.routing; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.View; import android.widget.CompoundButton; import android.widget.RadioButton; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java index bd8425a005..ae7701b4b3 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.routing; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java index 321b9182ce..687ea9c9ce 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanInplaceController.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.routing; import android.animation.Animator; import android.animation.ValueAnimator; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/SearchWheel.java b/android/src/com/mapswithme/maps/routing/SearchWheel.java index 64f1fd4664..95baa3e24f 100644 --- a/android/src/com/mapswithme/maps/routing/SearchWheel.java +++ b/android/src/com/mapswithme/maps/routing/SearchWheel.java @@ -4,11 +4,11 @@ import android.animation.Animator; import android.animation.AnimatorInflater; import android.content.Context; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import android.view.ContextThemeWrapper; import android.view.View; @@ -283,8 +283,8 @@ class SearchWheel implements View.OnClickListener final MwmActivity parent; if (context instanceof ContextThemeWrapper) parent = (MwmActivity)((ContextThemeWrapper)context).getBaseContext(); - else if (context instanceof android.support.v7.view.ContextThemeWrapper) - parent = (MwmActivity)((android.support.v7.view.ContextThemeWrapper)context).getBaseContext(); + else if (context instanceof androidx.appcompat.view.ContextThemeWrapper) + parent = (MwmActivity)((androidx.appcompat.view.ContextThemeWrapper)context).getBaseContext(); else parent = (MwmActivity) context; parent.showSearch(); diff --git a/android/src/com/mapswithme/maps/routing/TransitRouteInfo.java b/android/src/com/mapswithme/maps/routing/TransitRouteInfo.java index 834f198e53..ad91328b29 100644 --- a/android/src/com/mapswithme/maps/routing/TransitRouteInfo.java +++ b/android/src/com/mapswithme/maps/routing/TransitRouteInfo.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.routing; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java b/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java index 2954067d1d..4ace915a53 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.routing; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepInfo.java b/android/src/com/mapswithme/maps/routing/TransitStepInfo.java index f61a1cea7f..958225948e 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepInfo.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepInfo.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.routing; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepType.java b/android/src/com/mapswithme/maps/routing/TransitStepType.java index 9d2698973c..bf69fac657 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepType.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepType.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.routing; -import android.support.annotation.DrawableRes; +import androidx.annotation.DrawableRes; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/routing/TransitStepView.java b/android/src/com/mapswithme/maps/routing/TransitStepView.java index 1a0cbfde63..cd9c3a0c4d 100644 --- a/android/src/com/mapswithme/maps/routing/TransitStepView.java +++ b/android/src/com/mapswithme/maps/routing/TransitStepView.java @@ -9,13 +9,13 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.Dimension; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.Dimension; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.graphics.drawable.DrawableCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java b/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java index 6a8f02e86c..0e0bee1b9f 100644 --- a/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java +++ b/android/src/com/mapswithme/maps/scheduling/ConnectivityJobScheduler.java @@ -6,7 +6,7 @@ import android.app.job.JobScheduler; import android.content.ComponentName; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.crashlytics.android.Crashlytics; import com.firebase.jobdispatcher.Constraint; diff --git a/android/src/com/mapswithme/maps/scheduling/FirebaseJobService.java b/android/src/com/mapswithme/maps/scheduling/FirebaseJobService.java index 802f22ce9c..f02f68420a 100644 --- a/android/src/com/mapswithme/maps/scheduling/FirebaseJobService.java +++ b/android/src/com/mapswithme/maps/scheduling/FirebaseJobService.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.scheduling; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.firebase.jobdispatcher.JobParameters; import com.firebase.jobdispatcher.JobService; diff --git a/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java b/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java index 72d3aaca08..f9cfd52f64 100644 --- a/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java +++ b/android/src/com/mapswithme/maps/scheduling/JobServiceDelegate.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.scheduling; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.background.NotificationService; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/scheduling/NativeJobService.java b/android/src/com/mapswithme/maps/scheduling/NativeJobService.java index 7ee4b4adf7..2dc176cb52 100644 --- a/android/src/com/mapswithme/maps/scheduling/NativeJobService.java +++ b/android/src/com/mapswithme/maps/scheduling/NativeJobService.java @@ -4,7 +4,7 @@ import android.annotation.TargetApi; import android.app.job.JobParameters; import android.app.job.JobService; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/maps/search/BookingFilter.java b/android/src/com/mapswithme/maps/search/BookingFilter.java index 334b392ecf..0f4aba2abb 100644 --- a/android/src/com/mapswithme/maps/search/BookingFilter.java +++ b/android/src/com/mapswithme/maps/search/BookingFilter.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/search/BookingFilterParams.java b/android/src/com/mapswithme/maps/search/BookingFilterParams.java index 6000ddbda6..9e03597a77 100644 --- a/android/src/com/mapswithme/maps/search/BookingFilterParams.java +++ b/android/src/com/mapswithme/maps/search/BookingFilterParams.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.search; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java index 8070afb261..1269290de0 100644 --- a/android/src/com/mapswithme/maps/search/CategoriesAdapter.java +++ b/android/src/com/mapswithme/maps/search/CategoriesAdapter.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.search; import android.content.res.Resources; -import android.support.annotation.DrawableRes; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/search/DisplayedCategories.java b/android/src/com/mapswithme/maps/search/DisplayedCategories.java index 418947e457..e2fd892251 100644 --- a/android/src/com/mapswithme/maps/search/DisplayedCategories.java +++ b/android/src/com/mapswithme/maps/search/DisplayedCategories.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class DisplayedCategories { diff --git a/android/src/com/mapswithme/maps/search/FilterActivity.java b/android/src/com/mapswithme/maps/search/FilterActivity.java index 851d578b1f..88afcd764a 100644 --- a/android/src/com/mapswithme/maps/search/FilterActivity.java +++ b/android/src/com/mapswithme/maps/search/FilterActivity.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.search; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.activity.CustomNavigateUpListener; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/search/FilterFragment.java b/android/src/com/mapswithme/maps/search/FilterFragment.java index 698ab29bd8..f89061cc38 100644 --- a/android/src/com/mapswithme/maps/search/FilterFragment.java +++ b/android/src/com/mapswithme/maps/search/FilterFragment.java @@ -8,10 +8,10 @@ import android.content.IntentFilter; import android.graphics.drawable.Drawable; import android.net.ConnectivityManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/search/FilterUtils.java b/android/src/com/mapswithme/maps/search/FilterUtils.java index f807c0ffc0..28a343f650 100644 --- a/android/src/com/mapswithme/maps/search/FilterUtils.java +++ b/android/src/com/mapswithme/maps/search/FilterUtils.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.search; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java index 9798a305d4..3300a1226f 100644 --- a/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java +++ b/android/src/com/mapswithme/maps/search/FloatingSearchToolbarController.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.search; import android.app.Activity; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.api.ParsedMwmRequest; diff --git a/android/src/com/mapswithme/maps/search/HiddenCommand.java b/android/src/com/mapswithme/maps/search/HiddenCommand.java index 435839d503..8a6afcb021 100644 --- a/android/src/com/mapswithme/maps/search/HiddenCommand.java +++ b/android/src/com/mapswithme/maps/search/HiddenCommand.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; interface HiddenCommand { diff --git a/android/src/com/mapswithme/maps/search/HotelsFilter.java b/android/src/com/mapswithme/maps/search/HotelsFilter.java index 9ae392c619..ccacfe8ca9 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilter.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilter.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.search; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import static com.mapswithme.maps.search.HotelsFilter.Op.FIELD_RATING; diff --git a/android/src/com/mapswithme/maps/search/HotelsFilterHolder.java b/android/src/com/mapswithme/maps/search/HotelsFilterHolder.java index 287702d598..4923c7c71e 100644 --- a/android/src/com/mapswithme/maps/search/HotelsFilterHolder.java +++ b/android/src/com/mapswithme/maps/search/HotelsFilterHolder.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; interface HotelsFilterHolder { diff --git a/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java index b5291001f6..2215372ffa 100644 --- a/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java +++ b/android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.search; import android.content.Context; import android.content.res.Resources; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/search/MegafonPromoProcessor.java b/android/src/com/mapswithme/maps/search/MegafonPromoProcessor.java index 9b1f8eb1a9..2be807f2fb 100644 --- a/android/src/com/mapswithme/maps/search/MegafonPromoProcessor.java +++ b/android/src/com/mapswithme/maps/search/MegafonPromoProcessor.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.search; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.Framework; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/search/NativeBookingFilterListener.java b/android/src/com/mapswithme/maps/search/NativeBookingFilterListener.java index 2fe1f47881..ec3651c18f 100644 --- a/android/src/com/mapswithme/maps/search/NativeBookingFilterListener.java +++ b/android/src/com/mapswithme/maps/search/NativeBookingFilterListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.FeatureId; diff --git a/android/src/com/mapswithme/maps/search/NativeBookmarkSearchListener.java b/android/src/com/mapswithme/maps/search/NativeBookmarkSearchListener.java index 91fe8beb22..f344a84134 100644 --- a/android/src/com/mapswithme/maps/search/NativeBookmarkSearchListener.java +++ b/android/src/com/mapswithme/maps/search/NativeBookmarkSearchListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Native search will return results via this interface. diff --git a/android/src/com/mapswithme/maps/search/NativeSearchListener.java b/android/src/com/mapswithme/maps/search/NativeSearchListener.java index 75e546bed6..886e0e1881 100644 --- a/android/src/com/mapswithme/maps/search/NativeSearchListener.java +++ b/android/src/com/mapswithme/maps/search/NativeSearchListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Native search will return results via this interface. diff --git a/android/src/com/mapswithme/maps/search/Popularity.java b/android/src/com/mapswithme/maps/search/Popularity.java index 467dbe08ce..82549a6bab 100644 --- a/android/src/com/mapswithme/maps/search/Popularity.java +++ b/android/src/com/mapswithme/maps/search/Popularity.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.search; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class Popularity implements Parcelable { diff --git a/android/src/com/mapswithme/maps/search/PopularityProvider.java b/android/src/com/mapswithme/maps/search/PopularityProvider.java index b56ac798ed..5b5650930f 100644 --- a/android/src/com/mapswithme/maps/search/PopularityProvider.java +++ b/android/src/com/mapswithme/maps/search/PopularityProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface PopularityProvider { diff --git a/android/src/com/mapswithme/maps/search/PriceFilterView.java b/android/src/com/mapswithme/maps/search/PriceFilterView.java index 524e0c7fcc..2f1a11728b 100644 --- a/android/src/com/mapswithme/maps/search/PriceFilterView.java +++ b/android/src/com/mapswithme/maps/search/PriceFilterView.java @@ -3,13 +3,13 @@ package com.mapswithme.maps.search; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.util.Pair; import android.util.SparseArray; diff --git a/android/src/com/mapswithme/maps/search/PromoCategory.java b/android/src/com/mapswithme/maps/search/PromoCategory.java index 19d13d062f..0f9bd9ccdf 100644 --- a/android/src/com/mapswithme/maps/search/PromoCategory.java +++ b/android/src/com/mapswithme/maps/search/PromoCategory.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.search; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/search/RatingFilterView.java b/android/src/com/mapswithme/maps/search/RatingFilterView.java index 9ece66c490..fe47f4a259 100644 --- a/android/src/com/mapswithme/maps/search/RatingFilterView.java +++ b/android/src/com/mapswithme/maps/search/RatingFilterView.java @@ -3,11 +3,11 @@ package com.mapswithme.maps.search; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.util.Pair; import android.util.SparseArray; diff --git a/android/src/com/mapswithme/maps/search/SearchActivity.java b/android/src/com/mapswithme/maps/search/SearchActivity.java index c609cbb7ac..ac20abbade 100644 --- a/android/src/com/mapswithme/maps/search/SearchActivity.java +++ b/android/src/com/mapswithme/maps/search/SearchActivity.java @@ -3,13 +3,13 @@ package com.mapswithme.maps.search; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.NavUtils; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.core.app.NavUtils; import com.mapswithme.maps.R; import com.mapswithme.maps.activity.CustomNavigateUpListener; diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java index 901017c380..28d310f1d8 100644 --- a/android/src/com/mapswithme/maps/search/SearchAdapter.java +++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java @@ -4,12 +4,12 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; diff --git a/android/src/com/mapswithme/maps/search/SearchAnimationController.java b/android/src/com/mapswithme/maps/search/SearchAnimationController.java index 556b375016..6d6b751fdb 100644 --- a/android/src/com/mapswithme/maps/search/SearchAnimationController.java +++ b/android/src/com/mapswithme/maps/search/SearchAnimationController.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.search; import android.animation.Animator; import android.animation.ValueAnimator; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java index 02dc0c88b5..9d563ad71b 100644 --- a/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchCategoriesFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.search; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/search/SearchEngine.java b/android/src/com/mapswithme/maps/search/SearchEngine.java index 7d8ec3528a..6f1994a136 100644 --- a/android/src/com/mapswithme/maps/search/SearchEngine.java +++ b/android/src/com/mapswithme/maps/search/SearchEngine.java @@ -1,14 +1,13 @@ package com.mapswithme.maps.search; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.Framework; import com.mapswithme.maps.api.ParsedMwmRequest; import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.bookmarks.data.FeatureId; -import com.mapswithme.maps.intent.Factory; import com.mapswithme.util.Language; import com.mapswithme.util.Listeners; import com.mapswithme.util.concurrency.UiThread; diff --git a/android/src/com/mapswithme/maps/search/SearchFilterController.java b/android/src/com/mapswithme/maps/search/SearchFilterController.java index f24bc8865d..c1e610c92d 100644 --- a/android/src/com/mapswithme/maps/search/SearchFilterController.java +++ b/android/src/com/mapswithme/maps/search/SearchFilterController.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.search; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java index 0788fb60e9..5831850c63 100644 --- a/android/src/com/mapswithme/maps/search/SearchFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchFragment.java @@ -4,17 +4,17 @@ import android.app.Activity; import android.content.Intent; import android.location.Location; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CollapsingToolbarLayout; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.appbar.CollapsingToolbarLayout; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java b/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java index 40843a69d3..c62fad0060 100644 --- a/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java +++ b/android/src/com/mapswithme/maps/search/SearchHistoryAdapter.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java index f2654e23bf..70146b9f95 100644 --- a/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java +++ b/android/src/com/mapswithme/maps/search/SearchHistoryFragment.java @@ -1,12 +1,12 @@ package com.mapswithme.maps.search; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmRecyclerFragment; diff --git a/android/src/com/mapswithme/maps/search/SearchRecents.java b/android/src/com/mapswithme/maps/search/SearchRecents.java index 197006f79f..e651e2cace 100644 --- a/android/src/com/mapswithme/maps/search/SearchRecents.java +++ b/android/src/com/mapswithme/maps/search/SearchRecents.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Pair; import com.mapswithme.util.Language; diff --git a/android/src/com/mapswithme/maps/search/SearchResult.java b/android/src/com/mapswithme/maps/search/SearchResult.java index 0e5382db21..817cb4b31d 100644 --- a/android/src/com/mapswithme/maps/search/SearchResult.java +++ b/android/src/com/mapswithme/maps/search/SearchResult.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.search; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.bookmarks.data.FeatureId; diff --git a/android/src/com/mapswithme/maps/search/TabAdapter.java b/android/src/com/mapswithme/maps/search/TabAdapter.java index d417796d35..28d044b4da 100644 --- a/android/src/com/mapswithme/maps/search/TabAdapter.java +++ b/android/src/com/mapswithme/maps/search/TabAdapter.java @@ -2,12 +2,12 @@ package com.mapswithme.maps.search; import android.content.Context; import android.content.res.ColorStateList; -import android.support.annotation.NonNull; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.util.SparseArray; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/settings/AboutFragment.java b/android/src/com/mapswithme/maps/settings/AboutFragment.java index ec037b51ff..4e38d24867 100644 --- a/android/src/com/mapswithme/maps/settings/AboutFragment.java +++ b/android/src/com/mapswithme/maps/settings/AboutFragment.java @@ -5,9 +5,9 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java b/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java index a2d980eea3..a6fa961bea 100644 --- a/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java +++ b/android/src/com/mapswithme/maps/settings/BaseSettingsFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.settings; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java b/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java index f94a792f5e..27144eabcb 100644 --- a/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java +++ b/android/src/com/mapswithme/maps/settings/BaseXmlSettingsFragment.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.settings; import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.XmlRes; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.Nullable; +import androidx.annotation.XmlRes; +import androidx.core.content.ContextCompat; +import androidx.preference.PreferenceFragmentCompat; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java b/android/src/com/mapswithme/maps/settings/CopyrightFragment.java index bfb903002e..b3f6cb500e 100644 --- a/android/src/com/mapswithme/maps/settings/CopyrightFragment.java +++ b/android/src/com/mapswithme/maps/settings/CopyrightFragment.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.settings; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java index 744f52a589..0685a3aefd 100644 --- a/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java +++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsActivity.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java index 4f57043305..afd8b71cdb 100644 --- a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/settings/HelpFragment.java b/android/src/com/mapswithme/maps/settings/HelpFragment.java index 63dec7716e..68a4b38167 100644 --- a/android/src/com/mapswithme/maps/settings/HelpFragment.java +++ b/android/src/com/mapswithme/maps/settings/HelpFragment.java @@ -4,13 +4,13 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.R; import com.mapswithme.maps.WebContainerDelegate; import com.mapswithme.util.Constants; diff --git a/android/src/com/mapswithme/maps/settings/SettingsActivity.java b/android/src/com/mapswithme/maps/settings/SettingsActivity.java index 5506031c87..cc8fdde886 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsActivity.java +++ b/android/src/com/mapswithme/maps/settings/SettingsActivity.java @@ -1,13 +1,13 @@ package com.mapswithme.maps.settings; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java index d1441fb678..745162377d 100644 --- a/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java +++ b/android/src/com/mapswithme/maps/settings/SettingsPrefsFragment.java @@ -6,17 +6,17 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.speech.tts.TextToSpeech; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.TwoStatePreference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; import android.text.Spannable; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; diff --git a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java index 1c1d889426..fabee54187 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathFragment.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathFragment.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.settings; import android.app.Activity; import android.os.Bundle; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/settings/StoragePathManager.java b/android/src/com/mapswithme/maps/settings/StoragePathManager.java index caab472d97..4e083208a5 100644 --- a/android/src/com/mapswithme/maps/settings/StoragePathManager.java +++ b/android/src/com/mapswithme/maps/settings/StoragePathManager.java @@ -10,9 +10,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Build; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/sound/TtsPlayer.java b/android/src/com/mapswithme/maps/sound/TtsPlayer.java index 0fd72a9978..6bbc08be05 100644 --- a/android/src/com/mapswithme/maps/sound/TtsPlayer.java +++ b/android/src/com/mapswithme/maps/sound/TtsPlayer.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.sound; import android.content.Context; import android.content.res.Resources; import android.speech.tts.TextToSpeech; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/taxi/DefaultFormatPriceStrategy.java b/android/src/com/mapswithme/maps/taxi/DefaultFormatPriceStrategy.java index c5d19330e9..9dac6304bd 100644 --- a/android/src/com/mapswithme/maps/taxi/DefaultFormatPriceStrategy.java +++ b/android/src/com/mapswithme/maps/taxi/DefaultFormatPriceStrategy.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.taxi; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class DefaultFormatPriceStrategy implements FormatPriceStrategy { diff --git a/android/src/com/mapswithme/maps/taxi/FormatPriceStrategy.java b/android/src/com/mapswithme/maps/taxi/FormatPriceStrategy.java index a90ca4c57f..63725155d2 100644 --- a/android/src/com/mapswithme/maps/taxi/FormatPriceStrategy.java +++ b/android/src/com/mapswithme/maps/taxi/FormatPriceStrategy.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.taxi; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; interface FormatPriceStrategy { diff --git a/android/src/com/mapswithme/maps/taxi/LocaleDependentFormatPriceStrategy.java b/android/src/com/mapswithme/maps/taxi/LocaleDependentFormatPriceStrategy.java index e4e33c573a..7fe0a9b48e 100644 --- a/android/src/com/mapswithme/maps/taxi/LocaleDependentFormatPriceStrategy.java +++ b/android/src/com/mapswithme/maps/taxi/LocaleDependentFormatPriceStrategy.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.taxi; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java index 3cf9dd55ed..d3c748a168 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.taxi; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.view.PagerAdapter; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiInfo.java b/android/src/com/mapswithme/maps/taxi/TaxiInfo.java index ac8da2929a..64945e3f9f 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiInfo.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiInfo.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.taxi; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiInfoError.java b/android/src/com/mapswithme/maps/taxi/TaxiInfoError.java index 79370fba54..fd4585a344 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiInfoError.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiInfoError.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.taxi; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class TaxiInfoError { diff --git a/android/src/com/mapswithme/maps/taxi/TaxiManager.java b/android/src/com/mapswithme/maps/taxi/TaxiManager.java index 84630fc085..ea22dc8445 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiManager.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiManager.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.taxi; import android.content.Context; import android.location.Location; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.MapObject; import com.mapswithme.maps.location.LocationHelper; diff --git a/android/src/com/mapswithme/maps/taxi/TaxiType.java b/android/src/com/mapswithme/maps/taxi/TaxiType.java index 1c035c2c50..08bb300c38 100644 --- a/android/src/com/mapswithme/maps/taxi/TaxiType.java +++ b/android/src/com/mapswithme/maps/taxi/TaxiType.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.taxi; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.util.Utils; diff --git a/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java b/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java index 29fa7035fc..d65ef578ed 100644 --- a/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java +++ b/android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.tips; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.metrics.UserActionsLogger; diff --git a/android/src/com/mapswithme/maps/tips/ClickInterceptor.java b/android/src/com/mapswithme/maps/tips/ClickInterceptor.java index 7020754698..668ab81dc0 100644 --- a/android/src/com/mapswithme/maps/tips/ClickInterceptor.java +++ b/android/src/com/mapswithme/maps/tips/ClickInterceptor.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.tips; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmActivity; diff --git a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java index 7e6ddc48d7..144662b04f 100644 --- a/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java +++ b/android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.tips; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java b/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java index 4888c95c2e..47ebbde677 100644 --- a/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java +++ b/android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java @@ -8,8 +8,8 @@ import android.graphics.PointF; import android.graphics.Rect; import android.graphics.RectF; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.util.DisplayMetrics; import android.view.WindowManager; diff --git a/android/src/com/mapswithme/maps/tips/Tutorial.java b/android/src/com/mapswithme/maps/tips/Tutorial.java index 6dac72ad93..19c1f871e7 100644 --- a/android/src/com/mapswithme/maps/tips/Tutorial.java +++ b/android/src/com/mapswithme/maps/tips/Tutorial.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.tips; import android.app.Activity; import android.content.Context; import android.graphics.Typeface; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.View; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/maps/tips/TutorialClickListener.java b/android/src/com/mapswithme/maps/tips/TutorialClickListener.java index d6fea7b81c..c6bdbc4530 100644 --- a/android/src/com/mapswithme/maps/tips/TutorialClickListener.java +++ b/android/src/com/mapswithme/maps/tips/TutorialClickListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.tips; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import com.mapswithme.maps.MwmActivity; diff --git a/android/src/com/mapswithme/maps/ugc/EditParams.java b/android/src/com/mapswithme/maps/ugc/EditParams.java index b44c0e4cf8..33f47ebec3 100644 --- a/android/src/com/mapswithme/maps/ugc/EditParams.java +++ b/android/src/com/mapswithme/maps/ugc/EditParams.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.bookmarks.data.FeatureId; import com.mapswithme.maps.bookmarks.data.MapObject; diff --git a/android/src/com/mapswithme/maps/ugc/Impress.java b/android/src/com/mapswithme/maps/ugc/Impress.java index e57b5b6430..d3c05d6517 100644 --- a/android/src/com/mapswithme/maps/ugc/Impress.java +++ b/android/src/com/mapswithme/maps/ugc/Impress.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/ugc/UGC.java b/android/src/com/mapswithme/maps/ugc/UGC.java index 10f5361984..0d381c0950 100644 --- a/android/src/com/mapswithme/maps/ugc/UGC.java +++ b/android/src/com/mapswithme/maps/ugc/UGC.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.ugc; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.background.AppBackgroundTracker; diff --git a/android/src/com/mapswithme/maps/ugc/UGCController.java b/android/src/com/mapswithme/maps/ugc/UGCController.java index 6ca2673ae7..1ef03ae624 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCController.java +++ b/android/src/com/mapswithme/maps/ugc/UGCController.java @@ -2,10 +2,10 @@ package com.mapswithme.maps.ugc; import android.app.Activity; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.View; import android.widget.Button; diff --git a/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java b/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java index 8b7a6adbce..1e0752922d 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java +++ b/android/src/com/mapswithme/maps/ugc/UGCEditorActivity.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.ugc; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.metrics.UserActionsLogger; diff --git a/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java b/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java index dc68e4571e..5c1601bfaa 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java +++ b/android/src/com/mapswithme/maps/ugc/UGCEditorFragment.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.ugc; import android.os.Bundle; -import android.support.annotation.CallSuper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.CallSuper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java index 511084e6c9..7cf7e03867 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCRatingAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java index b4f3ec2f0a..bc1c1d079a 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCRatingRecordsAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java b/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java index e2f24bf9e1..2fc90eaa32 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java +++ b/android/src/com/mapswithme/maps/ugc/UGCReviewAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/UGCUpdate.java b/android/src/com/mapswithme/maps/ugc/UGCUpdate.java index 7e59e296f0..ee570c2355 100644 --- a/android/src/com/mapswithme/maps/ugc/UGCUpdate.java +++ b/android/src/com/mapswithme/maps/ugc/UGCUpdate.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ugc; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java index 80ad5ce591..8d13b3bfeb 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/BaseEditUserBookmarkCategoryFragment.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.design.widget.TextInputLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import com.google.android.material.textfield.TextInputLayout; import android.text.Editable; import android.text.InputFilter; import android.text.TextWatcher; diff --git a/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java b/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java index 2ae27765b0..0387531da2 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/BaseUgcRouteActivity.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.BaseMwmFragmentActivity; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java index 4ee3fae273..63207cb837 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ugc.routes; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java index 2400ebdd22..5602386f8f 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryDescriptionFragment.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java index eb14a0107d..42cd4ef2e3 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ugc.routes; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java index 7346b55d8e..ddbfd6e6c5 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/EditCategoryNameFragment.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkManager; diff --git a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderActivity.java b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderActivity.java index 02ffb34452..fe6f6d5f10 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ugc.routes; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseMwmFragmentActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java index 92de4051fc..d733971e97 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/SendLinkPlaceholderFragment.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.ugc.routes; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.ShareCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; +import androidx.core.app.ShareCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java b/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java index 5891ba5f7d..168db6db44 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java +++ b/android/src/com/mapswithme/maps/ugc/routes/TagsResFactory.java @@ -11,7 +11,7 @@ import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.ShapeDrawable; import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.shapes.RectShape; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.R; import com.mapswithme.util.ThemeUtils; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java index c1a3ea54fb..fed6921e2e 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsActivity.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java index 8cfa934893..051cfd4821 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteEditSettingsFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.ugc.routes; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesActivity.java index 7d15784f39..d772fc43c6 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ugc.routes; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java index 8f525df867..a7a03c93cf 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRoutePropertiesFragment.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java index 02dabc7f67..a63a977e80 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteSharingOptionsActivity.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkCategory; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsActivity.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsActivity.java index 525940237f..1ac1589670 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsActivity.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsActivity.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.ugc.routes; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseToolbarActivity; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java index 86f44bf2e7..3d1faee025 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcRouteTagsFragment.java @@ -3,12 +3,12 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Pair; import android.view.LayoutInflater; import android.view.Menu; diff --git a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java index bc69432872..5360d190a5 100644 --- a/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/ugc/routes/UgcSharingOptionsFragment.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.ugc.routes; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; import android.text.Html; import android.text.Spanned; import android.text.method.LinkMovementMethod; diff --git a/android/src/com/mapswithme/maps/widget/ArrowView.java b/android/src/com/mapswithme/maps/widget/ArrowView.java index 9a5b5c1f03..579c710819 100644 --- a/android/src/com/mapswithme/maps/widget/ArrowView.java +++ b/android/src/com/mapswithme/maps/widget/ArrowView.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.graphics.Canvas; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java b/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java index 823e9e0780..b00e3d91b5 100644 --- a/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java +++ b/android/src/com/mapswithme/maps/widget/BookmarkBackupView.java @@ -5,8 +5,8 @@ import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java index c30137213e..bdf6200fe9 100644 --- a/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java +++ b/android/src/com/mapswithme/maps/widget/CustomTextInputLayout.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.graphics.Canvas; -import android.support.annotation.Nullable; -import android.support.design.widget.TextInputLayout; -import android.support.v4.view.ViewCompat; +import androidx.annotation.Nullable; +import com.google.android.material.textfield.TextInputLayout; +import androidx.core.view.ViewCompat; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/android/src/com/mapswithme/maps/widget/DotPager.java b/android/src/com/mapswithme/maps/widget/DotPager.java index f6cc51313f..55eb68686d 100644 --- a/android/src/com/mapswithme/maps/widget/DotPager.java +++ b/android/src/com/mapswithme/maps/widget/DotPager.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.widget; import android.content.Context; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.LinearLayout; diff --git a/android/src/com/mapswithme/maps/widget/FadeView.java b/android/src/com/mapswithme/maps/widget/FadeView.java index a8cdc99d52..96b33fa212 100644 --- a/android/src/com/mapswithme/maps/widget/FadeView.java +++ b/android/src/com/mapswithme/maps/widget/FadeView.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.widget; import android.animation.Animator; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.view.MotionEvent; import android.widget.FrameLayout; diff --git a/android/src/com/mapswithme/maps/widget/PlaceholderView.java b/android/src/com/mapswithme/maps/widget/PlaceholderView.java index f27feb3f67..3f3057025f 100644 --- a/android/src/com/mapswithme/maps/widget/PlaceholderView.java +++ b/android/src/com/mapswithme/maps/widget/PlaceholderView.java @@ -5,10 +5,10 @@ import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; import android.os.Build; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/RatingView.java b/android/src/com/mapswithme/maps/widget/RatingView.java index 3384e01855..50e6e3e2b7 100644 --- a/android/src/com/mapswithme/maps/widget/RatingView.java +++ b/android/src/com/mapswithme/maps/widget/RatingView.java @@ -9,10 +9,10 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.graphics.drawable.Drawable; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.graphics.drawable.DrawableCompat; import android.text.TextPaint; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java index 5bff4e320e..63acddb1d7 100644 --- a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java +++ b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java @@ -5,8 +5,8 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.DrawableRes; +import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import com.mapswithme.util.Graphics; diff --git a/android/src/com/mapswithme/maps/widget/RotateDrawable.java b/android/src/com/mapswithme/maps/widget/RotateDrawable.java index 37096356c2..b447fb7f75 100644 --- a/android/src/com/mapswithme/maps/widget/RotateDrawable.java +++ b/android/src/com/mapswithme/maps/widget/RotateDrawable.java @@ -4,9 +4,9 @@ import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java b/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java index c5eb96d6a4..e6999173aa 100644 --- a/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java +++ b/android/src/com/mapswithme/maps/widget/RoutingToolbarButton.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.v7.widget.AppCompatRadioButton; +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.appcompat.widget.AppCompatRadioButton; import android.util.AttributeSet; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java index b31f1c1799..b0fff8e60c 100644 --- a/android/src/com/mapswithme/maps/widget/SearchToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/SearchToolbarController.java @@ -3,7 +3,7 @@ package com.mapswithme.maps.widget; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import android.text.TextUtils; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java index 10d161da3d..a97efe23f5 100644 --- a/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java +++ b/android/src/com/mapswithme/maps/widget/StackedButtonDialogFragment.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.widget; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import com.mapswithme.maps.R; import com.mapswithme.util.Config; diff --git a/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java b/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java index fe506a5b25..7e31839555 100644 --- a/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java +++ b/android/src/com/mapswithme/maps/widget/StackedButtonsDialog.java @@ -3,10 +3,10 @@ package com.mapswithme.maps.widget; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.app.AppCompatDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AppCompatDialog; import android.view.View; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/widget/ToolbarController.java b/android/src/com/mapswithme/maps/widget/ToolbarController.java index 98b0e618c6..02681a1f15 100644 --- a/android/src/com/mapswithme/maps/widget/ToolbarController.java +++ b/android/src/com/mapswithme/maps/widget/ToolbarController.java @@ -1,12 +1,12 @@ package com.mapswithme.maps.widget; import android.app.Activity; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/WheelProgressView.java b/android/src/com/mapswithme/maps/widget/WheelProgressView.java index 351548dd1c..21a521fd13 100644 --- a/android/src/com/mapswithme/maps/widget/WheelProgressView.java +++ b/android/src/com/mapswithme/maps/widget/WheelProgressView.java @@ -11,10 +11,10 @@ import android.graphics.RectF; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.graphics.drawable.DrawableWrapper; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.graphics.drawable.DrawableWrapper; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java b/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java index 34f6a9ccfd..556e2d3827 100644 --- a/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/BaseMenu.java @@ -1,10 +1,10 @@ package com.mapswithme.maps.widget.menu; import android.animation.Animator; -import android.support.annotation.DimenRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DimenRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java index 0ef5b63e11..f081423283 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.widget.menu; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; diff --git a/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java b/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java index 89bacf939f..d034214a62 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java +++ b/android/src/com/mapswithme/maps/widget/menu/MenuToggle.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.widget.menu; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; -import android.support.annotation.DimenRes; -import android.support.annotation.DrawableRes; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; import android.view.View; import android.widget.ImageView; @@ -87,4 +87,4 @@ class MenuToggle { transitImage(mCollapseImage, collapse, animate); } -} \ No newline at end of file +} diff --git a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java index 4a34710464..1145daced1 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java +++ b/android/src/com/mapswithme/maps/widget/menu/MyPositionButton.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.menu; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import android.util.SparseArray; import android.view.View; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java index b04080ebb7..4cfe7f249a 100644 --- a/android/src/com/mapswithme/maps/widget/menu/NavMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/NavMenu.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.menu; import android.animation.ValueAnimator; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.Button; import android.widget.ImageView; diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index 61ed42975d..aa1cd37b29 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -4,9 +4,9 @@ import android.animation.ArgbEvaluator; import android.animation.ObjectAnimator; import android.content.Context; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; import android.text.TextUtils; import android.util.DisplayMetrics; import android.view.LayoutInflater; diff --git a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java index 7005dd97bc..20e6fe6088 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.placepage; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.AdapterView; diff --git a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java index 41419511a3..1c74686a36 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BottomSheetPlacePageController.java @@ -9,11 +9,11 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.location.Location; import android.os.Bundle; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.GestureDetectorCompat; -import android.support.v7.widget.Toolbar; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.GestureDetectorCompat; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java index 5e97e1981a..0b1de48983 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/DirectionFragment.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.widget.placepage; import android.location.Location; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java index c0cbbb46b2..59170da9f9 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java @@ -2,11 +2,11 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java index eda3ad6efb..ccfbe65ca6 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/EditDescriptionFragment.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.widget.placepage; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.view.LayoutInflater; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java b/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java index 7c94832a73..d675c59add 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; import com.mapswithme.maps.gallery.Items; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java index 6603dac4a8..336eebfb70 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java @@ -1,11 +1,10 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; diff --git a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java index ed3cfba45e..425c9ca8fa 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java @@ -2,9 +2,9 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/widget/placepage/HotelPriceInfo.java b/android/src/com/mapswithme/maps/widget/placepage/HotelPriceInfo.java index 780c4ecf87..a3ccc7e440 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/HotelPriceInfo.java +++ b/android/src/com/mapswithme/maps/widget/placepage/HotelPriceInfo.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class HotelPriceInfo { diff --git a/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java b/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java index dd77c7d4e5..c23cc5cbc3 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java +++ b/android/src/com/mapswithme/maps/widget/placepage/NativeAdWrapper.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java index 7772cd9d32..ca1ef7ce48 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.placepage; import android.content.res.Resources; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java index 65d625928e..a614b5b6bf 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionActivity.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import com.mapswithme.maps.base.BaseToolbarActivity; import com.mapswithme.util.statistics.Statistics; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java index 55ff36e18b..8096a9a1ea 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlaceDescriptionFragment.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.placepage; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java index 3d4401ff9a..72735d15d8 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageButtons.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java index 198873474f..3c2e2e3708 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageController.java @@ -2,7 +2,7 @@ package com.mapswithme.maps.widget.placepage; import android.app.Application; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.base.Initializable; import com.mapswithme.maps.base.Savable; diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 1943cb85ec..035f3df4ba 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -9,15 +9,15 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.location.Location; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.widget.NestedScrollView; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.core.widget.NestedScrollView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.text.Html; import android.text.SpannableStringBuilder; import android.text.Spanned; diff --git a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java index 9b20745348..a8ddb7d6d9 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java @@ -1,7 +1,7 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.text.format.DateFormat; import android.view.LayoutInflater; diff --git a/android/src/com/mapswithme/maps/widget/placepage/RoutingModeListener.java b/android/src/com/mapswithme/maps/widget/placepage/RoutingModeListener.java index 83c8df3ce8..7eb54b4782 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/RoutingModeListener.java +++ b/android/src/com/mapswithme/maps/widget/placepage/RoutingModeListener.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.settings.RoadType; diff --git a/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java b/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java index d1e16b9a80..9363c5bd46 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java +++ b/android/src/com/mapswithme/maps/widget/placepage/Sponsored.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.widget.placepage; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.text.TextUtils; import com.mapswithme.maps.bookmarks.data.MapObject; diff --git a/android/src/com/mapswithme/maps/widget/placepage/ToolbarBehavior.java b/android/src/com/mapswithme/maps/widget/placepage/ToolbarBehavior.java index 8fbe6ada25..db8c3bf719 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/ToolbarBehavior.java +++ b/android/src/com/mapswithme/maps/widget/placepage/ToolbarBehavior.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.placepage; import android.content.Context; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.CoordinatorLayout; +import com.google.android.material.appbar.AppBarLayout; +import androidx.coordinatorlayout.widget.CoordinatorLayout; import android.util.AttributeSet; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java index 7f8f6f6cb9..e9eaf94900 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/DotDividerItemDecoration.java @@ -3,9 +3,9 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.Dimension; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Dimension; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class DotDividerItemDecoration extends RecyclerView.ItemDecoration diff --git a/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java index 1dc7334c46..214d8059b9 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/GridDividerItemDecoration.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java index 04f56d645f..fd921c6fbb 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/HotelDividerItemDecoration.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; import android.graphics.Rect; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; diff --git a/android/src/com/mapswithme/maps/widget/recycler/ItemDecoratorFactory.java b/android/src/com/mapswithme/maps/widget/recycler/ItemDecoratorFactory.java index 12f3403f4f..c354a97b29 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/ItemDecoratorFactory.java +++ b/android/src/com/mapswithme/maps/widget/recycler/ItemDecoratorFactory.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.RecyclerView; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java index 8b5fbcd3f4..456aaecbaa 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/MultilineLayoutManager.java @@ -1,8 +1,8 @@ package com.mapswithme.maps.widget.recycler; -import android.support.annotation.Dimension; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Dimension; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class MultilineLayoutManager extends RecyclerView.LayoutManager diff --git a/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java b/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java index ef748af3d3..04d3843d06 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SingleChangeItemAnimator.java @@ -1,11 +1,11 @@ package com.mapswithme.maps.widget.recycler; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.ViewPropertyAnimatorCompat; -import android.support.v4.view.ViewPropertyAnimatorListener; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SimpleItemAnimator; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; +import androidx.core.view.ViewPropertyAnimatorCompat; +import androidx.core.view.ViewPropertyAnimatorListener; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SimpleItemAnimator; import android.view.View; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java index da189a423f..ffa420b6f4 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SpanningLinearLayoutManager.java @@ -1,9 +1,9 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.ViewGroup; diff --git a/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java index 84f5bdf31e..8af8f4ae79 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/SponsoredDividerItemDecoration.java @@ -3,10 +3,14 @@ package com.mapswithme.maps.widget.recycler; import android.content.Context; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.*; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.*; import android.view.View; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + class SponsoredDividerItemDecoration extends DividerItemDecoration { private int mDividerWidth; diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java index ddcbe254eb..761c9657ca 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java +++ b/android/src/com/mapswithme/maps/widget/recycler/TagItemDecoration.java @@ -3,8 +3,8 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java index f4297ba2b9..24ec958aee 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java +++ b/android/src/com/mapswithme/maps/widget/recycler/TagLayoutManager.java @@ -1,6 +1,6 @@ package com.mapswithme.maps.widget.recycler; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; /** diff --git a/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java b/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java index b6a2ffc060..29b5bc6a86 100644 --- a/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java +++ b/android/src/com/mapswithme/maps/widget/recycler/UgcRouteTagItemDecorator.java @@ -2,8 +2,8 @@ package com.mapswithme.maps.widget.recycler; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.google.android.flexbox.FlexLine; diff --git a/android/src/com/mapswithme/util/Animations.java b/android/src/com/mapswithme/util/Animations.java index f43c5f7280..9937664280 100644 --- a/android/src/com/mapswithme/util/Animations.java +++ b/android/src/com/mapswithme/util/Animations.java @@ -1,8 +1,8 @@ package com.mapswithme.util; import android.animation.Animator; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; import android.view.View; import android.view.ViewPropertyAnimator; diff --git a/android/src/com/mapswithme/util/BatteryState.java b/android/src/com/mapswithme/util/BatteryState.java index d157ac0742..218a56706e 100644 --- a/android/src/com/mapswithme/util/BatteryState.java +++ b/android/src/com/mapswithme/util/BatteryState.java @@ -3,9 +3,9 @@ package com.mapswithme.util; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; -import android.support.annotation.IntDef; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; +import androidx.annotation.IntDef; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/util/BottomSheetHelper.java b/android/src/com/mapswithme/util/BottomSheetHelper.java index e9b6d74b3c..8fc0bc24a4 100644 --- a/android/src/com/mapswithme/util/BottomSheetHelper.java +++ b/android/src/com/mapswithme/util/BottomSheetHelper.java @@ -3,12 +3,12 @@ package com.mapswithme.util; import android.app.Activity; import android.content.DialogInterface; import android.graphics.drawable.Drawable; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.MenuRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.MenuRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import android.view.MenuItem; import com.cocosw.bottomsheet.BottomSheet; diff --git a/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java b/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java index 429bc441b9..a78db9ce16 100644 --- a/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java +++ b/android/src/com/mapswithme/util/ClientCertTLSSocketFactory.java @@ -1,7 +1,7 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index cb23e43f1c..7e0f652f11 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/util/ConnectionState.java b/android/src/com/mapswithme/util/ConnectionState.java index 51efeac7fd..dd9d3a802e 100644 --- a/android/src/com/mapswithme/util/ConnectionState.java +++ b/android/src/com/mapswithme/util/ConnectionState.java @@ -3,8 +3,8 @@ package com.mapswithme.util; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.TelephonyManager; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/util/Counters.java b/android/src/com/mapswithme/util/Counters.java index 1925a18e8e..4869c06109 100644 --- a/android/src/com/mapswithme/util/Counters.java +++ b/android/src/com/mapswithme/util/Counters.java @@ -1,9 +1,9 @@ package com.mapswithme.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.preference.PreferenceManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.text.format.DateUtils; diff --git a/android/src/com/mapswithme/util/CrashlyticsUtils.java b/android/src/com/mapswithme/util/CrashlyticsUtils.java index abfd41276b..898e42b285 100644 --- a/android/src/com/mapswithme/util/CrashlyticsUtils.java +++ b/android/src/com/mapswithme/util/CrashlyticsUtils.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.crashlytics.android.Crashlytics; import com.mapswithme.maps.MwmApplication; diff --git a/android/src/com/mapswithme/util/DateUtils.java b/android/src/com/mapswithme/util/DateUtils.java index 1eb26a18c6..6d552bbef2 100644 --- a/android/src/com/mapswithme/util/DateUtils.java +++ b/android/src/com/mapswithme/util/DateUtils.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.text.DateFormat; import java.util.Locale; diff --git a/android/src/com/mapswithme/util/Graphics.java b/android/src/com/mapswithme/util/Graphics.java index 7ad350d092..b0ababa8b4 100644 --- a/android/src/com/mapswithme/util/Graphics.java +++ b/android/src/com/mapswithme/util/Graphics.java @@ -10,13 +10,12 @@ import android.graphics.Paint; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.DimenRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.DimenRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.core.graphics.drawable.DrawableCompat; import android.widget.TextView; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/HttpClient.java b/android/src/com/mapswithme/util/HttpClient.java index 6ae7d455fb..9302285db4 100644 --- a/android/src/com/mapswithme/util/HttpClient.java +++ b/android/src/com/mapswithme/util/HttpClient.java @@ -25,7 +25,7 @@ package com.mapswithme.util; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/util/HttpUploader.java b/android/src/com/mapswithme/util/HttpUploader.java index e36a132a8d..910fd3b55a 100644 --- a/android/src/com/mapswithme/util/HttpUploader.java +++ b/android/src/com/mapswithme/util/HttpUploader.java @@ -1,8 +1,8 @@ package com.mapswithme.util; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Base64; diff --git a/android/src/com/mapswithme/util/KeyValue.java b/android/src/com/mapswithme/util/KeyValue.java index 19c7556424..c753804d38 100644 --- a/android/src/com/mapswithme/util/KeyValue.java +++ b/android/src/com/mapswithme/util/KeyValue.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public final class KeyValue { diff --git a/android/src/com/mapswithme/util/Language.java b/android/src/com/mapswithme/util/Language.java index 7c75215665..bc8f255530 100644 --- a/android/src/com/mapswithme/util/Language.java +++ b/android/src/com/mapswithme/util/Language.java @@ -1,7 +1,7 @@ package com.mapswithme.util; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; diff --git a/android/src/com/mapswithme/util/Listeners.java b/android/src/com/mapswithme/util/Listeners.java index e65c63e751..11415875b2 100644 --- a/android/src/com/mapswithme/util/Listeners.java +++ b/android/src/com/mapswithme/util/Listeners.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/android/src/com/mapswithme/util/LocationUtils.java b/android/src/com/mapswithme/util/LocationUtils.java index d1d86146ec..4e1bc495cb 100644 --- a/android/src/com/mapswithme/util/LocationUtils.java +++ b/android/src/com/mapswithme/util/LocationUtils.java @@ -9,7 +9,7 @@ import android.location.LocationManager; import android.os.Build; import android.os.SystemClock; import android.provider.Settings; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.view.Surface; diff --git a/android/src/com/mapswithme/util/NetworkPolicy.java b/android/src/com/mapswithme/util/NetworkPolicy.java index 69de6fa269..2689ea68f2 100644 --- a/android/src/com/mapswithme/util/NetworkPolicy.java +++ b/android/src/com/mapswithme/util/NetworkPolicy.java @@ -1,7 +1,7 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentManager; import com.mapswithme.maps.widget.StackedButtonDialogFragment; import com.mapswithme.util.statistics.StatisticValueConverter; diff --git a/android/src/com/mapswithme/util/PermissionsUtils.java b/android/src/com/mapswithme/util/PermissionsUtils.java index b9119714a6..59aeb5e45c 100644 --- a/android/src/com/mapswithme/util/PermissionsUtils.java +++ b/android/src/com/mapswithme/util/PermissionsUtils.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.permissions.PermissionsResult; @@ -16,7 +16,7 @@ import java.util.Map; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; -import static android.support.v4.app.ActivityCompat.shouldShowRequestPermissionRationale; +import static androidx.core.app.ActivityCompat.shouldShowRequestPermissionRationale; public final class PermissionsUtils { diff --git a/android/src/com/mapswithme/util/PowerManagment.java b/android/src/com/mapswithme/util/PowerManagment.java index f4b78ae67f..43a3d95d10 100644 --- a/android/src/com/mapswithme/util/PowerManagment.java +++ b/android/src/com/mapswithme/util/PowerManagment.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import com.mapswithme.maps.Framework; diff --git a/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java b/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java index f286fdc9d5..207d276280 100644 --- a/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java +++ b/android/src/com/mapswithme/util/PreLollipopSSLSocketFactory.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; diff --git a/android/src/com/mapswithme/util/Predicate.java b/android/src/com/mapswithme/util/Predicate.java index cd87668a36..bd92d34c3d 100644 --- a/android/src/com/mapswithme/util/Predicate.java +++ b/android/src/com/mapswithme/util/Predicate.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public abstract class Predicate { diff --git a/android/src/com/mapswithme/util/SecureStorage.java b/android/src/com/mapswithme/util/SecureStorage.java index 5ce394fad4..bd25313918 100644 --- a/android/src/com/mapswithme/util/SecureStorage.java +++ b/android/src/com/mapswithme/util/SecureStorage.java @@ -2,8 +2,8 @@ package com.mapswithme.util; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; import com.mapswithme.util.log.Logger; diff --git a/android/src/com/mapswithme/util/SharedPropertiesUtils.java b/android/src/com/mapswithme/util/SharedPropertiesUtils.java index bc6a656a82..73ebe1130b 100644 --- a/android/src/com/mapswithme/util/SharedPropertiesUtils.java +++ b/android/src/com/mapswithme/util/SharedPropertiesUtils.java @@ -3,8 +3,8 @@ package com.mapswithme.util; import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/SponsoredLinks.java b/android/src/com/mapswithme/util/SponsoredLinks.java index 218fa0496a..0103643950 100644 --- a/android/src/com/mapswithme/util/SponsoredLinks.java +++ b/android/src/com/mapswithme/util/SponsoredLinks.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class SponsoredLinks { diff --git a/android/src/com/mapswithme/util/StorageUtils.java b/android/src/com/mapswithme/util/StorageUtils.java index d91a596cd4..4e24d95c3b 100644 --- a/android/src/com/mapswithme/util/StorageUtils.java +++ b/android/src/com/mapswithme/util/StorageUtils.java @@ -5,9 +5,9 @@ import android.content.Context; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.FileProvider; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; diff --git a/android/src/com/mapswithme/util/ThemeSwitcher.java b/android/src/com/mapswithme/util/ThemeSwitcher.java index 0a48521885..6536fe61dd 100644 --- a/android/src/com/mapswithme/util/ThemeSwitcher.java +++ b/android/src/com/mapswithme/util/ThemeSwitcher.java @@ -2,7 +2,7 @@ package com.mapswithme.util; import android.app.Activity; import android.location.Location; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.mapswithme.maps.Framework; import com.mapswithme.maps.MwmApplication; @@ -57,7 +57,7 @@ public final class ThemeSwitcher * true only if the map is rendered and visible on the screen * at this moment, otherwise false. */ - @android.support.annotation.UiThread + @androidx.annotation.UiThread public static void restart(boolean isRendererActive) { sRendererActive = isRendererActive; @@ -79,7 +79,7 @@ public final class ThemeSwitcher changeMapStyle(theme, oldTheme); } - @android.support.annotation.UiThread + @androidx.annotation.UiThread private static void changeMapStyle(@NonNull String newTheme, @NonNull String oldTheme) { @Framework.MapStyle diff --git a/android/src/com/mapswithme/util/ThemeUtils.java b/android/src/com/mapswithme/util/ThemeUtils.java index b9d3a67b0a..8eef7ba2e4 100644 --- a/android/src/com/mapswithme/util/ThemeUtils.java +++ b/android/src/com/mapswithme/util/ThemeUtils.java @@ -2,11 +2,11 @@ package com.mapswithme.util; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.appcompat.view.ContextThemeWrapper; import android.util.TypedValue; import android.view.LayoutInflater; diff --git a/android/src/com/mapswithme/util/TypeConverter.java b/android/src/com/mapswithme/util/TypeConverter.java index a9770a6497..5938d75fc6 100644 --- a/android/src/com/mapswithme/util/TypeConverter.java +++ b/android/src/com/mapswithme/util/TypeConverter.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface TypeConverter { diff --git a/android/src/com/mapswithme/util/UTM.java b/android/src/com/mapswithme/util/UTM.java index db1696471b..87b019f6c5 100644 --- a/android/src/com/mapswithme/util/UTM.java +++ b/android/src/com/mapswithme/util/UTM.java @@ -1,6 +1,6 @@ package com.mapswithme.util; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 192d6954a8..473acc2b08 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -11,17 +11,6 @@ import android.graphics.Color; import android.graphics.Rect; import android.net.Uri; import android.os.Build; -import android.support.annotation.AnyRes; -import android.support.annotation.AttrRes; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.DimenRes; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.design.widget.TextInputLayout; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.view.Gravity; import android.view.MotionEvent; @@ -38,6 +27,17 @@ import android.widget.Button; import android.widget.FrameLayout; import android.widget.TextView; +import androidx.annotation.AnyRes; +import androidx.annotation.AttrRes; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.DimenRes; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; +import com.google.android.material.textfield.TextInputLayout; import com.mapswithme.maps.MwmApplication; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/Utils.java b/android/src/com/mapswithme/util/Utils.java index f1333d6f2a..33250d805c 100644 --- a/android/src/com/mapswithme/util/Utils.java +++ b/android/src/com/mapswithme/util/Utils.java @@ -14,14 +14,14 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; -import android.support.annotation.DimenRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.Fragment; -import android.support.v4.app.NavUtils; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.Fragment; +import androidx.core.app.NavUtils; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; diff --git a/android/src/com/mapswithme/util/log/BaseLogger.java b/android/src/com/mapswithme/util/log/BaseLogger.java index dd927cb8ea..12985fb003 100644 --- a/android/src/com/mapswithme/util/log/BaseLogger.java +++ b/android/src/com/mapswithme/util/log/BaseLogger.java @@ -1,6 +1,6 @@ package com.mapswithme.util.log; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; diff --git a/android/src/com/mapswithme/util/log/FileLoggerStrategy.java b/android/src/com/mapswithme/util/log/FileLoggerStrategy.java index b4b233c989..cf2610fbe2 100644 --- a/android/src/com/mapswithme/util/log/FileLoggerStrategy.java +++ b/android/src/com/mapswithme/util/log/FileLoggerStrategy.java @@ -6,7 +6,7 @@ import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.mapswithme.maps.BuildConfig; diff --git a/android/src/com/mapswithme/util/log/LoggerFactory.java b/android/src/com/mapswithme/util/log/LoggerFactory.java index 286a55d70d..d26de0fd00 100644 --- a/android/src/com/mapswithme/util/log/LoggerFactory.java +++ b/android/src/com/mapswithme/util/log/LoggerFactory.java @@ -2,8 +2,8 @@ package com.mapswithme.util.log; import android.app.Application; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/android/src/com/mapswithme/util/log/ZipLogsTask.java b/android/src/com/mapswithme/util/log/ZipLogsTask.java index 58c1759d7d..20c3fa42c7 100644 --- a/android/src/com/mapswithme/util/log/ZipLogsTask.java +++ b/android/src/com/mapswithme/util/log/ZipLogsTask.java @@ -1,8 +1,8 @@ package com.mapswithme.util.log; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import com.mapswithme.util.StorageUtils; diff --git a/android/src/com/mapswithme/util/push/GCMListenerRouterService.java b/android/src/com/mapswithme/util/push/GCMListenerRouterService.java index a6f8e08177..05915b456e 100644 --- a/android/src/com/mapswithme/util/push/GCMListenerRouterService.java +++ b/android/src/com/mapswithme/util/push/GCMListenerRouterService.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.google.android.gms.gcm.GcmListenerService; diff --git a/android/src/com/mapswithme/util/push/GcmInstanceIDRouterListenerService.java b/android/src/com/mapswithme/util/push/GcmInstanceIDRouterListenerService.java index c4ab03b4bc..16166086fd 100644 --- a/android/src/com/mapswithme/util/push/GcmInstanceIDRouterListenerService.java +++ b/android/src/com/mapswithme/util/push/GcmInstanceIDRouterListenerService.java @@ -1,6 +1,6 @@ package com.mapswithme.util.push; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.google.android.gms.gcm.GoogleCloudMessaging; import com.google.android.gms.iid.InstanceID; diff --git a/android/src/com/mapswithme/util/sharing/BaseShareable.java b/android/src/com/mapswithme/util/sharing/BaseShareable.java index 5ccfdcf5db..c4b872115f 100644 --- a/android/src/com/mapswithme/util/sharing/BaseShareable.java +++ b/android/src/com/mapswithme/util/sharing/BaseShareable.java @@ -3,8 +3,8 @@ package com.mapswithme.util.sharing; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import com.mapswithme.util.statistics.AlohaHelper; diff --git a/android/src/com/mapswithme/util/sharing/BookmarkInfoShareable.java b/android/src/com/mapswithme/util/sharing/BookmarkInfoShareable.java index f8410e16d1..7236c14606 100644 --- a/android/src/com/mapswithme/util/sharing/BookmarkInfoShareable.java +++ b/android/src/com/mapswithme/util/sharing/BookmarkInfoShareable.java @@ -1,10 +1,10 @@ package com.mapswithme.util.sharing; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.TextUtils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.widget.placepage.Sponsored; diff --git a/android/src/com/mapswithme/util/sharing/LocalFileShareable.java b/android/src/com/mapswithme/util/sharing/LocalFileShareable.java index 56ee52bbba..18829e330f 100644 --- a/android/src/com/mapswithme/util/sharing/LocalFileShareable.java +++ b/android/src/com/mapswithme/util/sharing/LocalFileShareable.java @@ -3,7 +3,7 @@ package com.mapswithme.util.sharing; import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.mapswithme.util.StorageUtils; diff --git a/android/src/com/mapswithme/util/sharing/MapObjectShareable.java b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java index 8191d4c45b..d5567be571 100644 --- a/android/src/com/mapswithme/util/sharing/MapObjectShareable.java +++ b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java @@ -1,8 +1,11 @@ package com.mapswithme.util.sharing; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import android.text.TextUtils; + import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.MapObject; diff --git a/android/src/com/mapswithme/util/sharing/ShareOption.java b/android/src/com/mapswithme/util/sharing/ShareOption.java index 77b72bac16..6b0ad843ea 100644 --- a/android/src/com/mapswithme/util/sharing/ShareOption.java +++ b/android/src/com/mapswithme/util/sharing/ShareOption.java @@ -3,9 +3,9 @@ package com.mapswithme.util.sharing; import android.app.Activity; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import com.mapswithme.maps.R; import com.mapswithme.maps.bookmarks.data.BookmarkInfo; diff --git a/android/src/com/mapswithme/util/sharing/ShareableInfoProvider.java b/android/src/com/mapswithme/util/sharing/ShareableInfoProvider.java index 1f92130ecf..dd6ad57653 100644 --- a/android/src/com/mapswithme/util/sharing/ShareableInfoProvider.java +++ b/android/src/com/mapswithme/util/sharing/ShareableInfoProvider.java @@ -1,6 +1,6 @@ package com.mapswithme.util.sharing; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface ShareableInfoProvider { diff --git a/android/src/com/mapswithme/util/sharing/SharingHelper.java b/android/src/com/mapswithme/util/sharing/SharingHelper.java index 91e929a815..d3ca13b897 100644 --- a/android/src/com/mapswithme/util/sharing/SharingHelper.java +++ b/android/src/com/mapswithme/util/sharing/SharingHelper.java @@ -8,10 +8,10 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.text.TextUtils; import com.cocosw.bottomsheet.BottomSheet; diff --git a/android/src/com/mapswithme/util/sharing/SharingTarget.java b/android/src/com/mapswithme/util/sharing/SharingTarget.java index a0ffa26c35..6b9f9a2799 100644 --- a/android/src/com/mapswithme/util/sharing/SharingTarget.java +++ b/android/src/com/mapswithme/util/sharing/SharingTarget.java @@ -3,7 +3,7 @@ package com.mapswithme.util.sharing; import android.content.ComponentName; import android.content.Intent; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.google.gson.annotations.SerializedName; diff --git a/android/src/com/mapswithme/util/sharing/TargetUtils.java b/android/src/com/mapswithme/util/sharing/TargetUtils.java index 210fab79ba..ee6ace3f89 100644 --- a/android/src/com/mapswithme/util/sharing/TargetUtils.java +++ b/android/src/com/mapswithme/util/sharing/TargetUtils.java @@ -3,8 +3,8 @@ package com.mapswithme.util.sharing; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public final class TargetUtils { diff --git a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java index 9443e33bf9..1d2d2162c1 100644 --- a/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java +++ b/android/src/com/mapswithme/util/sharing/ViralEditorShareable.java @@ -3,8 +3,8 @@ package com.mapswithme.util.sharing; import android.app.Activity; import android.content.Intent; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/android/src/com/mapswithme/util/statistics/Analytics.java b/android/src/com/mapswithme/util/statistics/Analytics.java index f74c16fb2d..c822386f3e 100644 --- a/android/src/com/mapswithme/util/statistics/Analytics.java +++ b/android/src/com/mapswithme/util/statistics/Analytics.java @@ -1,6 +1,6 @@ package com.mapswithme.util.statistics; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class Analytics { diff --git a/android/src/com/mapswithme/util/statistics/GalleryType.java b/android/src/com/mapswithme/util/statistics/GalleryType.java index 75396b8591..b62a4aa3b4 100644 --- a/android/src/com/mapswithme/util/statistics/GalleryType.java +++ b/android/src/com/mapswithme/util/statistics/GalleryType.java @@ -1,6 +1,6 @@ package com.mapswithme.util.statistics; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public enum GalleryType { diff --git a/android/src/com/mapswithme/util/statistics/MytargetHelper.java b/android/src/com/mapswithme/util/statistics/MytargetHelper.java index 64d50c2680..02e8334080 100644 --- a/android/src/com/mapswithme/util/statistics/MytargetHelper.java +++ b/android/src/com/mapswithme/util/statistics/MytargetHelper.java @@ -1,9 +1,9 @@ package com.mapswithme.util.statistics; import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import com.mapswithme.maps.PrivateVariables; import com.mapswithme.util.ConnectionState; diff --git a/android/src/com/mapswithme/util/statistics/PlacePageTracker.java b/android/src/com/mapswithme/util/statistics/PlacePageTracker.java index 02792251fa..c67a11fffb 100644 --- a/android/src/com/mapswithme/util/statistics/PlacePageTracker.java +++ b/android/src/com/mapswithme/util/statistics/PlacePageTracker.java @@ -2,8 +2,8 @@ package com.mapswithme.util.statistics; import android.graphics.Rect; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import com.mapswithme.maps.R; diff --git a/android/src/com/mapswithme/util/statistics/PushwooshHelper.java b/android/src/com/mapswithme/util/statistics/PushwooshHelper.java index d5b6dab288..303a779546 100644 --- a/android/src/com/mapswithme/util/statistics/PushwooshHelper.java +++ b/android/src/com/mapswithme/util/statistics/PushwooshHelper.java @@ -1,7 +1,7 @@ package com.mapswithme.util.statistics; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; diff --git a/android/src/com/mapswithme/util/statistics/StatisticValueConverter.java b/android/src/com/mapswithme/util/statistics/StatisticValueConverter.java index 3d5e520b14..92c8be34e6 100644 --- a/android/src/com/mapswithme/util/statistics/StatisticValueConverter.java +++ b/android/src/com/mapswithme/util/statistics/StatisticValueConverter.java @@ -1,6 +1,6 @@ package com.mapswithme.util.statistics; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface StatisticValueConverter { diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java index 078f3047cb..42db9632d1 100644 --- a/android/src/com/mapswithme/util/statistics/Statistics.java +++ b/android/src/com/mapswithme/util/statistics/Statistics.java @@ -6,9 +6,9 @@ import android.location.Location; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; @@ -105,7 +105,6 @@ import static com.mapswithme.util.statistics.Statistics.EventParam.BATTERY; import static com.mapswithme.util.statistics.Statistics.EventParam.BUTTON; import static com.mapswithme.util.statistics.Statistics.EventParam.CATEGORY; import static com.mapswithme.util.statistics.Statistics.EventParam.CHARGING; -import static com.mapswithme.util.statistics.Statistics.EventParam.COUNT; import static com.mapswithme.util.statistics.Statistics.EventParam.COUNT_LOWERCASE; import static com.mapswithme.util.statistics.Statistics.EventParam.DESTINATION; import static com.mapswithme.util.statistics.Statistics.EventParam.ERROR; diff --git a/android/src/com/mopub/nativeads/MopubNativeAdFactory.java b/android/src/com/mopub/nativeads/MopubNativeAdFactory.java index 16db9c89fc..b39d97df23 100644 --- a/android/src/com/mopub/nativeads/MopubNativeAdFactory.java +++ b/android/src/com/mopub/nativeads/MopubNativeAdFactory.java @@ -1,8 +1,8 @@ package com.mopub.nativeads; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.mapswithme.maps.ads.AdDataAdapter; import com.mapswithme.maps.ads.CachedMwmNativeAd; -- cgit v1.2.3