From 9ecde05d09976d22e29d5da2acc461e973c33289 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sat, 17 Apr 2021 15:09:36 +0300 Subject: [PATCH] [android] Remove UGC, guides, booking, taxi Signed-off-by: Alexander Borsuk --- android/AndroidManifest.xml | 92 +-- android/build.gradle | 1 - android/jni/CMakeLists.txt | 11 - .../jni/com/mapswithme/core/jni_helper.cpp | 3 - .../jni/com/mapswithme/core/jni_helper.hpp | 1 - android/jni/com/mapswithme/maps/Framework.cpp | 330 +------- android/jni/com/mapswithme/maps/Framework.hpp | 17 - .../com/mapswithme/maps/LightFramework.cpp | 7 - .../jni/com/mapswithme/maps/SearchEngine.cpp | 246 +----- android/jni/com/mapswithme/maps/Sponsored.cpp | 214 ----- .../com/mapswithme/maps/UserMarkHelper.cpp | 179 ++--- .../com/mapswithme/maps/UserMarkHelper.hpp | 5 +- .../maps/bookmarks/data/BookmarkManager.cpp | 537 +------------ .../maps/discovery/DiscoveryManager.cpp | 189 ----- .../com/mapswithme/maps/discovery/Locals.cpp | 121 --- .../com/mapswithme/maps/discovery/Locals.hpp | 8 - .../jni/com/mapswithme/maps/guides/Guides.cpp | 116 --- .../jni/com/mapswithme/maps/guides/Guides.hpp | 15 - .../mapswithme/maps/guides/GuidesManager.cpp | 113 --- .../mapswithme/maps/onboarding/Onboarding.cpp | 24 - .../jni/com/mapswithme/maps/promo/Promo.cpp | 197 ----- .../jni/com/mapswithme/maps/promo/Promo.hpp | 10 - .../com/mapswithme/maps/taxi/TaxiManager.cpp | 145 ---- android/multidex-config.txt | 3 - android/res/color/subscription_card_bg.xml | 5 - .../res/color/subscription_card_bg_night.xml | 5 - android/res/color/subscription_card_color.xml | 5 - .../color/subscription_card_color_night.xml | 5 - .../img_annual_subscription_offer.png | Bin 412 -> 0 bytes .../img_monthly_subscription_offer.png | Bin 404 -> 0 bytes .../img_sightseeing_subscription.png | Bin 2025 -> 0 bytes .../img_annual_subscription_offer.png | Bin 273 -> 0 bytes .../img_monthly_subscription_offer.png | Bin 268 -> 0 bytes .../img_sightseeing_subscription.png | Bin 1105 -> 0 bytes .../img_annual_subscription_offer.png | Bin 573 -> 0 bytes .../img_monthly_subscription_offer.png | Bin 560 -> 0 bytes .../img_sightseeing_subscription.png | Bin 3220 -> 0 bytes .../img_annual_subscription_offer.png | Bin 958 -> 0 bytes .../img_monthly_subscription_offer.png | Bin 935 -> 0 bytes .../img_sightseeing_subscription.png | Bin 6359 -> 0 bytes .../img_annual_subscription_offer.png | Bin 1473 -> 0 bytes .../img_monthly_subscription_offer.png | Bin 1436 -> 0 bytes .../img_sightseeing_subscription.png | Bin 10766 -> 0 bytes android/res/drawable/all_subs_header_bg.xml | 9 - android/res/drawable/bg_bought_content.xml | 7 - .../res/drawable/bg_bought_content_night.xml | 7 - android/res/drawable/bg_guides_light.xml | 6 - .../res/drawable/bg_guides_light_default.xml | 11 - .../res/drawable/bg_guides_light_pressed.xml | 11 - .../res/drawable/bg_guides_light_selected.xml | 11 - android/res/drawable/bg_guides_night.xml | 6 - .../res/drawable/bg_guides_night_default.xml | 11 - .../res/drawable/bg_guides_night_pressed.xml | 11 - .../res/drawable/bg_guides_night_selected.xml | 12 - android/res/drawable/bg_tag_night.xml | 10 - .../bookmark_subscription_screen_bg.xml | 6 - .../bookmark_subscription_screen_bg_night.xml | 3 - .../bookmarks_all_subs_central_content_bg.xml | 5 - ...ks_sightseeing_subs_central_content_bg.xml | 5 - .../res/drawable/ic_layers_routes_active.xml | 55 -- .../ic_layers_routes_active_night.xml | 55 -- .../drawable/ic_layers_routes_inactive.xml | 52 -- .../res/drawable/ic_menu_download_guides.xml | 15 - .../res/drawable/sightseeing_subs_sale_bg.xml | 5 - .../res/drawable/subscription_card_edge.xml | 5 - .../subscription_card_edge_default.xml | 13 - .../subscription_card_edge_selected.xml | 13 - .../layout-land/fragment_bookmark_payment.xml | 22 - android/res/layout-land/fragment_welcome.xml | 10 - android/res/layout-land/info_page.xml | 60 -- .../layout-land/map_navigation_buttons.xml | 8 - android/res/layout-land/news_page.xml | 84 -- android/res/layout-sw600dp-land/info_page.xml | 59 -- android/res/layout-sw600dp/info_page.xml | 58 -- .../fragment_sightseeing_subscription.xml | 179 ----- ...er_fragment_bookmarks_all_subscription.xml | 233 ------ .../layout/activity_full_screen_gallery.xml | 94 --- android/res/layout/activity_map.xml | 2 - .../res/layout/bookmark_payment_layout.xml | 85 -- .../layout/bookmark_subscription_fragment.xml | 144 ---- .../res/layout/catalog_promo_container.xml | 163 ---- .../res/layout/catalog_promo_item_card.xml | 84 -- .../layout/catalog_promo_placeholder_card.xml | 67 -- .../layout/fragment_auth_passport_dialog.xml | 97 --- .../layout/fragment_bookmark_categories.xml | 11 - .../fragment_bookmark_categories_pager.xml | 23 - .../fragment_bookmark_category_settings.xml | 80 ++ .../res/layout/fragment_bookmark_payment.xml | 18 - .../fragment_bookmarks_all_subscription.xml | 62 -- .../res/layout/fragment_bookmarks_catalog.xml | 38 - .../layout/fragment_bookmarks_description.xml | 4 - .../fragment_catalog_bookmark_categories.xml | 118 --- android/res/layout/fragment_discovery.xml | 126 --- android/res/layout/fragment_gallery.xml | 16 - android/res/layout/fragment_news.xml | 86 -- android/res/layout/fragment_permissions.xml | 10 - .../fragment_promo_after_booking_dialog.xml | 63 -- android/res/layout/fragment_routing.xml | 5 - android/res/layout/fragment_search.xml | 1 - android/res/layout/fragment_search_filter.xml | 112 --- .../fragment_show_on_map_catalog_category.xml | 44 - .../fragment_sightseeing_subscription.xml | 185 ----- android/res/layout/fragment_updater.xml | 114 --- android/res/layout/fragment_welcome.xml | 20 - .../guests_and_rooms_menu_bottom_sheet.xml | 68 -- android/res/layout/guides_discovery_item.xml | 142 ---- .../layout/guides_gallery_bottom_sheet.xml | 23 - android/res/layout/info_page.xml | 61 -- .../info_page_horizontal_bottom_container.xml | 18 - android/res/layout/item_bookmark.xml | 15 - android/res/layout/item_bookmark_category.xml | 25 - android/res/layout/item_discovery_button.xml | 13 - android/res/layout/item_discovery_expert.xml | 64 -- .../layout/item_discovery_expert_error.xml | 28 - .../layout/item_discovery_expert_loading.xml | 27 - .../layout/item_discovery_hotel_product.xml | 86 -- android/res/layout/item_discovery_search.xml | 115 --- .../layout/item_discovery_simple_error.xml | 28 - .../layout/item_discovery_simple_loading.xml | 27 - .../layout/item_discovery_simple_message.xml | 18 - android/res/layout/item_gallery.xml | 22 - android/res/layout/item_guide_info.xml | 41 +- android/res/layout/item_search_result.xml | 22 +- android/res/layout/item_tag.xml | 26 - android/res/layout/item_viator_more.xml | 29 - android/res/layout/item_viator_product.xml | 75 -- android/res/layout/layout_nav_bottom.xml | 9 - android/res/layout/map_navigation_buttons.xml | 8 - android/res/layout/menu_buttons_line.xml | 18 - android/res/layout/menu_content.xml | 10 - android/res/layout/menu_news_marker.xml | 12 - android/res/layout/menu_route_plan_line.xml | 2 - android/res/layout/news_page.xml | 91 --- ...er_fragment_bookmarks_all_subscription.xml | 223 ------ .../layout/place_page_description_header.xml | 14 +- android/res/layout/place_page_details.xml | 53 +- .../layout/place_page_hotel_description.xml | 53 -- .../layout/place_page_hotel_facilities.xml | 43 - .../res/layout/place_page_hotel_gallery.xml | 18 - .../res/layout/place_page_hotel_nearby.xml | 29 - .../res/layout/place_page_hotel_rating.xml | 60 -- android/res/layout/place_page_more.xml | 18 - android/res/layout/place_page_preview.xml | 47 +- .../res/layout/place_page_preview_rating.xml | 79 -- android/res/layout/place_page_taxi.xml | 48 -- android/res/layout/price_filter.xml | 65 -- android/res/layout/rating_filter.xml | 126 --- android/res/layout/routing_plan.xml | 18 - android/res/layout/search_filter_panel.xml | 40 - android/res/layout/subscription_button.xml | 69 -- .../res/layout/subscription_offer_card.xml | 212 ----- .../res/layout/subscription_offer_sale.xml | 28 - .../res/layout/subscription_terms_of_use.xml | 70 -- android/res/layout/taxi_panel.xml | 43 - .../res/layout/toolbar_filter_controls.xml | 35 - android/res/layout/toolbar_with_search.xml | 1 - .../toolbar_with_search_no_elevation.xml | 1 - android/res/layout/update_guide_container.xml | 41 - android/res/layout/user_agreement_block.xml | 51 -- .../welcome_buttons_horizontal_container.xml | 35 - android/res/layout/whats_new_promo_button.xml | 10 - android/res/menu/menu_bookmark_categories.xml | 3 - android/res/menu/menu_bookmarks_list.xml | 4 - .../menu/menu_catalog_bookmark_categories.xml | 15 - android/res/values/arrays.xml | 35 - android/res/values/dimens.xml | 3 + android/res/values/styles.xml | 24 - android/res/values/themes-attrs.xml | 1 - android/res/values/themes-base.xml | 51 +- android/src/com/mapswithme/HotelUtils.java | 31 - .../maps/DownloadResourcesLegacyActivity.java | 2 - .../src/com/mapswithme/maps/Framework.java | 73 +- .../src/com/mapswithme/maps/MwmActivity.java | 642 +-------------- .../com/mapswithme/maps/MwmApplication.java | 24 - .../maps/PurchaseOperationObservable.java | 175 ---- .../maps/auth/AuthorizationListener.java | 6 - .../com/mapswithme/maps/auth/Authorizer.java | 151 ---- .../maps/auth/BaseWebViewMwmFragment.java | 32 - .../com/mapswithme/maps/auth/Constants.java | 15 - .../maps/auth/PassportAuthDialogFragment.java | 93 --- .../maps/auth/PhoneAuthActivity.java | 40 - .../maps/auth/PhoneAuthFragment.java | 81 -- .../maps/auth/PhoneTokenHandler.java | 38 - .../maps/auth/SocialAuthDialogFragment.java | 205 ----- .../maps/auth/TargetFragmentCallback.java | 11 - .../mapswithme/maps/auth/TokenHandler.java | 19 - .../maps/base/BaseAuthFragment.java | 55 -- .../maps/base/BaseToolbarAuthFragment.java | 60 -- .../maps/bookmarks/AuthCompleteListener.java | 6 - .../BaseBookmarkCategoriesFragment.java | 527 ------------ .../bookmarks/BookmarkBackupController.java | 349 -------- .../bookmarks/BookmarkCategoriesActivity.java | 40 +- .../bookmarks/BookmarkCategoriesAdapter.java | 65 +- .../bookmarks/BookmarkCategoriesFragment.java | 454 ++++++++++- .../BookmarkCategoriesPageResProvider.java | 4 +- .../BookmarkCategoriesPagerFragment.java | 289 ------- .../BookmarkCategorySettingsActivity.java | 42 + .../BookmarkCategorySettingsFragment.java | 148 ++++ .../bookmarks/BookmarkCollectionAdapter.java | 68 +- .../bookmarks/BookmarkDescriptionAdapter.java | 56 -- .../bookmarks/BookmarkDownloadCallback.java | 11 - .../bookmarks/BookmarkDownloadController.java | 15 - .../bookmarks/BookmarkDownloadHandler.java | 7 - .../bookmarks/BookmarkDownloadReceiver.java | 83 -- .../maps/bookmarks/BookmarkHeaderView.java | 114 --- .../maps/bookmarks/BookmarkListActivity.java | 29 +- .../maps/bookmarks/BookmarkListAdapter.java | 11 +- .../bookmarks/BookmarksCatalogActivity.java | 54 -- .../bookmarks/BookmarksCatalogFragment.java | 597 -------------- .../BookmarksDownloadFragmentDelegate.java | 317 -------- .../bookmarks/BookmarksDownloadManager.java | 124 --- .../maps/bookmarks/BookmarksListFragment.java | 100 +-- .../maps/bookmarks/BookmarksPageFactory.java | 89 --- .../maps/bookmarks/BookmarksPagerAdapter.java | 52 -- .../CachedBookmarkCategoriesFragment.java | 248 ------ .../bookmarks/CatalogListenerDecorator.java | 74 -- .../ChooseBookmarkCategoryFragment.java | 2 +- .../DefaultBookmarkDownloadController.java | 153 ---- .../mapswithme/maps/bookmarks/Holders.java | 122 +-- ...nvalidSubscriptionAlertDialogCallback.java | 44 - .../ShowOnMapCatalogCategoryFragment.java | 85 -- .../SystemDownloadCompletedService.java | 32 - .../data/AbstractCategoriesSnapshot.java | 77 -- .../maps/bookmarks/data/Bookmark.java | 26 +- .../data/BookmarkCategoriesDataProvider.java | 2 - .../maps/bookmarks/data/BookmarkCategory.java | 149 +--- .../maps/bookmarks/data/BookmarkManager.java | 507 +----------- .../CacheBookmarkCategoriesDataProvider.java | 8 - .../bookmarks/data/CatalogCustomProperty.java | 82 -- .../data/CatalogCustomPropertyOption.java | 62 -- .../data/CatalogPropertyOptionAndKey.java | 69 -- .../bookmarks/data/CategoryDataSource.java | 9 +- .../CoreBookmarkCategoriesDataProvider.java | 8 - .../maps/bookmarks/data/ElevationInfo.java | 13 +- .../maps/bookmarks/data/FilterStrategy.java | 77 -- .../maps/bookmarks/data/MapObject.java | 152 +--- .../BookmarksDescriptionActivity.java | 29 - .../BookmarksDescriptionFragment.java | 64 -- .../maps/discovery/DiscoveryActivity.java | 101 --- .../maps/discovery/DiscoveryFragment.java | 469 ----------- .../maps/discovery/DiscoveryManager.java | 131 --- .../maps/discovery/DiscoveryParams.java | 65 -- .../discovery/DiscoveryResultReceiver.java | 25 - .../mapswithme/maps/discovery/ItemType.java | 100 --- .../maps/discovery/LocalExpert.java | 189 ----- .../com/mapswithme/maps/discovery/Locals.java | 54 -- .../maps/discovery/LocalsError.java | 48 -- .../maps/gallery/AdapterStrategy.java | 41 - .../mapswithme/maps/gallery/Constants.java | 15 - .../gallery/FullScreenGalleryActivity.java | 206 ----- .../gallery/FullScreenGalleryFragment.java | 80 -- .../maps/gallery/GalleryActivity.java | 30 - .../maps/gallery/GalleryAdapter.java | 43 - .../maps/gallery/GalleryFragment.java | 66 -- .../maps/gallery/GalleryPageAdapter.java | 45 -- .../com/mapswithme/maps/gallery/Holders.java | 753 ------------------ .../com/mapswithme/maps/gallery/Image.java | 145 ---- .../mapswithme/maps/gallery/ImageAdapter.java | 80 -- .../maps/gallery/ItemSelectedListener.java | 12 - .../com/mapswithme/maps/gallery/Items.java | 266 ------- .../maps/gallery/RegularAdapterStrategy.java | 113 --- .../SimpleSingleItemAdapterStrategy.java | 56 -- .../gallery/SingleItemAdapterStrategy.java | 71 -- .../impl/BaseItemSelectedListener.java | 50 -- .../impl/CatalogPromoAdapterStrategy.java | 49 -- .../CatalogPromoErrorAdapterStrategy.java | 35 - .../CatalogPromoLoadingAdapterStrategy.java | 37 - .../mapswithme/maps/gallery/impl/Factory.java | 108 --- .../gallery/impl/GuidesAdapterStrategy.java | 43 - .../gallery/impl/HotelAdapterStrategy.java | 55 -- .../impl/LocalExpertsAdapterStrategy.java | 64 -- .../LocalExpertsErrorAdapterStrategy.java | 29 - .../LocalExpertsLoadingAdapterStrategy.java | 29 - .../impl/RegularCatalogPromoListener.java | 56 -- .../impl/SearchBasedAdapterStrategy.java | 63 -- .../impl/SimpleErrorAdapterStrategy.java | 44 - .../impl/SimpleLoadingAdapterStrategy.java | 51 -- .../mapswithme/maps/guides/GuidesGallery.java | 327 -------- .../maps/guides/GuidesGalleryListener.java | 8 - .../com/mapswithme/maps/intent/Factory.java | 176 +--- .../maps/maplayer/BottomSheetItem.java | 15 - .../mapswithme/maps/maplayer/LayersUtils.java | 10 +- .../maplayer/MapLayerCompositeController.java | 70 +- .../com/mapswithme/maps/maplayer/Mode.java | 27 - .../maplayer/OnGuidesLayerToggleListener.java | 6 - .../maps/maplayer/ToggleMapLayerDialog.java | 20 +- .../guides/AbstractGuidesClickListener.java | 39 - .../guides/GuidesErrorDialogListener.java | 8 - .../maps/maplayer/guides/GuidesManager.java | 140 ---- .../maps/maplayer/guides/GuidesState.java | 63 -- .../guides/OnGuidesChangedListener.java | 6 - .../OnGuidesGalleryChangedListener.java | 6 - .../maps/promo/CatalogPromoController.java | 325 -------- .../src/com/mapswithme/maps/promo/Promo.java | 60 -- .../maps/promo/PromoAfterBooking.java | 40 - .../promo/PromoBookingDialogFragment.java | 104 --- .../maps/promo/PromoCityGallery.java | 229 ------ .../mapswithme/maps/promo/PromoEntity.java | 36 - .../AbstractBookmarkSubscriptionFragment.java | 517 ------------ .../AbstractBookmarkValidationCallback.java | 42 - ...AbstractProductDetailsLoadingCallback.java | 51 -- .../purchase/AbstractPurchaseController.java | 206 ----- .../maps/purchase/BillingConnection.java | 33 - .../maps/purchase/BillingManager.java | 65 -- .../maps/purchase/BillingRequest.java | 6 - .../purchase/BookmarkAllSubscriptionData.java | 94 --- .../purchase/BookmarkPaymentActivity.java | 38 - .../purchase/BookmarkPaymentDataParser.java | 61 -- .../purchase/BookmarkPaymentFragment.java | 360 --------- .../maps/purchase/BookmarkPaymentState.java | 142 ---- .../purchase/BookmarkPurchaseCallback.java | 101 --- .../purchase/BookmarkPurchaseController.java | 129 --- .../BookmarkSubscriptionActivity.java | 39 - .../BookmarkSubscriptionFragment.java | 43 - .../BookmarkSubscriptionPaymentState.java | 91 --- .../BookmarksAllSubscriptionActivity.java | 59 -- .../BookmarksAllSubscriptionFragment.java | 153 ---- .../BookmarksAllSubscriptionPage.java | 40 - .../BookmarksAllSubscriptionPageData.java | 69 -- .../BookmarksAllSubscriptionPageFragment.java | 52 -- .../BookmarksSightsSubscriptionActivity.java | 38 - .../BookmarksSightsSubscriptionFragment.java | 45 -- .../maps/purchase/ConsumePurchaseRequest.java | 43 - .../CoreStartTransactionObserver.java | 8 - .../maps/purchase/CoreValidationObserver.java | 9 - .../purchase/DefaultPurchaseValidator.java | 84 -- .../FailedBookmarkPurchaseController.java | 212 ----- .../maps/purchase/FailedPurchaseChecker.java | 8 - .../purchase/LaunchBillingFlowRequest.java | 39 - .../maps/purchase/PaymentDataParser.java | 14 - .../purchase/PlayStoreBillingCallback.java | 21 - .../purchase/PlayStoreBillingConnection.java | 82 -- .../purchase/PlayStoreBillingManager.java | 206 ----- .../purchase/PlayStoreBillingRequest.java | 49 -- .../maps/purchase/ProductDetails.java | 95 --- .../maps/purchase/PurchaseCallback.java | 18 - .../maps/purchase/PurchaseController.java | 48 -- .../maps/purchase/PurchaseFactory.java | 75 -- .../maps/purchase/PurchaseStateActivator.java | 8 - .../maps/purchase/PurchaseUtils.java | 252 ------ .../maps/purchase/PurchaseValidator.java | 37 - .../maps/purchase/QueryExistingPurchases.java | 34 - .../purchase/QueryProductDetailsRequest.java | 63 -- .../purchase/StatefulPurchaseCallback.java | 61 -- .../purchase/SubsProductDetailsCallback.java | 88 -- .../SubscriptionFragmentDelegate.java | 76 -- .../SubscriptionPurchaseController.java | 117 --- .../maps/purchase/SubscriptionType.java | 115 --- .../SubscriptionUiChangeListener.java | 15 - ...woButtonsSubscriptionFragmentDelegate.java | 137 ---- .../TwoCardsSubscriptionFragmentDelegate.java | 187 ----- .../maps/purchase/ValidationCallback.java | 8 - .../maps/purchase/ValidationStatus.java | 9 - .../com/mapswithme/maps/review/Review.java | 97 --- .../maps/review/ReviewActivity.java | 38 - .../mapswithme/maps/review/ReviewAdapter.java | 208 ----- .../maps/review/ReviewFragment.java | 77 -- .../routing/RoutingBottomMenuController.java | 105 +-- .../maps/routing/RoutingController.java | 136 +--- .../maps/routing/RoutingPlanController.java | 75 +- .../maps/routing/RoutingPlanFragment.java | 12 - .../mapswithme/maps/routing/SearchWheel.java | 3 +- .../mapswithme/maps/search/BookingFilter.java | 17 - .../maps/search/BookingFilterParams.java | 174 ---- .../maps/search/FilterActivity.java | 86 -- .../maps/search/FilterFragment.java | 195 ----- .../mapswithme/maps/search/FilterUtils.java | 458 ----------- .../FloatingSearchToolbarController.java | 5 +- .../mapswithme/maps/search/HotelsFilter.java | 321 -------- .../maps/search/HotelsFilterHolder.java | 11 - .../maps/search/HotelsTypeAdapter.java | 166 ---- .../search/NativeBookingFilterListener.java | 18 - .../maps/search/NativeSearchListener.java | 6 +- .../maps/search/PriceFilterView.java | 248 ------ .../maps/search/RatingFilterView.java | 173 ---- .../maps/search/SearchActivity.java | 51 +- .../mapswithme/maps/search/SearchAdapter.java | 111 +-- .../mapswithme/maps/search/SearchEngine.java | 64 +- .../maps/search/SearchFilterController.java | 169 +--- .../maps/search/SearchFragment.java | 162 +--- .../mapswithme/maps/search/SearchResult.java | 10 +- .../maps/taxi/DefaultFormatPriceStrategy.java | 13 - .../maps/taxi/FormatPriceStrategy.java | 9 - .../LocaleDependentFormatPriceStrategy.java | 15 - .../com/mapswithme/maps/taxi/TaxiAdapter.java | 74 -- .../com/mapswithme/maps/taxi/TaxiInfo.java | 189 ----- .../mapswithme/maps/taxi/TaxiInfoError.java | 38 - .../com/mapswithme/maps/taxi/TaxiManager.java | 126 --- .../com/mapswithme/maps/taxi/TaxiType.java | 297 ------- .../maps/tips/AbstractClickInterceptor.java | 30 - .../maps/tips/ClickInterceptor.java | 10 - .../maps/tips/ClickInterceptorFactory.java | 120 --- .../ImmersiveModeCompatPromptBackground.java | 94 --- .../com/mapswithme/maps/tips/Tutorial.java | 190 ----- .../mapswithme/maps/tips/TutorialAction.java | 7 - .../maps/tips/TutorialClickListener.java | 43 - .../ParallaxBackgroundPageListener.java | 135 ---- .../widget/ParallaxBackgroundViewPager.java | 132 --- .../mapswithme/maps/widget/RatingView.java | 171 ---- .../maps/widget/SearchToolbarController.java | 304 +------ .../maps/widget/SubscriptionButton.java | 162 ---- .../widget/menu/GuestsRoomsMenuRenderer.java | 74 -- .../mapswithme/maps/widget/menu/MainMenu.java | 53 -- .../widget/menu/MainMenuOptionListener.java | 2 - .../maps/widget/menu/MainMenuRenderer.java | 21 +- .../widget/menu/MenuControllerFactory.java | 11 - .../widget/menu/MenuRoomsGuestsListener.java | 10 - .../placepage/EditBookmarkFragment.java | 13 +- .../placepage/ErrorCatalogPromoListener.java | 49 -- .../widget/placepage/FacilitiesAdapter.java | 98 --- .../maps/widget/placepage/GalleryAdapter.java | 206 ----- .../placepage/GuidesGalleryViewRenderer.java | 321 -------- .../maps/widget/placepage/HotelPriceInfo.java | 66 -- .../maps/widget/placepage/NearbyAdapter.java | 135 ---- .../widget/placepage/PlacePageButtons.java | 140 ---- .../PlacePageControllerComposite.java | 13 +- .../widget/placepage/PlacePageFactory.java | 17 +- .../maps/widget/placepage/PlacePageView.java | 743 +---------------- .../maps/widget/placepage/ReviewAdapter.java | 118 --- .../placepage/RichPlacePageController.java | 20 +- .../maps/widget/placepage/Sponsored.java | 409 ---------- .../util/MultipleTrackerReferrerReceiver.java | 53 -- .../util/SharedPropertiesUtils.java | 87 -- .../src/com/mapswithme/util/SharingUtils.java | 12 +- 424 files changed, 1028 insertions(+), 33142 deletions(-) delete mode 100644 android/jni/com/mapswithme/maps/Sponsored.cpp delete mode 100644 android/jni/com/mapswithme/maps/discovery/DiscoveryManager.cpp delete mode 100644 android/jni/com/mapswithme/maps/discovery/Locals.cpp delete mode 100644 android/jni/com/mapswithme/maps/discovery/Locals.hpp delete mode 100644 android/jni/com/mapswithme/maps/guides/Guides.cpp delete mode 100644 android/jni/com/mapswithme/maps/guides/Guides.hpp delete mode 100644 android/jni/com/mapswithme/maps/guides/GuidesManager.cpp delete mode 100644 android/jni/com/mapswithme/maps/onboarding/Onboarding.cpp delete mode 100644 android/jni/com/mapswithme/maps/promo/Promo.cpp delete mode 100644 android/jni/com/mapswithme/maps/promo/Promo.hpp delete mode 100644 android/jni/com/mapswithme/maps/taxi/TaxiManager.cpp delete mode 100644 android/res/color/subscription_card_bg.xml delete mode 100644 android/res/color/subscription_card_bg_night.xml delete mode 100644 android/res/color/subscription_card_color.xml delete mode 100644 android/res/color/subscription_card_color_night.xml delete mode 100755 android/res/drawable-hdpi/img_annual_subscription_offer.png delete mode 100755 android/res/drawable-hdpi/img_monthly_subscription_offer.png delete mode 100755 android/res/drawable-hdpi/img_sightseeing_subscription.png delete mode 100755 android/res/drawable-mdpi/img_annual_subscription_offer.png delete mode 100755 android/res/drawable-mdpi/img_monthly_subscription_offer.png delete mode 100755 android/res/drawable-mdpi/img_sightseeing_subscription.png delete mode 100755 android/res/drawable-xhdpi/img_annual_subscription_offer.png delete mode 100755 android/res/drawable-xhdpi/img_monthly_subscription_offer.png delete mode 100755 android/res/drawable-xhdpi/img_sightseeing_subscription.png delete mode 100755 android/res/drawable-xxhdpi/img_annual_subscription_offer.png delete mode 100755 android/res/drawable-xxhdpi/img_monthly_subscription_offer.png delete mode 100755 android/res/drawable-xxhdpi/img_sightseeing_subscription.png delete mode 100755 android/res/drawable-xxxhdpi/img_annual_subscription_offer.png delete mode 100755 android/res/drawable-xxxhdpi/img_monthly_subscription_offer.png delete mode 100755 android/res/drawable-xxxhdpi/img_sightseeing_subscription.png delete mode 100644 android/res/drawable/all_subs_header_bg.xml delete mode 100644 android/res/drawable/bg_bought_content.xml delete mode 100644 android/res/drawable/bg_bought_content_night.xml delete mode 100644 android/res/drawable/bg_guides_light.xml delete mode 100644 android/res/drawable/bg_guides_light_default.xml delete mode 100644 android/res/drawable/bg_guides_light_pressed.xml delete mode 100644 android/res/drawable/bg_guides_light_selected.xml delete mode 100644 android/res/drawable/bg_guides_night.xml delete mode 100644 android/res/drawable/bg_guides_night_default.xml delete mode 100644 android/res/drawable/bg_guides_night_pressed.xml delete mode 100644 android/res/drawable/bg_guides_night_selected.xml delete mode 100644 android/res/drawable/bg_tag_night.xml delete mode 100644 android/res/drawable/bookmark_subscription_screen_bg.xml delete mode 100644 android/res/drawable/bookmark_subscription_screen_bg_night.xml delete mode 100644 android/res/drawable/bookmarks_all_subs_central_content_bg.xml delete mode 100644 android/res/drawable/bookmarks_sightseeing_subs_central_content_bg.xml delete mode 100644 android/res/drawable/ic_layers_routes_active.xml delete mode 100644 android/res/drawable/ic_layers_routes_active_night.xml delete mode 100644 android/res/drawable/ic_layers_routes_inactive.xml delete mode 100644 android/res/drawable/ic_menu_download_guides.xml delete mode 100644 android/res/drawable/sightseeing_subs_sale_bg.xml delete mode 100644 android/res/drawable/subscription_card_edge.xml delete mode 100644 android/res/drawable/subscription_card_edge_default.xml delete mode 100644 android/res/drawable/subscription_card_edge_selected.xml delete mode 100644 android/res/layout-land/fragment_bookmark_payment.xml delete mode 100644 android/res/layout-land/fragment_welcome.xml delete mode 100644 android/res/layout-land/info_page.xml delete mode 100644 android/res/layout-land/news_page.xml delete mode 100644 android/res/layout-sw600dp-land/info_page.xml delete mode 100644 android/res/layout-sw600dp/info_page.xml delete mode 100644 android/res/layout-w600dp/fragment_sightseeing_subscription.xml delete mode 100644 android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml delete mode 100644 android/res/layout/activity_full_screen_gallery.xml delete mode 100644 android/res/layout/bookmark_payment_layout.xml delete mode 100644 android/res/layout/bookmark_subscription_fragment.xml delete mode 100644 android/res/layout/catalog_promo_container.xml delete mode 100644 android/res/layout/catalog_promo_item_card.xml delete mode 100644 android/res/layout/catalog_promo_placeholder_card.xml delete mode 100644 android/res/layout/fragment_auth_passport_dialog.xml delete mode 100644 android/res/layout/fragment_bookmark_categories_pager.xml create mode 100644 android/res/layout/fragment_bookmark_category_settings.xml delete mode 100644 android/res/layout/fragment_bookmark_payment.xml delete mode 100644 android/res/layout/fragment_bookmarks_all_subscription.xml delete mode 100644 android/res/layout/fragment_bookmarks_catalog.xml delete mode 100644 android/res/layout/fragment_catalog_bookmark_categories.xml delete mode 100644 android/res/layout/fragment_discovery.xml delete mode 100644 android/res/layout/fragment_gallery.xml delete mode 100644 android/res/layout/fragment_news.xml delete mode 100644 android/res/layout/fragment_permissions.xml delete mode 100644 android/res/layout/fragment_promo_after_booking_dialog.xml delete mode 100644 android/res/layout/fragment_search_filter.xml delete mode 100644 android/res/layout/fragment_show_on_map_catalog_category.xml delete mode 100644 android/res/layout/fragment_sightseeing_subscription.xml delete mode 100644 android/res/layout/fragment_updater.xml delete mode 100644 android/res/layout/fragment_welcome.xml delete mode 100644 android/res/layout/guests_and_rooms_menu_bottom_sheet.xml delete mode 100644 android/res/layout/guides_discovery_item.xml delete mode 100644 android/res/layout/guides_gallery_bottom_sheet.xml delete mode 100644 android/res/layout/info_page.xml delete mode 100644 android/res/layout/info_page_horizontal_bottom_container.xml delete mode 100644 android/res/layout/item_discovery_button.xml delete mode 100644 android/res/layout/item_discovery_expert.xml delete mode 100644 android/res/layout/item_discovery_expert_error.xml delete mode 100644 android/res/layout/item_discovery_expert_loading.xml delete mode 100644 android/res/layout/item_discovery_hotel_product.xml delete mode 100644 android/res/layout/item_discovery_search.xml delete mode 100644 android/res/layout/item_discovery_simple_error.xml delete mode 100644 android/res/layout/item_discovery_simple_loading.xml delete mode 100644 android/res/layout/item_discovery_simple_message.xml delete mode 100644 android/res/layout/item_gallery.xml delete mode 100644 android/res/layout/item_tag.xml delete mode 100644 android/res/layout/item_viator_more.xml delete mode 100644 android/res/layout/item_viator_product.xml delete mode 100644 android/res/layout/menu_news_marker.xml delete mode 100644 android/res/layout/news_page.xml delete mode 100644 android/res/layout/pager_fragment_bookmarks_all_subscription.xml delete mode 100644 android/res/layout/place_page_hotel_description.xml delete mode 100644 android/res/layout/place_page_hotel_facilities.xml delete mode 100644 android/res/layout/place_page_hotel_gallery.xml delete mode 100644 android/res/layout/place_page_hotel_nearby.xml delete mode 100644 android/res/layout/place_page_hotel_rating.xml delete mode 100644 android/res/layout/place_page_more.xml delete mode 100644 android/res/layout/place_page_preview_rating.xml delete mode 100644 android/res/layout/place_page_taxi.xml delete mode 100644 android/res/layout/price_filter.xml delete mode 100644 android/res/layout/rating_filter.xml delete mode 100644 android/res/layout/subscription_button.xml delete mode 100644 android/res/layout/subscription_offer_card.xml delete mode 100644 android/res/layout/subscription_offer_sale.xml delete mode 100644 android/res/layout/subscription_terms_of_use.xml delete mode 100644 android/res/layout/taxi_panel.xml delete mode 100644 android/res/layout/toolbar_filter_controls.xml delete mode 100644 android/res/layout/update_guide_container.xml delete mode 100644 android/res/layout/user_agreement_block.xml delete mode 100644 android/res/layout/welcome_buttons_horizontal_container.xml delete mode 100644 android/res/layout/whats_new_promo_button.xml delete mode 100644 android/res/menu/menu_catalog_bookmark_categories.xml delete mode 100644 android/res/values/arrays.xml delete mode 100644 android/src/com/mapswithme/HotelUtils.java delete mode 100644 android/src/com/mapswithme/maps/PurchaseOperationObservable.java delete mode 100644 android/src/com/mapswithme/maps/auth/AuthorizationListener.java delete mode 100644 android/src/com/mapswithme/maps/auth/Authorizer.java delete mode 100644 android/src/com/mapswithme/maps/auth/BaseWebViewMwmFragment.java delete mode 100644 android/src/com/mapswithme/maps/auth/Constants.java delete mode 100644 android/src/com/mapswithme/maps/auth/PassportAuthDialogFragment.java delete mode 100644 android/src/com/mapswithme/maps/auth/PhoneAuthActivity.java delete mode 100644 android/src/com/mapswithme/maps/auth/PhoneAuthFragment.java delete mode 100644 android/src/com/mapswithme/maps/auth/PhoneTokenHandler.java delete mode 100644 android/src/com/mapswithme/maps/auth/SocialAuthDialogFragment.java delete mode 100644 android/src/com/mapswithme/maps/auth/TargetFragmentCallback.java delete mode 100644 android/src/com/mapswithme/maps/auth/TokenHandler.java delete mode 100644 android/src/com/mapswithme/maps/base/BaseAuthFragment.java delete mode 100644 android/src/com/mapswithme/maps/base/BaseToolbarAuthFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/AuthCompleteListener.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkBackupController.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPagerFragment.java create mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkCategorySettingsActivity.java create mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkCategorySettingsFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkDescriptionAdapter.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadCallback.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadController.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadHandler.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkDownloadReceiver.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarkHeaderView.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogActivity.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadFragmentDelegate.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksDownloadManager.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksPageFactory.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/BookmarksPagerAdapter.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/CatalogListenerDecorator.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/DefaultBookmarkDownloadController.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/InvalidSubscriptionAlertDialogCallback.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomProperty.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/data/CatalogPropertyOptionAndKey.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/data/FilterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionActivity.java delete mode 100644 android/src/com/mapswithme/maps/bookmarks/description/BookmarksDescriptionFragment.java delete mode 100644 android/src/com/mapswithme/maps/discovery/DiscoveryActivity.java delete mode 100644 android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java delete mode 100644 android/src/com/mapswithme/maps/discovery/DiscoveryManager.java delete mode 100644 android/src/com/mapswithme/maps/discovery/DiscoveryParams.java delete mode 100644 android/src/com/mapswithme/maps/discovery/DiscoveryResultReceiver.java delete mode 100644 android/src/com/mapswithme/maps/discovery/ItemType.java delete mode 100644 android/src/com/mapswithme/maps/discovery/LocalExpert.java delete mode 100644 android/src/com/mapswithme/maps/discovery/Locals.java delete mode 100644 android/src/com/mapswithme/maps/discovery/LocalsError.java delete mode 100644 android/src/com/mapswithme/maps/gallery/AdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/Constants.java delete mode 100644 android/src/com/mapswithme/maps/gallery/FullScreenGalleryActivity.java delete mode 100644 android/src/com/mapswithme/maps/gallery/FullScreenGalleryFragment.java delete mode 100644 android/src/com/mapswithme/maps/gallery/GalleryActivity.java delete mode 100644 android/src/com/mapswithme/maps/gallery/GalleryAdapter.java delete mode 100644 android/src/com/mapswithme/maps/gallery/GalleryFragment.java delete mode 100644 android/src/com/mapswithme/maps/gallery/GalleryPageAdapter.java delete mode 100644 android/src/com/mapswithme/maps/gallery/Holders.java delete mode 100644 android/src/com/mapswithme/maps/gallery/Image.java delete mode 100644 android/src/com/mapswithme/maps/gallery/ImageAdapter.java delete mode 100644 android/src/com/mapswithme/maps/gallery/ItemSelectedListener.java delete mode 100644 android/src/com/mapswithme/maps/gallery/Items.java delete mode 100644 android/src/com/mapswithme/maps/gallery/RegularAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/SingleItemAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/CatalogPromoAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/Factory.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/GuidesAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/HotelAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/LocalExpertsAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/LocalExpertsErrorAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/LocalExpertsLoadingAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/SearchBasedAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/SimpleErrorAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java delete mode 100644 android/src/com/mapswithme/maps/guides/GuidesGallery.java delete mode 100644 android/src/com/mapswithme/maps/guides/GuidesGalleryListener.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/OnGuidesLayerToggleListener.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/AbstractGuidesClickListener.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/GuidesErrorDialogListener.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/GuidesManager.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/GuidesState.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/OnGuidesChangedListener.java delete mode 100644 android/src/com/mapswithme/maps/maplayer/guides/OnGuidesGalleryChangedListener.java delete mode 100644 android/src/com/mapswithme/maps/promo/CatalogPromoController.java delete mode 100644 android/src/com/mapswithme/maps/promo/Promo.java delete mode 100644 android/src/com/mapswithme/maps/promo/PromoAfterBooking.java delete mode 100644 android/src/com/mapswithme/maps/promo/PromoBookingDialogFragment.java delete mode 100644 android/src/com/mapswithme/maps/promo/PromoCityGallery.java delete mode 100644 android/src/com/mapswithme/maps/promo/PromoEntity.java delete mode 100644 android/src/com/mapswithme/maps/purchase/AbstractBookmarkSubscriptionFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/AbstractBookmarkValidationCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/AbstractProductDetailsLoadingCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/AbstractPurchaseController.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BillingConnection.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BillingManager.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BillingRequest.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkAllSubscriptionData.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPaymentActivity.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPaymentDataParser.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPaymentFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPaymentState.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPurchaseCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkPurchaseController.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionActivity.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarkSubscriptionPaymentState.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionActivity.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPage.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageData.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksAllSubscriptionPageFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionActivity.java delete mode 100644 android/src/com/mapswithme/maps/purchase/BookmarksSightsSubscriptionFragment.java delete mode 100644 android/src/com/mapswithme/maps/purchase/ConsumePurchaseRequest.java delete mode 100644 android/src/com/mapswithme/maps/purchase/CoreStartTransactionObserver.java delete mode 100644 android/src/com/mapswithme/maps/purchase/CoreValidationObserver.java delete mode 100644 android/src/com/mapswithme/maps/purchase/DefaultPurchaseValidator.java delete mode 100644 android/src/com/mapswithme/maps/purchase/FailedBookmarkPurchaseController.java delete mode 100644 android/src/com/mapswithme/maps/purchase/FailedPurchaseChecker.java delete mode 100644 android/src/com/mapswithme/maps/purchase/LaunchBillingFlowRequest.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PaymentDataParser.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PlayStoreBillingCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PlayStoreBillingConnection.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PlayStoreBillingManager.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PlayStoreBillingRequest.java delete mode 100644 android/src/com/mapswithme/maps/purchase/ProductDetails.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseController.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseFactory.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseStateActivator.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseUtils.java delete mode 100644 android/src/com/mapswithme/maps/purchase/PurchaseValidator.java delete mode 100644 android/src/com/mapswithme/maps/purchase/QueryExistingPurchases.java delete mode 100644 android/src/com/mapswithme/maps/purchase/QueryProductDetailsRequest.java delete mode 100644 android/src/com/mapswithme/maps/purchase/StatefulPurchaseCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/SubsProductDetailsCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/SubscriptionFragmentDelegate.java delete mode 100644 android/src/com/mapswithme/maps/purchase/SubscriptionPurchaseController.java delete mode 100644 android/src/com/mapswithme/maps/purchase/SubscriptionType.java delete mode 100644 android/src/com/mapswithme/maps/purchase/SubscriptionUiChangeListener.java delete mode 100644 android/src/com/mapswithme/maps/purchase/TwoButtonsSubscriptionFragmentDelegate.java delete mode 100644 android/src/com/mapswithme/maps/purchase/TwoCardsSubscriptionFragmentDelegate.java delete mode 100644 android/src/com/mapswithme/maps/purchase/ValidationCallback.java delete mode 100644 android/src/com/mapswithme/maps/purchase/ValidationStatus.java delete mode 100644 android/src/com/mapswithme/maps/review/Review.java delete mode 100644 android/src/com/mapswithme/maps/review/ReviewActivity.java delete mode 100644 android/src/com/mapswithme/maps/review/ReviewAdapter.java delete mode 100644 android/src/com/mapswithme/maps/review/ReviewFragment.java delete mode 100644 android/src/com/mapswithme/maps/search/BookingFilter.java delete mode 100644 android/src/com/mapswithme/maps/search/BookingFilterParams.java delete mode 100644 android/src/com/mapswithme/maps/search/FilterActivity.java delete mode 100644 android/src/com/mapswithme/maps/search/FilterFragment.java delete mode 100644 android/src/com/mapswithme/maps/search/FilterUtils.java delete mode 100644 android/src/com/mapswithme/maps/search/HotelsFilter.java delete mode 100644 android/src/com/mapswithme/maps/search/HotelsFilterHolder.java delete mode 100644 android/src/com/mapswithme/maps/search/HotelsTypeAdapter.java delete mode 100644 android/src/com/mapswithme/maps/search/NativeBookingFilterListener.java delete mode 100644 android/src/com/mapswithme/maps/search/PriceFilterView.java delete mode 100644 android/src/com/mapswithme/maps/search/RatingFilterView.java delete mode 100644 android/src/com/mapswithme/maps/taxi/DefaultFormatPriceStrategy.java delete mode 100644 android/src/com/mapswithme/maps/taxi/FormatPriceStrategy.java delete mode 100644 android/src/com/mapswithme/maps/taxi/LocaleDependentFormatPriceStrategy.java delete mode 100644 android/src/com/mapswithme/maps/taxi/TaxiAdapter.java delete mode 100644 android/src/com/mapswithme/maps/taxi/TaxiInfo.java delete mode 100644 android/src/com/mapswithme/maps/taxi/TaxiInfoError.java delete mode 100644 android/src/com/mapswithme/maps/taxi/TaxiManager.java delete mode 100644 android/src/com/mapswithme/maps/taxi/TaxiType.java delete mode 100644 android/src/com/mapswithme/maps/tips/AbstractClickInterceptor.java delete mode 100644 android/src/com/mapswithme/maps/tips/ClickInterceptor.java delete mode 100644 android/src/com/mapswithme/maps/tips/ClickInterceptorFactory.java delete mode 100644 android/src/com/mapswithme/maps/tips/ImmersiveModeCompatPromptBackground.java delete mode 100644 android/src/com/mapswithme/maps/tips/Tutorial.java delete mode 100644 android/src/com/mapswithme/maps/tips/TutorialAction.java delete mode 100644 android/src/com/mapswithme/maps/tips/TutorialClickListener.java delete mode 100755 android/src/com/mapswithme/maps/widget/ParallaxBackgroundPageListener.java delete mode 100755 android/src/com/mapswithme/maps/widget/ParallaxBackgroundViewPager.java delete mode 100644 android/src/com/mapswithme/maps/widget/RatingView.java delete mode 100644 android/src/com/mapswithme/maps/widget/SubscriptionButton.java delete mode 100644 android/src/com/mapswithme/maps/widget/menu/GuestsRoomsMenuRenderer.java delete mode 100644 android/src/com/mapswithme/maps/widget/menu/MenuRoomsGuestsListener.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/FacilitiesAdapter.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/GalleryAdapter.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/HotelPriceInfo.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/NearbyAdapter.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/ReviewAdapter.java delete mode 100644 android/src/com/mapswithme/maps/widget/placepage/Sponsored.java delete mode 100644 android/src/com/mapswithme/util/MultipleTrackerReferrerReceiver.java diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 6023ec75e7..5d99727475 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -2,7 +2,6 @@ - - - - - - - - - - - - - - @@ -198,11 +179,6 @@ android:configChanges="screenLayout|screenSize" android:label="@string/app_name"/> - - @@ -275,69 +251,14 @@ android:parentActivityName="com.mapswithme.maps.MwmActivity" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/build.gradle b/android/build.gradle index 223b78e8a5..06a1eca193 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -105,7 +105,6 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.work:work-runtime:2.2.0' - implementation 'com.android.billingclient:billing:1.1' implementation('uk.co.samuelwall:material-tap-target-prompt:3.1.0', { exclude group: 'androidx.lifecycle', module: 'lifecycle-extensions' }) diff --git a/android/jni/CMakeLists.txt b/android/jni/CMakeLists.txt index c379935c0f..4a7627f104 100644 --- a/android/jni/CMakeLists.txt +++ b/android/jni/CMakeLists.txt @@ -26,10 +26,7 @@ set( com/mapswithme/core/logging.hpp com/mapswithme/core/ScopedEnv.hpp com/mapswithme/core/ScopedLocalRef.hpp - com/mapswithme/maps/discovery/Locals.hpp com/mapswithme/maps/Framework.hpp - com/mapswithme/maps/guides/Guides.hpp - com/mapswithme/maps/promo/Promo.hpp com/mapswithme/maps/SearchEngine.hpp com/mapswithme/opengl/android_gl_utils.hpp com/mapswithme/opengl/androidoglcontext.hpp @@ -44,16 +41,12 @@ set( com/mapswithme/core/jni_helper.cpp com/mapswithme/core/logging.cpp com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp - com/mapswithme/maps/discovery/DiscoveryManager.cpp - com/mapswithme/maps/discovery/Locals.cpp com/mapswithme/maps/DisplayedCategories.cpp com/mapswithme/maps/DownloadResourcesLegacyActivity.cpp com/mapswithme/maps/editor/Editor.cpp com/mapswithme/maps/editor/OpeningHours.cpp com/mapswithme/maps/editor/OsmOAuth.cpp com/mapswithme/maps/Framework.cpp - com/mapswithme/maps/guides/Guides.cpp - com/mapswithme/maps/guides/GuidesManager.cpp com/mapswithme/maps/isolines/IsolinesManager.cpp com/mapswithme/maps/LightFramework.cpp com/mapswithme/maps/LocationHelper.cpp @@ -61,17 +54,13 @@ set( com/mapswithme/maps/MapFragment.cpp com/mapswithme/maps/MapManager.cpp com/mapswithme/maps/MwmApplication.cpp - com/mapswithme/maps/onboarding/Onboarding.cpp com/mapswithme/maps/PrivateVariables.cpp - com/mapswithme/maps/promo/Promo.cpp com/mapswithme/maps/routing/RoutingOptions.cpp com/mapswithme/maps/SearchEngine.cpp com/mapswithme/maps/SearchRecents.cpp com/mapswithme/maps/settings/UnitLocale.cpp com/mapswithme/maps/sound/tts.cpp - com/mapswithme/maps/Sponsored.cpp com/mapswithme/maps/subway/SubwayManager.cpp - com/mapswithme/maps/taxi/TaxiManager.cpp com/mapswithme/maps/TrackRecorder.cpp com/mapswithme/maps/TrafficState.cpp com/mapswithme/maps/UserMarkHelper.cpp diff --git a/android/jni/com/mapswithme/core/jni_helper.cpp b/android/jni/com/mapswithme/core/jni_helper.cpp index db458a76aa..ec7e68fe65 100644 --- a/android/jni/com/mapswithme/core/jni_helper.cpp +++ b/android/jni/com/mapswithme/core/jni_helper.cpp @@ -21,7 +21,6 @@ jclass g_httpClientClazz; jclass g_httpParamsClazz; jclass g_platformSocketClazz; jclass g_utilsClazz; -jclass g_ratingClazz; jclass g_loggerFactoryClazz; jclass g_keyValueClazz; jclass g_httpUploaderClazz; @@ -49,7 +48,6 @@ JNI_OnLoad(JavaVM * jvm, void *) g_httpParamsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpClient$Params"); g_platformSocketClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/location/PlatformSocket"); g_utilsClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/Utils"); - g_ratingClazz = jni::GetGlobalClassRef(env, "com/mapswithme/maps/ugc/UGC$Rating"); g_loggerFactoryClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/log/LoggerFactory"); g_keyValueClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/KeyValue"); g_httpUploaderClazz = jni::GetGlobalClassRef(env, "com/mapswithme/util/HttpUploader"); @@ -76,7 +74,6 @@ JNI_OnUnload(JavaVM *, void *) env->DeleteGlobalRef(g_httpParamsClazz); env->DeleteGlobalRef(g_platformSocketClazz); env->DeleteGlobalRef(g_utilsClazz); - env->DeleteGlobalRef(g_ratingClazz); env->DeleteGlobalRef(g_loggerFactoryClazz); env->DeleteGlobalRef(g_keyValueClazz); env->DeleteGlobalRef(g_httpUploaderClazz); diff --git a/android/jni/com/mapswithme/core/jni_helper.hpp b/android/jni/com/mapswithme/core/jni_helper.hpp index 5e684856af..e656c27e92 100644 --- a/android/jni/com/mapswithme/core/jni_helper.hpp +++ b/android/jni/com/mapswithme/core/jni_helper.hpp @@ -22,7 +22,6 @@ extern jclass g_httpClientClazz; extern jclass g_httpParamsClazz; extern jclass g_platformSocketClazz; extern jclass g_utilsClazz; -extern jclass g_ratingClazz; extern jclass g_loggerFactoryClazz; extern jclass g_keyValueClazz; extern jclass g_httpUploaderClazz; diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index c82b75e661..f3a58b4b02 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -1,7 +1,6 @@ #include "com/mapswithme/maps/Framework.hpp" #include "com/mapswithme/core/jni_helper.hpp" -#include "com/mapswithme/maps/guides/Guides.hpp" #include "com/mapswithme/maps/UserMarkHelper.hpp" #include "com/mapswithme/opengl/androidoglcontextfactory.hpp" #include "com/mapswithme/platform/Platform.hpp" @@ -12,10 +11,6 @@ #include "map/chart_generator.hpp" #include "map/everywhere_search_params.hpp" #include "map/user_mark.hpp" -#include "map/purchase.hpp" - - -#include "web_api/utils.hpp" #include "storage/storage_defines.hpp" #include "storage/storage_helpers.hpp" @@ -118,7 +113,6 @@ Framework::Framework() m_work.GetTrafficManager().SetStateListener(bind(&Framework::TrafficStateChanged, this, _1)); m_work.GetTransitManager().SetStateListener(bind(&Framework::TransitSchemeStateChanged, this, _1)); m_work.GetIsolinesManager().SetStateListener(bind(&Framework::IsolinesSchemeStateChanged, this, _1)); - m_work.GetGuidesManager().SetStateListener(bind(&Framework::GuidesLayerStateChanged, this, _1)); m_work.GetPowerManager().Subscribe(this); } @@ -170,12 +164,6 @@ void Framework::IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state) m_onIsolinesStateChangedFn(state); } -void Framework::GuidesLayerStateChanged(GuidesManager::GuidesState state) -{ - if (m_onGuidesStateChangedFn) - m_onGuidesStateChangedFn(state); -} - bool Framework::DestroySurfaceOnDetach() { if (m_vulkanContextFactory) @@ -624,11 +612,6 @@ void Framework::SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn cons m_onIsolinesStateChangedFn = function; } -void Framework::SetGuidesListener(GuidesManager::GuidesStateChangedFn const & function) -{ - m_onGuidesStateChangedFn = function; -} - bool Framework::IsTrafficEnabled() { return m_work.GetTrafficManager().IsEnabled(); @@ -705,24 +688,6 @@ place_page::Info & Framework::GetPlacePageInfo() return m_work.GetCurrentPlacePageInfo(); } -void Framework::RequestBookingMinPrice(JNIEnv * env, jobject policy, - booking::BlockParams && params, - booking::BlockAvailabilityCallback const & callback) -{ - auto const bookingApi = m_work.GetBookingApi(ToNativeNetworkPolicy(env, policy)); - if (bookingApi) - bookingApi->GetBlockAvailability(move(params), callback); -} - -void Framework::RequestBookingInfo(JNIEnv * env, jobject policy, - string const & hotelId, string const & lang, - booking::GetHotelInfoCallback const & callback) -{ - auto const bookingApi = m_work.GetBookingApi(ToNativeNetworkPolicy(env, policy)); - if (bookingApi) - bookingApi->GetHotelInfo(hotelId, lang, callback); -} - bool Framework::IsAutoRetryDownloadFailed() { return m_work.GetDownloadingPolicy().IsAutoRetryDownloadFailed(); @@ -738,89 +703,11 @@ void Framework::EnableDownloadOn3g() m_work.GetDownloadingPolicy().EnableCellularDownload(true); } -uint64_t Framework::RequestTaxiProducts(JNIEnv * env, jobject policy, ms::LatLon const & from, - ms::LatLon const & to, - taxi::SuccessCallback const & onSuccess, - taxi::ErrorCallback const & onError) -{ - auto const taxiEngine = m_work.GetTaxiEngine(ToNativeNetworkPolicy(env, policy)); - if (!taxiEngine) - return 0; - - return taxiEngine->GetAvailableProducts(from, to, onSuccess, onError); -} - -taxi::RideRequestLinks Framework::GetTaxiLinks(JNIEnv * env, jobject policy, taxi::Provider::Type type, - string const & productId, ms::LatLon const & from, - ms::LatLon const & to) -{ - auto const taxiEngine = m_work.GetTaxiEngine(ToNativeNetworkPolicy(env, policy)); - if (!taxiEngine) - return {}; - - return taxiEngine->GetRideRequestLinks(type, productId, from, to); -} - int Framework::ToDoAfterUpdate() const { return (int) m_work.ToDoAfterUpdate(); } -uint64_t Framework::GetLocals(JNIEnv * env, jobject policy, double lat, double lon, - locals::LocalsSuccessCallback const & successFn, - locals::LocalsErrorCallback const & errorFn) -{ - auto api = NativeFramework()->GetLocalsApi(ToNativeNetworkPolicy(env, policy)); - if (api == nullptr) - return 0; - - std::string const langStr = languages::GetCurrentNorm(); - size_t constexpr kResultsOnPage = 5; - size_t constexpr kPageNumber = 1; - return api->GetLocals(lat, lon, langStr, kResultsOnPage, kPageNumber, successFn, errorFn); -} - -void Framework::GetPromoCityGallery(JNIEnv * env, jobject policy, - m2::PointD const & point, UTM utm, - promo::CityGalleryCallback const & onSuccess, - promo::OnError const & onError) -{ - auto api = NativeFramework()->GetPromoApi(ToNativeNetworkPolicy(env, policy)); - if (api == nullptr) - { - onError(); - return; - } - - api->GetCityGallery(point, languages::GetCurrentNorm(), utm, onSuccess, onError); -} - -void Framework::GetPromoPoiGallery(JNIEnv * env, jobject policy, - m2::PointD const & point, promo::Tags const & tags, - bool useCoordinates, UTM utm, - promo::CityGalleryCallback const & onSuccess, - promo::OnError const & onError) -{ - auto api = NativeFramework()->GetPromoApi(ToNativeNetworkPolicy(env, policy)); - if (api == nullptr) - { - onError(); - return; - } - - api->GetPoiGallery(point, languages::GetCurrentNorm(), tags, useCoordinates, utm, onSuccess, - onError); -} - -std::string Framework::GetPromoCityUrl(JNIEnv * env, jobject policy, jdouble lat, jdouble lon) -{ - auto api = NativeFramework()->GetPromoApi(ToNativeNetworkPolicy(env, policy)); - if (api == nullptr) - return {}; - auto const point = mercator::FromLatLon(static_cast(lat), static_cast(lon)); - return api->GetCityUrl(point); -} - void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) { // Dummy @@ -886,36 +773,6 @@ void CallSetRoutingLoadPointsListener(shared_ptr listener, bool success RoutingManager::LoadRouteHandler g_loadRouteHandler; -void CallPurchaseValidationListener(shared_ptr listener, Purchase::ValidationCode code, - Purchase::ValidationResponse const & validationResponse) -{ - JNIEnv * env = jni::GetEnv(); - jmethodID const methodId = jni::GetMethodID(env, *listener, "onValidatePurchase", - "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V"); - - jni::TScopedLocalRef const serverId(env, jni::ToJavaString(env, validationResponse.m_info.m_serverId)); - jni::TScopedLocalRef const vendorId(env, jni::ToJavaString(env, validationResponse.m_info.m_vendorId)); - jni::TScopedLocalRef const receiptData(env, jni::ToJavaString(env, validationResponse.m_info.m_receiptData)); - - env->CallVoidMethod(*listener, methodId, static_cast(code), serverId.get(), vendorId.get(), - receiptData.get(), static_cast(validationResponse.m_isTrial)); -} - -void CallStartPurchaseTransactionListener(shared_ptr listener, bool success, - std::string const & serverId, - std::string const & vendorId) -{ - JNIEnv * env = jni::GetEnv(); - jmethodID const methodId = jni::GetMethodID(env, *listener, "onStartTransaction", - "(ZLjava/lang/String;Ljava/lang/String;)V"); - - jni::TScopedLocalRef const serverIdStr(env, jni::ToJavaString(env, serverId)); - jni::TScopedLocalRef const vendorIdStr(env, jni::ToJavaString(env, vendorId)); - - env->CallVoidMethod(*listener, methodId, static_cast(success), - serverIdStr.get(), vendorIdStr.get()); -} - /// @name JNI EXPORTS JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) @@ -995,16 +852,8 @@ Java_com_mapswithme_maps_Framework_nativePlacePageActivationListener(JNIEnv *env jni::TScopedLocalRef placePageDataRef(env, nullptr); if (info.IsTrack()) { - auto const categoryId = info.GetBookmarkCategoryId(); - auto const serverId = frm()->GetBookmarkManager().GetCategoryServerId(categoryId); auto const elevationInfo = frm()->GetBookmarkManager().MakeElevationInfo(info.GetTrackId()); - placePageDataRef.reset(usermark_helper::CreateElevationInfo(env, serverId, elevationInfo)); - } - else if (info.IsGuide()) - { - auto const & guidesManager = frm()->GetGuidesManager(); - auto const gallery = guidesManager.GetGallery(); - placePageDataRef.reset(guides::CreateGallery(env, gallery)); + placePageDataRef.reset(usermark_helper::CreateElevationInfo(env, elevationInfo)); } else { @@ -1276,12 +1125,6 @@ Java_com_mapswithme_maps_Framework_nativeGetUserAgent(JNIEnv * env, jclass) return jni::ToJavaString(env, GetPlatform().GetAppUserAgent()); } -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_Framework_nativeGetDeviceId(JNIEnv * env, jclass) -{ - return jni::ToJavaString(env, web_api::DeviceId()); -} - JNIEXPORT jobjectArray JNICALL Java_com_mapswithme_maps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass) { @@ -1740,19 +1583,6 @@ Java_com_mapswithme_maps_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jc return static_cast(frm()->LoadIsolinesEnabled()); } -JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeSetGuidesLayerEnabled( - JNIEnv * env, jclass, jboolean enabled) -{ - frm()->SaveGuidesEnabled(static_cast(enabled)); - frm()->GetGuidesManager().SetEnabled(static_cast(enabled)); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_Framework_nativeIsGuidesLayerEnabled(JNIEnv * env, jclass) -{ - return static_cast(frm()->LoadGuidesEnabled()); -} - JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { @@ -1897,56 +1727,6 @@ Java_com_mapswithme_maps_Framework_nativeDeleteSavedRoutePoints() frm()->GetRoutingManager().DeleteSavedRoutePoints(); } -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeAuthenticateUser(JNIEnv * env, jclass, jstring socialToken, - jint socialTokenType, - jboolean privacyAccepted, - jboolean termsAccepted, - jboolean promoAccepted, - jobject listener) -{ - std::shared_ptr<_jobject> gListener(env->NewGlobalRef(listener), [](jobject l) - { - jni::GetEnv()->DeleteGlobalRef(l); - }); - - auto const tokenStr = jni::ToNativeString(env, socialToken); - auto & user = frm()->GetUser(); - auto s = make_unique(); - s->m_postCallAction = User::Subscriber::Action::RemoveSubscriber; - s->m_onAuthenticate = [gListener](bool success) - { - GetPlatform().RunTask(Platform::Thread::Gui, [gListener, success] - { - auto e = jni::GetEnv(); - jmethodID const callback = jni::GetMethodID(e, gListener.get(), "onAuthorized", "(Z)V"); - e->CallVoidMethod(gListener.get(), callback, success); - }); - }; - user.AddSubscriber(std::move(s)); - user.Authenticate(tokenStr, static_cast(socialTokenType), - static_cast(privacyAccepted), static_cast(termsAccepted), - static_cast(promoAccepted)); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_Framework_nativeIsUserAuthenticated() -{ - return frm()->GetUser().IsAuthenticated(); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_Framework_nativeGetPhoneAuthUrl(JNIEnv * env, jclass, jstring redirectUrl) -{ - return jni::ToJavaString(env, User::GetPhoneAuthUrl(jni::ToNativeString(env, redirectUrl))); -} - -JNIEXPORT jobjectArray JNICALL -Java_com_mapswithme_maps_Framework_nativeGetDefaultAuthHeaders(JNIEnv * env, jobject) -{ - return jni::ToKeyValueArray(env, web_api::GetDefaultAuthHeaders()); -} - JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_Framework_nativeGetPrivacyPolicyLink(JNIEnv * env, jclass) { @@ -1968,120 +1748,12 @@ Java_com_mapswithme_maps_Framework_nativeShowFeature(JNIEnv * env, jclass, jobje frm()->ShowFeature(f); } -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeShowBookmarkCategory(JNIEnv * env, jclass, jlong cat) -{ - frm()->ShowBookmarkCategory(static_cast(cat)); -} - -JNIEXPORT jint JNICALL -Java_com_mapswithme_maps_Framework_nativeGetFilterRating(JNIEnv * env, jclass, jfloat rawRating) -{ - return static_cast(place_page::rating::GetFilterRating(rawRating)); -} - JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeMakeCrash(JNIEnv *env, jclass type) { CHECK(false, ("Diagnostic native crash!")); } -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeValidatePurchase(JNIEnv * env, jclass, jstring serverId, - jstring vendorId, jstring purchaseData) -{ - auto const & purchase = frm()->GetPurchase(); - if (purchase == nullptr) - return; - - Purchase::ValidationInfo info; - info.m_serverId = jni::ToNativeString(env, serverId); - info.m_vendorId = jni::ToNativeString(env, vendorId); - info.m_receiptData = jni::ToNativeString(env, purchaseData); - - purchase->Validate(info, frm()->GetUser().GetAccessToken()); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeStartPurchaseTransaction(JNIEnv * env, jclass, - jstring serverId, - jstring vendorId) -{ - auto const & purchase = frm()->GetPurchase(); - if (purchase == nullptr) - return; - - purchase->StartTransaction(jni::ToNativeString(env, serverId), - jni::ToNativeString(env, vendorId), - frm()->GetUser().GetAccessToken()); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeSetPurchaseValidationListener(JNIEnv *, jclass, - jobject listener) -{ - auto const & purchase = frm()->GetPurchase(); - if (purchase == nullptr) - return; - - if (listener != nullptr) - { - purchase->SetValidationCallback(bind(&CallPurchaseValidationListener, - jni::make_global_ref(listener), _1, _2)); - } - else - { - purchase->SetValidationCallback(nullptr); - } -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeStartPurchaseTransactionListener(JNIEnv *, jclass, - jobject listener) -{ - auto const & purchase = frm()->GetPurchase(); - if (purchase == nullptr) - return; - - if (listener != nullptr) - { - purchase->SetStartTransactionCallback(bind(&CallStartPurchaseTransactionListener, - jni::make_global_ref(listener), _1, _2, _3)); - } - else - { - purchase->SetStartTransactionCallback(nullptr); - } -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_Framework_nativeHasActiveSubscription(JNIEnv *, jclass, jint type) -{ - auto const & purchase = frm()->GetPurchase(); - return purchase != nullptr ? - static_cast(purchase->IsSubscriptionActive(static_cast(type))) : - static_cast(false); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeSetActiveSubscription(JNIEnv *, jclass, jint type, - jboolean isActive, jboolean isTrial) -{ - auto const & purchase = frm()->GetPurchase(); - if (purchase == nullptr) - return; - - purchase->SetSubscriptionEnabled(static_cast(type), static_cast(isActive), - static_cast(isTrial)); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_Framework_nativeGetAccessToken(JNIEnv * env, jclass) -{ - auto & user = frm()->GetUser(); - return jni::ToJavaString(env, user.GetAccessToken()); -} - JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, jint facilityType, jboolean state) diff --git a/android/jni/com/mapswithme/maps/Framework.hpp b/android/jni/com/mapswithme/maps/Framework.hpp index e262f57992..db4eb7d32f 100644 --- a/android/jni/com/mapswithme/maps/Framework.hpp +++ b/android/jni/com/mapswithme/maps/Framework.hpp @@ -58,7 +58,6 @@ namespace android void TrafficStateChanged(TrafficManager::TrafficState state); void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState state); void IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state); - void GuidesLayerStateChanged(GuidesManager::GuidesState state); void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive); @@ -69,7 +68,6 @@ namespace android TrafficManager::TrafficStateChangedFn m_onTrafficStateChangedFn; TransitReadManager::TransitStateChangedFn m_onTransitStateChangedFn; IsolinesManager::IsolinesStateChangedFn m_onIsolinesStateChangedFn; - GuidesManager::GuidesStateChangedFn m_onGuidesStateChangedFn; bool m_isChoosePositionMode; @@ -160,7 +158,6 @@ namespace android void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn); void SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn const & fn); void SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn const & fn); - void SetGuidesListener(GuidesManager::GuidesStateChangedFn const & fn); bool IsTrafficEnabled(); void EnableTraffic(); @@ -185,20 +182,6 @@ namespace android int ToDoAfterUpdate() const; - uint64_t GetLocals(JNIEnv * env, jobject policy, double lat, double lon, - locals::LocalsSuccessCallback const & successFn, - locals::LocalsErrorCallback const & errorFn); - void GetPromoCityGallery(JNIEnv * env, jobject policy, m2::PointD const & point, UTM utm, - promo::CityGalleryCallback const & onSuccess, - promo::OnError const & onError); - void GetPromoPoiGallery(JNIEnv * env, jobject policy, m2::PointD const & point, - promo::Tags const & tags, bool useCoordinates, UTM utm, - promo::CityGalleryCallback const & onSuccess, - promo::OnError const & onError); - promo::AfterBooking GetPromoAfterBooking(JNIEnv * env, jobject policy); - std::string GetPromoCityUrl(JNIEnv * env, jobject policy, jdouble lat, jdouble lon); - - // PowerManager::Subscriber overrides: void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override; void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override; diff --git a/android/jni/com/mapswithme/maps/LightFramework.cpp b/android/jni/com/mapswithme/maps/LightFramework.cpp index 0e7f806c97..bde8205a39 100644 --- a/android/jni/com/mapswithme/maps/LightFramework.cpp +++ b/android/jni/com/mapswithme/maps/LightFramework.cpp @@ -15,13 +15,6 @@ Java_com_mapswithme_maps_LightFramework_nativeIsAuthenticated(JNIEnv * env, jcla return static_cast(framework.IsUserAuthenticated()); } -JNIEXPORT jint JNICALL -Java_com_mapswithme_maps_LightFramework_nativeGetNumberUnsentUGC(JNIEnv * env, jclass clazz) -{ - lightweight::Framework const framework(lightweight::REQUEST_TYPE_NUMBER_OF_UNSENT_UGC); - return static_cast(framework.GetNumberOfUnsentUGC()); -} - JNIEXPORT jstring JNICALL Java_com_mapswithme_maps_LightFramework_nativeMakeFeatureId(JNIEnv * env, jclass clazz, jstring mwmName, jlong mwmVersion, diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index 60ea4071aa..edb87542d5 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -61,8 +61,6 @@ jmethodID g_mapResultCtor; jmethodID g_updateBookmarksResultsId; jmethodID g_endBookmarksResultsId; -booking::filter::Tasks g_lastBookingFilterTasks; - bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters) { return !hasPosition || distanceInMeters > search::Result::kPopularityHighPriorityMinDistance; @@ -125,19 +123,12 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b jni::TScopedLocalRef brand(env, jni::ToJavaString(env, result.GetBrand())); jni::TScopedLocalRef airportIata(env, jni::ToJavaString(env, result.GetAirportIata())); jni::TScopedLocalRef roadShields(env, jni::ToJavaString(env, result.GetRoadShields())); - jni::TScopedLocalRef pricing(env, jni::ToJavaString(env, result.GetHotelApproximatePricing())); - auto const hotelRating = result.GetHotelRating(); - auto const ugcRating = productInfo.m_ugcRating; - auto const rating = static_cast(hotelRating == kInvalidRatingValue ? ugcRating - : hotelRating); - jni::TScopedLocalRef desc(env, env->NewObject(g_descriptionClass, g_descriptionConstructor, featureId.get(), featureType.get(), address.get(), dist.get(), cuisine.get(), brand.get(), airportIata.get(), - roadShields.get(), pricing.get(), rating, - result.GetStarsCount(), + roadShields.get(), static_cast(result.IsOpenNow()), static_cast(popularityHasHigherPriority))); @@ -167,14 +158,12 @@ void OnResults(Results const & results, vector const & prod jni::TScopedLocalObjectArrayRef jResults( env, BuildSearchResults(results, productInfo, hasPosition, lat, lon)); env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(), - static_cast(timestamp), - static_cast(results.GetType() == Results::Type::Hotels)); + static_cast(timestamp)); } if (results.IsEndMarker()) { - env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast(timestamp), - static_cast(results.GetType() == Results::Type::Hotels)); + env->CallVoidMethod(g_javaListener, g_endResultsId, static_cast(timestamp)); if (isMapAndTable && results.IsEndedNormal()) g_framework->NativeFramework()->GetSearchAPI().PokeSearchInViewport(); } @@ -235,181 +224,6 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results const & res env->CallVoidMethod(g_javaListener, method, jResults.get(), static_cast(timestamp)); } - -void OnBookingFilterAvailabilityResults(shared_ptr const & apiParams, - vector const & featuresSorted) -{ - auto const it = g_lastBookingFilterTasks.Find(booking::filter::Type::Availability); - - if (it == g_lastBookingFilterTasks.end()) - return; - - // Ignore obsolete booking filter results. - if (!it->m_filterParams.m_apiParams->Equals(*apiParams)) - return; - - ASSERT(is_sorted(featuresSorted.cbegin(), featuresSorted.cend()), ()); - - JNIEnv * env = jni::GetEnv(); - jni::TScopedLocalObjectArrayRef jResults(env, - usermark_helper::ToFeatureIdArray(env, featuresSorted)); - env->CallVoidMethod(g_javaListener, g_onFilterHotels, - static_cast(booking::filter::Type::Availability), jResults.get()); -} - -void OnBookingFilterDealsResults(shared_ptr const & apiParams, - vector const & featuresSorted) -{ - auto const it = g_lastBookingFilterTasks.Find(booking::filter::Type::Deals); - - if (it == g_lastBookingFilterTasks.end()) - return; - - // Ignore obsolete booking filter results. - if (!it->m_filterParams.m_apiParams->Equals(*apiParams)) - return; - - ASSERT(is_sorted(featuresSorted.cbegin(), featuresSorted.cend()), ()); - - JNIEnv * env = jni::GetEnv(); - jni::TScopedLocalObjectArrayRef jResults(env, - usermark_helper::ToFeatureIdArray(env, featuresSorted)); - env->CallVoidMethod(g_javaListener, g_onFilterHotels, - static_cast(booking::filter::Type::Deals), jResults.get()); -} - -class BookingBuilder -{ -public: - void Init(JNIEnv * env) - { - if (m_initialized) - return; - - m_bookingFilterParamsClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/BookingFilterParams"); - m_roomClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/BookingFilterParams$Room"); - m_checkinMillisecId = env->GetFieldID(m_bookingFilterParamsClass, "mCheckinMillisec", "J"); - m_checkoutMillisecId = env->GetFieldID(m_bookingFilterParamsClass, "mCheckoutMillisec", "J"); - m_roomsId = env->GetFieldID(m_bookingFilterParamsClass, "mRooms", - "[Lcom/mapswithme/maps/search/BookingFilterParams$Room;"); - m_roomAdultsCountId = env->GetFieldID(m_roomClass, "mAdultsCount", "I"); - m_roomAgeOfChildrenId = env->GetMethodID(m_roomClass, "getAgeOfChildren", "()[I"); - - m_initialized = true; - } - - booking::AvailabilityParams BuildAvailability(JNIEnv * env, jobject bookingFilterParams) - { - booking::AvailabilityParams result; - - if (!m_initialized || bookingFilterParams == nullptr) - return result; - - auto & orderingParams = result.m_orderingParams; - - jlong const jcheckin = env->GetLongField(bookingFilterParams, m_checkinMillisecId) / 1000; - orderingParams.m_checkin = - booking::OrderingParams::Clock::from_time_t(static_cast(jcheckin)); - - jlong const jcheckout = env->GetLongField(bookingFilterParams, m_checkoutMillisecId) / 1000; - orderingParams.m_checkout = - booking::OrderingParams::Clock::from_time_t(static_cast(jcheckout)); - - jobjectArray const jrooms = - static_cast(env->GetObjectField(bookingFilterParams, m_roomsId)); - ASSERT(jrooms, ("Rooms must be non-null!")); - - auto const length = static_cast(env->GetArrayLength(jrooms)); - orderingParams.m_rooms.resize(length); - for (size_t i = 0; i < length; ++i) - { - jobject jroom = env->GetObjectArrayElement(jrooms, static_cast(i)); - - auto & room = orderingParams.m_rooms[i]; - room.SetAdultsCount(static_cast(env->GetIntField(jroom, m_roomAdultsCountId))); - - auto const childrenObject = env->CallObjectMethod(jroom, m_roomAgeOfChildrenId); - if (childrenObject != nullptr) - { - auto const children = static_cast(childrenObject); - auto const dtor = [children, env](jint * data) { env->ReleaseIntArrayElements(children, data, 0); }; - std::unique_ptr data{env->GetIntArrayElements(children, nullptr), dtor}; - - auto const childrenCount = env->GetArrayLength(children); - std::vector ageOfChildren; - for (jsize j = 0; j < childrenCount; ++j) - { - ageOfChildren.push_back(static_cast(data.get()[j])); - } - room.SetAgeOfChildren(ageOfChildren); - } - } - return result; - } - - booking::AvailabilityParams BuildDeals(JNIEnv * env, jobject bookingFilterParams) - { - booking::AvailabilityParams result; - - if (!m_initialized) - return result; - - if (bookingFilterParams != nullptr) - { - result = BuildAvailability(env, bookingFilterParams); - } - else if (platform::GetCurrentNetworkPolicy().CanUse()) - { - result = g_framework->NativeFramework()->GetLastBookingAvailabilityParams(); - if (result.IsEmpty()) - result = booking::AvailabilityParams::MakeDefault(); - } - - result.m_dealsOnly = true; - - return result; - } - - booking::filter::Tasks BuildTasks(JNIEnv * env, jobject bookingFilterParams) - { - booking::filter::Tasks tasks; - - auto const availabilityParams = BuildAvailability(env, bookingFilterParams); - - if (!availabilityParams.IsEmpty()) - { - booking::filter::Params p(make_shared(availabilityParams), - bind(&::OnBookingFilterAvailabilityResults, _1, _2)); - - tasks.EmplaceBack(booking::filter::Type::Availability, move(p)); - } - - auto const dealsParams = BuildDeals(env, bookingFilterParams); - - if (!dealsParams.IsEmpty()) - { - booking::filter::Params p(make_shared(dealsParams), - bind(&::OnBookingFilterDealsResults, _1, _2)); - - tasks.EmplaceBack(booking::filter::Type::Deals, move(p)); - } - - return tasks; - } - -private: - jclass m_bookingFilterParamsClass = nullptr; - jclass m_roomClass = nullptr; - jfieldID m_checkinMillisecId = nullptr; - jfieldID m_checkoutMillisecId = nullptr; - jfieldID m_roomsId = nullptr; - jfieldID m_roomAdultsCountId = nullptr; - jmethodID m_roomAgeOfChildrenId = nullptr; - - bool m_initialized = false; -} g_bookingBuilder; } // namespace jobjectArray BuildSearchResults(Results const & results, @@ -438,9 +252,11 @@ extern "C" Java_com_mapswithme_maps_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz) { g_javaListener = env->NewGlobalRef(thiz); + // public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp) g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate", - "([Lcom/mapswithme/maps/search/SearchResult;JZ)V"); - g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(JZ)V"); + "([Lcom/mapswithme/maps/search/SearchResult;J)V"); + // public void onResultsEnd(long timestamp) + g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V"); g_resultClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult"); g_resultConstructor = jni::GetConstructorID( env, g_resultClass, @@ -448,11 +264,16 @@ extern "C" "Lcom/mapswithme/maps/search/Popularity;)V"); g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I)V"); g_descriptionClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult$Description"); + /* + Description(FeatureId featureId, String featureType, String region, String distance, + String cuisine, String brand, String airportIata, String roadShields, + int openNow, boolean hasPopularityHigherPriority) + */ g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;FIIZ)V"); + "Ljava/lang/String;IZ)V"); g_popularityClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/Popularity"); g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V"); @@ -466,27 +287,16 @@ extern "C" jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsUpdate", "([JJ)V"); g_endBookmarksResultsId = jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsEnd", "([JJ)V"); - - g_onFilterHotels = jni::GetMethodID(env, g_javaListener, "onFilterHotels", - "(I[Lcom/mapswithme/maps/bookmarks/data/FeatureId;)V"); - - g_hotelsFilterBuilder.Init(env); - g_bookingBuilder.Init(env); } JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunSearch( JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp, - jboolean hasPosition, jdouble lat, jdouble lon, jobject hotelsFilter, - jobject bookingFilterParams) + jboolean hasPosition, jdouble lat, jdouble lon) { search::EverywhereSearchParams params; params.m_query = jni::ToNativeString(env, bytes); params.m_inputLocale = jni::ToNativeString(env, lang); params.m_onResults = bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon); - params.m_hotelsFilter = g_hotelsFilterBuilder.Build(env, hotelsFilter); - params.m_bookingFilterTasks = g_bookingBuilder.BuildTasks(env, bookingFilterParams); - - g_lastBookingFilterTasks = params.m_bookingFilterTasks; bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(params); if (searchStarted) g_queryTimestamp = timestamp; @@ -495,15 +305,11 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunInteractiveSearch( JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp, - jboolean isMapAndTable, jobject hotelsFilter, jobject bookingFilterParams) + jboolean isMapAndTable) { search::ViewportSearchParams vparams; vparams.m_query = jni::ToNativeString(env, bytes); vparams.m_inputLocale = jni::ToNativeString(env, lang); - vparams.m_hotelsFilter = g_hotelsFilterBuilder.Build(env, hotelsFilter); - vparams.m_bookingFilterTasks = g_bookingBuilder.BuildTasks(env, bookingFilterParams); - - g_lastBookingFilterTasks = vparams.m_bookingFilterTasks; // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use // HotelsClassifier for hotel queries detection. @@ -516,8 +322,6 @@ extern "C" eparams.m_inputLocale = vparams.m_inputLocale; eparams.m_onResults = bind(&OnResults, _1, _2, timestamp, isMapAndTable, false /* hasPosition */, 0.0 /* lat */, 0.0 /* lon */); - eparams.m_hotelsFilter = vparams.m_hotelsFilter; - eparams.m_bookingFilterTasks = g_lastBookingFilterTasks; if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(eparams)) g_queryTimestamp = timestamp; @@ -574,24 +378,4 @@ extern "C" { g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches(); } - - JNIEXPORT jobjectArray JNICALL - Java_com_mapswithme_maps_search_SearchEngine_nativeGetHotelTypes(JNIEnv * env, jclass clazz) - { - using Type = ftypes::IsHotelChecker::Type; - static jclass const hotelTypeClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/HotelsFilter$HotelType"); - static jmethodID const hotelTypeCtorId = - jni::GetConstructorID(env, hotelTypeClass, "(ILjava/lang/String;)V"); - - vector types; - for (size_t i = 0; i < static_cast(Type::Count); i++) - types.push_back(static_cast(i)); - - return jni::ToJavaArray(env, hotelTypeClass, types, [](JNIEnv * env, Type const & item) { - auto const tag = ftypes::IsHotelChecker::GetHotelTypeTag(item); - return env->NewObject(hotelTypeClass, hotelTypeCtorId, static_cast(item), - jni::ToJavaString(env, tag)); - }); - } } // extern "C" diff --git a/android/jni/com/mapswithme/maps/Sponsored.cpp b/android/jni/com/mapswithme/maps/Sponsored.cpp deleted file mode 100644 index a1a3fed5d0..0000000000 --- a/android/jni/com/mapswithme/maps/Sponsored.cpp +++ /dev/null @@ -1,214 +0,0 @@ -#include "com/mapswithme/maps/Framework.hpp" - -#include "com/mapswithme/core/jni_helper.hpp" -#include "com/mapswithme/platform/Platform.hpp" - -#include "map/place_page_info.hpp" - - -#include -#include -#include - -namespace -{ -using namespace booking; - -jclass g_sponsoredClass; -jclass g_facilityTypeClass; -jclass g_nearbyObjectClass; -jclass g_imageClass; -jclass g_reviewClass; -jclass g_hotelInfoClass; -jclass g_priceInfoClass; -jmethodID g_priceInfoConstructor; -jmethodID g_facilityConstructor; -jmethodID g_nearbyConstructor; -jmethodID g_imageConstructor; -jmethodID g_reviewConstructor; -jmethodID g_hotelInfoConstructor; -jmethodID g_sponsoredClassConstructor; -jmethodID g_priceCallback; -jmethodID g_infoCallback; -std::string g_lastRequestedHotelId; - -void PrepareClassRefs(JNIEnv * env, jclass sponsoredClass) -{ - if (g_sponsoredClass) - return; - - g_sponsoredClass = static_cast(env->NewGlobalRef(sponsoredClass)); - g_hotelInfoClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/widget/placepage/Sponsored$HotelInfo"); - g_facilityTypeClass = jni::GetGlobalClassRef( - env, "com/mapswithme/maps/widget/placepage/Sponsored$FacilityType"); - g_nearbyObjectClass = jni::GetGlobalClassRef( - env, "com/mapswithme/maps/widget/placepage/Sponsored$NearbyObject"); - g_reviewClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/review/Review"); - g_imageClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/gallery/Image"); - g_priceInfoClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/widget/placepage/HotelPriceInfo"); - - g_facilityConstructor = - jni::GetConstructorID(env, g_facilityTypeClass, "(Ljava/lang/String;Ljava/lang/String;)V"); - g_nearbyConstructor = jni::GetConstructorID( - env, g_nearbyObjectClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DD)V"); - g_imageConstructor = - jni::GetConstructorID(env, g_imageClass, "(Ljava/lang/String;Ljava/lang/String;)V"); - g_reviewConstructor = jni::GetConstructorID(env, g_reviewClass, - "(JFLjava/lang/String;Ljava/lang/" - "String;Ljava/lang/String;)V"); - g_priceInfoConstructor = - jni::GetConstructorID(env, g_priceInfoClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)V"); - - g_hotelInfoConstructor = jni::GetConstructorID( - env, g_hotelInfoClass, - "(Ljava/lang/String;[Lcom/mapswithme/maps/gallery/Image;[Lcom/mapswithme/maps/widget/" - "placepage/Sponsored$FacilityType;[Lcom/mapswithme/maps/review/Review;[Lcom/mapswithme/" - "maps/widget/placepage/Sponsored$NearbyObject;J)V"); - - // Sponsored(String rating, int impress, String price, String url, String deepLink, - // String descriptionUrl, String moreUrl, String reviewUrl, int type, - // int partnerIndex, String partnerName) - g_sponsoredClassConstructor = jni::GetConstructorID( - env, g_sponsoredClass, - "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;IILjava/lang/String;)V"); - // static void onPriceReceived(final String id, final String price, final String currency) - g_priceCallback = - jni::GetStaticMethodID(env, g_sponsoredClass, "onPriceReceived", - "(Lcom/mapswithme/maps/widget/placepage/HotelPriceInfo;)V"); - // static void onDescriptionReceived(final String id, final String description) - g_infoCallback = jni::GetStaticMethodID( - env, g_sponsoredClass, "onHotelInfoReceived", - "(Ljava/lang/String;Lcom/mapswithme/maps/widget/placepage/Sponsored$HotelInfo;)V"); -} - -jobjectArray ToPhotosArray(JNIEnv * env, std::vector const & photos) -{ - return jni::ToJavaArray(env, g_imageClass, photos, - [](JNIEnv * env, HotelPhotoUrls const & item) { - return env->NewObject(g_imageClass, g_imageConstructor, - jni::ToJavaString(env, item.m_original), - jni::ToJavaString(env, item.m_small)); - }); -} - -jobjectArray ToFacilitiesArray(JNIEnv * env, std::vector const & facilities) -{ - return jni::ToJavaArray(env, g_facilityTypeClass, facilities, - [](JNIEnv * env, HotelFacility const & item) { - return env->NewObject(g_facilityTypeClass, g_facilityConstructor, - jni::ToJavaString(env, item.m_type), - jni::ToJavaString(env, item.m_name)); - }); -} - -jobjectArray ToReviewsArray(JNIEnv * env, std::vector const & reviews) -{ - return jni::ToJavaArray(env, g_reviewClass, reviews, - [](JNIEnv * env, HotelReview const & item) { - return env->NewObject( - g_reviewClass, g_reviewConstructor, - std::chrono::time_point_cast(item.m_date).time_since_epoch().count(), - item.m_score, jni::ToJavaString(env, item.m_author), - jni::ToJavaString(env, item.m_pros), jni::ToJavaString(env, item.m_cons)); - }); -} -} // namespace - -extern "C" -{ -// static Sponsored nativeGetCurrent(); -JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_widget_placepage_Sponsored_nativeGetCurrent( - JNIEnv * env, jclass clazz) -{ - PrepareClassRefs(env, clazz); - - if (!g_framework->NativeFramework()->HasPlacePageInfo()) - return nullptr; - - place_page::Info const & ppInfo = g_framework->GetPlacePageInfo(); - if (!ppInfo.IsSponsored()) - return nullptr; - - std::string rating = place_page::rating::GetRatingFormatted(ppInfo.GetRatingRawValue()); - return env->NewObject(g_sponsoredClass, g_sponsoredClassConstructor, - jni::ToJavaString(env, rating), - static_cast(place_page::rating::GetImpress(ppInfo.GetRatingRawValue())), - jni::ToJavaString(env, ppInfo.GetApproximatePricing()), - jni::ToJavaString(env, ppInfo.GetSponsoredUrl()), - jni::ToJavaString(env, ppInfo.GetSponsoredDeepLink()), - jni::ToJavaString(env, ppInfo.GetSponsoredDescriptionUrl()), - jni::ToJavaString(env, ppInfo.GetSponsoredMoreUrl()), - jni::ToJavaString(env, ppInfo.GetSponsoredReviewUrl()), - static_cast(ppInfo.GetSponsoredType()), - static_cast(ppInfo.GetPartnerIndex()), - jni::ToJavaString(env, ppInfo.GetPartnerName())); -} - -// static void nativeRequestPrice(String id, String currencyCode); -JNIEXPORT void JNICALL Java_com_mapswithme_maps_widget_placepage_Sponsored_nativeRequestPrice( - JNIEnv * env, jclass clazz, jobject policy, jstring id, jstring currencyCode) -{ - PrepareClassRefs(env, clazz); - - std::string const hotelId = jni::ToNativeString(env, id); - g_lastRequestedHotelId = hotelId; - - std::string const code = jni::ToNativeString(env, currencyCode); - auto params = booking::BlockParams::MakeDefault(); - params.m_hotelId = hotelId; - params.m_currency = code; - g_framework->RequestBookingMinPrice( - env, policy, std::move(params), - [](std::string const & hotelId, booking::Blocks const & blocks) { - if (g_lastRequestedHotelId != hotelId) - return; - - JNIEnv * env = jni::GetEnv(); - auto const price = blocks.m_totalMinPrice == BlockInfo::kIncorrectPrice - ? "" - : std::to_string(blocks.m_totalMinPrice); - auto const hotelPriceInfo = env->NewObject(g_priceInfoClass, - g_priceInfoConstructor, - jni::ToJavaString(env, hotelId), - jni::ToJavaString(env, price), - jni::ToJavaString(env, blocks.m_currency), - static_cast(blocks.m_maxDiscount), - static_cast(blocks.m_hasSmartDeal)); - - env->CallStaticVoidMethod(g_sponsoredClass, g_priceCallback, hotelPriceInfo); - }); -} - -// static void nativeRequestInfo(String id, String locale); -JNIEXPORT void JNICALL Java_com_mapswithme_maps_widget_placepage_Sponsored_nativeRequestHotelInfo( - JNIEnv * env, jclass clazz, jobject policy, jstring id, jstring locale) -{ - PrepareClassRefs(env, clazz); - - std::string const hotelId = jni::ToNativeString(env, id); - g_lastRequestedHotelId = hotelId; - - std::string code = jni::ToNativeString(env, locale); - - if (code.size() > 2) // 2 - number of characters in country code - code.resize(2); - - g_framework->RequestBookingInfo(env, policy, hotelId, code, [hotelId](HotelInfo const hotelInfo) { - if (g_lastRequestedHotelId != hotelId) - return; - JNIEnv * env = jni::GetEnv(); - - auto description = jni::ToJavaString(env, hotelInfo.m_description); - auto photos = ToPhotosArray(env, hotelInfo.m_photos); - auto facilities = ToFacilitiesArray(env, hotelInfo.m_facilities); - auto reviews = ToReviewsArray(env, hotelInfo.m_reviews); - auto nearby = env->NewObjectArray(0, g_nearbyObjectClass, 0); - jlong reviewsCount = static_cast(hotelInfo.m_scoreCount); - env->CallStaticVoidMethod(g_sponsoredClass, g_infoCallback, jni::ToJavaString(env, hotelId), - env->NewObject(g_hotelInfoClass, g_hotelInfoConstructor, description, - photos, facilities, reviews, nearby, reviewsCount)); - }); -} -} // extern "C" diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index e2fd1102ff..c08c285d63 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -24,14 +24,6 @@ void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, f } } -jobject CreateRating(JNIEnv * env, std::string const & name) -{ - static jmethodID const ratingCtorId = - jni::GetConstructorID(env, g_ratingClazz, "(Ljava/lang/String;F)V"); - jni::TScopedLocalRef nameRef(env, jni::ToJavaString(env, name)); - return env->NewObject(g_ratingClazz, ratingCtorId, nameRef.get(), place_page::kIncorrectRating); -} - jobject CreatePopularity(JNIEnv * env, place_page::Info const & info) { static jclass const popularityClass = @@ -42,52 +34,38 @@ jobject CreatePopularity(JNIEnv * env, place_page::Info const & info) return env->NewObject(popularityClass, popularityConstructor, static_cast(popularityValue)); } -jobject CreateHotelType(JNIEnv * env, place_page::Info const & info) -{ - if (!info.GetHotelType()) - return nullptr; - - static jclass const hotelTypeClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/HotelsFilter$HotelType"); - static jmethodID const hotelTypeCtorId = - jni::GetConstructorID(env, hotelTypeClass, "(ILjava/lang/String;)V"); - - auto const tag = ftypes::IsHotelChecker::GetHotelTypeTag(*info.GetHotelType()); - return env->NewObject(hotelTypeClass, hotelTypeCtorId, static_cast(*info.GetHotelType()), - jni::ToJavaString(env, tag)); -} - jobject CreateMapObject(JNIEnv * env, std::string const & mwmName, int64_t mwmVersion, uint32_t featureIndex, int mapObjectType, std::string const & title, std::string const & secondaryTitle, std::string const & subtitle, double lat, double lon, std::string const & address, Metadata const & metadata, - std::string const & apiId, jintArray jTaxiTypes, - std::string const & bookingSearchUrl, + std::string const & apiId, jobject const & routingPointInfo, place_page::OpeningMode openingMode, - bool shouldShowUGC, bool canBeRated, bool canBeReviewed, - jobjectArray jratings, jobject const & hotelType, int priceRate, jobject const & popularity, std::string const & description, - RoadWarningMarkType roadWarningMarkType, bool isTopChoice, - jobjectArray jrawTypes) + RoadWarningMarkType roadWarningMarkType, jobjectArray jrawTypes) { - // public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title, - // @Nullable String secondaryTitle, String subtitle, String address, - // double lat, double lon, String apiId - // @Nullable int[] types, @Nullable String bookingSearchUrl, - // @Nullable RoutePointInfo routePointInfo, - // @OpeningMode int openingMode, boolean shouldShowUGC, boolean canBeRated, - // boolean canBeReviewed, @Nullable UGC.Rating[] ratings, - // @Nullable HotelsFilter.HotelType hotelType, - // @PriceFilterView.PriceDef int priceRate - // boolean isTopChoice) + // public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title, + // @Nullable String secondaryTitle, String subtitle, String address, + // double lat, double lon, String apiId, @Nullable RoutePointInfo routePointInfo, + // @OpeningMode int openingMode, @NonNull Popularity popularity, @NonNull String description, + // int roadWarningType, @Nullable String[] rawTypes) static jmethodID const ctorId = jni::GetConstructorID( env, g_mapObjectClazz, - "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;ILjava/lang/String;Ljava/lang/" - "String;Ljava/lang/String;Ljava/lang/String;DDLjava/lang/" - "String;[ILjava/lang/String;" - "Lcom/mapswithme/maps/routing/RoutePointInfo;IZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;" - "Lcom/mapswithme/maps/search/HotelsFilter$HotelType;ILcom/mapswithme/maps/search/Popularity;" - "Ljava/lang/String;IZ[Ljava/lang/String;)V"); + "(" + "Lcom/mapswithme/maps/bookmarks/data/FeatureId;" // featureId + "I" // mapObjectType + "Ljava/lang/String;" // title + "Ljava/lang/String;" // secondaryTitle + "Ljava/lang/String;" // subtitle + "Ljava/lang/String;" // address + "DD" // lat, lon + "Ljava/lang/String;" // appId + "Lcom/mapswithme/maps/routing/RoutePointInfo;" // routePointInfo + "I" // openingMode + "Lcom/mapswithme/maps/search/Popularity;" // popularity + "Ljava/lang/String;" // description + "I" // roadWarnType + "[Ljava/lang/String;" // rawTypes + ")V"); //public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex) static jmethodID const featureCtorId = @@ -102,53 +80,35 @@ jobject CreateMapObject(JNIEnv * env, std::string const & mwmName, int64_t mwmVe jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, subtitle)); jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, address)); jni::TScopedLocalRef jApiId(env, jni::ToJavaString(env, apiId)); - jni::TScopedLocalRef jBookingSearchUrl(env, jni::ToJavaString(env, bookingSearchUrl)); jni::TScopedLocalRef jDescription(env, jni::ToJavaString(env, description)); jobject mapObject = env->NewObject(g_mapObjectClazz, ctorId, jFeatureId.get(), mapObjectType, jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, lon, jApiId.get(), - jTaxiTypes, jBookingSearchUrl.get(), routingPointInfo, - static_cast(openingMode), static_cast(shouldShowUGC), - static_cast(canBeRated), static_cast(canBeReviewed), - jratings, hotelType, priceRate, popularity, jDescription.get(), - static_cast(roadWarningMarkType), static_cast(isTopChoice), - jrawTypes); + routingPointInfo, + static_cast(openingMode), popularity, jDescription.get(), + static_cast(roadWarningMarkType), jrawTypes); InjectMetadata(env, g_mapObjectClazz, mapObject, metadata); return mapObject; } jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, - const jni::TScopedLocalObjectArrayRef &jratings, - const jni::TScopedLocalIntArrayRef &jTaxiTypes, const jni::TScopedLocalObjectArrayRef &jrawTypes, const jni::TScopedLocalRef &routingPointInfo, - const jni::TScopedLocalRef &hotelType, - const jni::TScopedLocalRef &popularity, int priceRate) + const jni::TScopedLocalRef &popularity) { - // public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId, - // @IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle, - // @Nullable String subtitle, @Nullable String address, - // @Nullable int[] reachableByTaxiTypes, @Nullable String bookingSearchUrl, - // @Nullable RoutePointInfo routePointInfo, - // @OpeningMode int openingMode, boolean shouldShowUGC, boolean canBeRated, - // boolean canBeReviewed, @Nullable UGC.Rating[] ratings, - // @Nullable HotelsFilter.HotelType hotelType, - // @PriceFilterView.PriceDef int priceRate, - // @NotNull com.mapswithme.maps.search.Popularity entity - // @NotNull String description - // boolean isTopChoice) + //public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId, + // @IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle, + // @Nullable String subtitle, @Nullable String address, @Nullable RoutePointInfo routePointInfo, + // @OpeningMode int openingMode, @NonNull Popularity popularity, @NonNull String description, + // @Nullable String[] rawTypes) static jmethodID const ctorId = jni::GetConstructorID(env, g_bookmarkClazz, "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;JJLjava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "[ILjava/lang/String;" "Lcom/mapswithme/maps/routing/RoutePointInfo;" - "IZZZ[Lcom/mapswithme/maps/ugc/UGC$Rating;" - "Lcom/mapswithme/maps/search/HotelsFilter$HotelType;" "ILcom/mapswithme/maps/search/Popularity;Ljava/lang/String;" - "Z[Ljava/lang/String;)V"); - // public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex) + "[Ljava/lang/String;)V"); static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V"); @@ -163,14 +123,11 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, info.GetSubtitle())); jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, info.GetAddress())); jni::TScopedLocalRef jDescription(env, jni::ToJavaString(env, info.GetDescription())); - jni::TScopedLocalRef jBookingSearchUrl(env, jni::ToJavaString(env, info.GetBookingSearchUrl())); jobject mapObject = env->NewObject( g_bookmarkClazz, ctorId, jFeatureId.get(), static_cast(categoryId), static_cast(bookmarkId), jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), - jAddress.get(), jTaxiTypes.get(), jBookingSearchUrl.get(), - routingPointInfo.get(), info.GetOpeningMode(), info.ShouldShowUGC(), - info.CanBeRated(), info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, - popularity.get(), jDescription.get(), info.IsTopChoice(), jrawTypes.get()); + jAddress.get(), routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), + jDescription.get(), jrawTypes.get()); if (info.HasMetadata()) InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); @@ -200,7 +157,7 @@ jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & p }); } -jobject CreateElevationInfo(JNIEnv * env, std::string const & serverId, ElevationInfo const & info) +jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info) { // public ElevationInfo(long trackId, @NonNull String name, @NonNull Point[] points, // int ascent, int descent, int minAltitude, int maxAltitude, int difficulty, @@ -209,11 +166,10 @@ jobject CreateElevationInfo(JNIEnv * env, std::string const & serverId, Elevatio jni::GetConstructorID(env, g_elevationInfoClazz, "(JLjava/lang/String;Ljava/lang/String;" "[Lcom/mapswithme/maps/bookmarks/data/ElevationInfo$Point;" "IIIIIJ)V"); - jni::TScopedLocalRef jServerId(env, jni::ToJavaString(env, serverId)); jni::TScopedLocalRef jName(env, jni::ToJavaString(env, info.GetName())); jni::TScopedLocalObjectArrayRef jPoints(env, ToElevationPointArray(env, info.GetPoints())); return env->NewObject(g_elevationInfoClazz, ctorId, static_cast(info.GetId()), - jServerId.get(), jName.get(), jPoints.get(), + jName.get(), jPoints.get(), static_cast(info.GetAscent()), static_cast(info.GetDescent()), static_cast(info.GetMinAltitude()), @@ -224,25 +180,17 @@ jobject CreateElevationInfo(JNIEnv * env, std::string const & serverId, Elevatio jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) { - jni::TScopedLocalObjectArrayRef jratings(env, ToRatingArray(env, info.GetRatingCategories())); - - jni::TScopedLocalIntArrayRef jTaxiTypes(env, ToReachableByTaxiProvidersArray(env, info.ReachableByTaxiProviders())); - jni::TScopedLocalObjectArrayRef jrawTypes(env, jni::ToJavaStringArray(env, info.GetRawTypes())); jni::TScopedLocalRef routingPointInfo(env, nullptr); if (info.IsRoutePoint()) routingPointInfo.reset(CreateRoutePointInfo(env, info)); - jni::TScopedLocalRef hotelType(env, CreateHotelType(env, info)); jni::TScopedLocalRef popularity(env, CreatePopularity(env, info)); - int priceRate = info.GetRawApproximatePricing().value_or(kPriceRateUndefined); - if (info.IsBookmark()) { - return CreateBookmark(env, info, jratings, jTaxiTypes, jrawTypes, - routingPointInfo, hotelType, popularity, priceRate); + return CreateBookmark(env, info, jrawTypes, routingPointInfo, popularity); } ms::LatLon const ll = info.GetLatLon(); @@ -253,12 +201,10 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kMyPosition, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, - info.GetAddress(), {}, "", jTaxiTypes.get(), - info.GetBookingSearchUrl(), routingPointInfo.get(), - info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), - info.CanBeReviewed(), jratings.get(), hotelType.get(), priceRate, + info.GetAddress(), {}, "", + routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), info.GetDescription(), info.GetRoadType(), - info.IsTopChoice(), jrawTypes.get()); + jrawTypes.get()); } if (info.HasApiUrl()) @@ -266,50 +212,17 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) return CreateMapObject( env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, - info.GetAddress(), info.GetMetadata(), info.GetApiUrl(), jTaxiTypes.get(), - info.GetBookingSearchUrl(), routingPointInfo.get(), info.GetOpeningMode(), - info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), jratings.get(), - hotelType.get(), priceRate, popularity.get(), info.GetDescription(), info.GetRoadType(), - info.IsTopChoice(), jrawTypes.get()); + info.GetAddress(), info.GetMetadata(), info.GetApiUrl(), + routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), info.GetDescription(), + info.GetRoadType(), jrawTypes.get()); } return CreateMapObject( env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kPoi, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, info.GetAddress(), info.HasMetadata() ? info.GetMetadata() : Metadata(), "", - jTaxiTypes.get(), info.GetBookingSearchUrl(), routingPointInfo.get(), - info.GetOpeningMode(), info.ShouldShowUGC(), info.CanBeRated(), info.CanBeReviewed(), - jratings.get(), hotelType.get(), priceRate, popularity.get(), info.GetDescription(), - info.GetRoadType(), info.IsTopChoice(), jrawTypes.get()); -} - -jobjectArray ToRatingArray(JNIEnv * env, std::vector const & ratingCategories) -{ - if (ratingCategories.empty()) - return nullptr; - - return jni::ToJavaArray(env, g_ratingClazz, ratingCategories, - [](JNIEnv * env, std::string const & item) { - return CreateRating(env, item); - }); -} - -jintArray ToReachableByTaxiProvidersArray(JNIEnv * env, std::vector const & types) -{ - auto const count = static_cast(types.size()); - - if (count == 0) - return nullptr; - - jint tmp[count]; - for (size_t i = 0; i < count; ++i) - tmp[i] = static_cast(types[i]); - - jintArray result = env->NewIntArray(count); - ASSERT(result, ()); - env->SetIntArrayRegion(result, 0, count, tmp); - - return result; + routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), info.GetDescription(), + info.GetRoadType(), jrawTypes.get()); } jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info) diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.hpp b/android/jni/com/mapswithme/maps/UserMarkHelper.hpp index b933410eaa..fafa3d8c41 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.hpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.hpp @@ -34,13 +34,10 @@ void InjectMetadata(JNIEnv * env, jclass clazz, jobject const mapObject, feature jobject CreateMapObject(JNIEnv * env, place_page::Info const & info); -jobject CreateElevationInfo(JNIEnv * env, std::string const & serverId, ElevationInfo const & info); +jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info); jobjectArray ToRatingArray(JNIEnv * env, std::vector const & ratingCategories); -jintArray ToReachableByTaxiProvidersArray(JNIEnv * env, - std::vector const & types); - jobject CreateLocalAdInfo(JNIEnv * env, place_page::Info const & info); jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info); diff --git a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp index 74d77f76f1..75f01eb07d 100644 --- a/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp +++ b/android/jni/com/mapswithme/maps/bookmarks/data/BookmarkManager.cpp @@ -31,33 +31,10 @@ jmethodID g_onBookmarksLoadingFinishedMethod; jmethodID g_onBookmarksFileLoadedMethod; jmethodID g_onFinishKmlConversionMethod; jmethodID g_onPreparedFileForSharingMethod; -jmethodID g_onSynchronizationStartedMethod; -jmethodID g_onSynchronizationFinishedMethod; -jmethodID g_onRestoreRequestedMethod; -jmethodID g_onRestoredFilesPreparedMethod; -jmethodID g_onImportStartedMethod; -jmethodID g_onImportFinishedMethod; -jmethodID g_onTagsReceivedMethod; -jmethodID g_onCustomPropertiesReceivedMethod; -jmethodID g_onUploadStartedMethod; -jmethodID g_onUploadFinishedMethod; jmethodID g_onElevationActivePointChangedMethod; jmethodID g_onElevationCurrentPositionChangedMethod; jclass g_bookmarkCategoryClass; jmethodID g_bookmarkCategoryConstructor; -jclass g_catalogTagClass; -jmethodID g_catalogTagConstructor; -jclass g_catalogTagsGroupClass; -jmethodID g_catalogTagsGroupConstructor; - -jclass g_catalogCustomPropertyOptionClass; -jmethodID g_catalogCustomPropertyOptionConstructor; -jclass g_catalogCustomPropertyClass; -jmethodID g_catalogCustomPropertyConstructor; - -jmethodID g_onPingFinishedMethod; - -jmethodID g_onCheckExpiredCategoriesMethod; jclass g_sortedBlockClass; jmethodID g_sortedBlockConstructor; @@ -95,35 +72,6 @@ void PrepareClassRefs(JNIEnv * env) g_onPreparedFileForSharingMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing", "(Lcom/mapswithme/maps/bookmarks/data/BookmarkSharingResult;)V"); - g_onSynchronizationStartedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onSynchronizationStarted", "(I)V"); - g_onSynchronizationFinishedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, - "onSynchronizationFinished", "(IILjava/lang/String;)V"); - g_onRestoreRequestedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onRestoreRequested", "(ILjava/lang/String;J)V"); - g_onRestoredFilesPreparedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onRestoredFilesPrepared", "()V"); - g_onImportStartedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onImportStarted", "(Ljava/lang/String;)V"); - g_onImportFinishedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onImportFinished", "(Ljava/lang/String;JZ)V"); - g_onTagsReceivedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onTagsReceived", - "(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogTagsGroup;I)V"); - g_onCustomPropertiesReceivedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onCustomPropertiesReceived", - "(Z[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomProperty;)V"); - - g_onUploadStartedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onUploadStarted", "(J)V"); - g_onUploadFinishedMethod = - jni::GetMethodID(env, bookmarkManagerInstance, "onUploadFinished", "(ILjava/lang/String;JJ)V"); - - g_onPingFinishedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPingFinished", "(Z)V"); - - g_onCheckExpiredCategoriesMethod = jni::GetMethodID(env, bookmarkManagerInstance, - "onCheckExpiredCategories", "(Z)V"); g_longClass = jni::GetGlobalClassRef(env,"java/lang/Long"); g_longConstructor = jni::GetConstructorID(env, g_longClass, "(J)V"); @@ -147,49 +95,22 @@ void PrepareClassRefs(JNIEnv * env) //public BookmarkCategory(long id, // String name, -// String authorId, -// String authorName, // String annotation, // String desc, // int tracksCount, // int bookmarksCount, -// boolean fromCatalog, -// boolean isMyCategory, -// boolean isVisible, -// String mImageUrl) +// boolean isVisible) g_bookmarkCategoryConstructor = jni::GetConstructorID(env, g_bookmarkCategoryClass, - "(JLjava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "IIZZZILjava/lang/String;Ljava/lang/String;)V"); - - g_catalogTagClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogTag"); -//public CatalogTag(@NonNull String id, @NonNull String localizedName, float r, float g, float b) - g_catalogTagConstructor = - jni::GetConstructorID(env, g_catalogTagClass, "(Ljava/lang/String;Ljava/lang/String;FFF)V"); - - g_catalogTagsGroupClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogTagsGroup"); -//public CatalogTagsGroup(@NonNull String localizedName, @NonNull CatalogTag[] tags) - g_catalogTagsGroupConstructor = - jni::GetConstructorID(env, g_catalogTagsGroupClass, - "(Ljava/lang/String;[Lcom/mapswithme/maps/bookmarks/data/CatalogTag;)V"); - - g_catalogCustomPropertyOptionClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption"); -//public CatalogCustomPropertyOption(@NonNull String value, @NonNull String localizedName) - g_catalogCustomPropertyOptionConstructor = - jni::GetConstructorID(env, g_catalogCustomPropertyOptionClass, - "(Ljava/lang/String;Ljava/lang/String;)V"); - g_catalogCustomPropertyClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/bookmarks/data/CatalogCustomProperty"); -//public CatalogCustomProperty(@NonNull String key, @NonNull String localizedName, -// boolean isRequired, @NonNull CatalogCustomPropertyOption[] options) - g_catalogCustomPropertyConstructor = - jni::GetConstructorID(env, g_catalogCustomPropertyClass, - "(Ljava/lang/String;Ljava/lang/String;Z" - "[Lcom/mapswithme/maps/bookmarks/data/CatalogCustomPropertyOption;)V"); + "(" + "J" // id + "Ljava/lang/String;" // name + "Ljava/lang/String;" // annotation + "Ljava/lang/String;" // desc + "I" // tracksCount + "I" // bookmarksCount + "Z" // isVisible + ")V"); g_onElevationCurrentPositionChangedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onElevationCurrentPositionChanged", "()V"); g_onElevationActivePointChangedMethod = @@ -297,194 +218,6 @@ void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const jni::HandleJavaException(env); } -void OnSynchronizationStarted(JNIEnv * env, Cloud::SynchronizationType type) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onSynchronizationStartedMethod, - static_cast(type)); - jni::HandleJavaException(env); -} - -void OnSynchronizationFinished(JNIEnv * env, Cloud::SynchronizationType type, - Cloud::SynchronizationResult result, - std::string const & errorStr) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onSynchronizationFinishedMethod, - static_cast(type), static_cast(result), - jni::ToJavaString(env, errorStr)); - jni::HandleJavaException(env); -} - -void OnRestoreRequested(JNIEnv * env, Cloud::RestoringRequestResult result, - std::string const & deviceName, uint64_t backupTimestampInMs) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onRestoreRequestedMethod, - static_cast(result), jni::ToJavaString(env, deviceName), - static_cast(backupTimestampInMs)); - jni::HandleJavaException(env); -} - -void OnRestoredFilesPrepared(JNIEnv * env) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onRestoredFilesPreparedMethod); - jni::HandleJavaException(env); -} - -void OnImportStarted(JNIEnv * env, std::string const & serverId) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onImportStartedMethod, - jni::ToJavaString(env, serverId)); - jni::HandleJavaException(env); -} - -void OnImportFinished(JNIEnv * env, std::string const & serverId, kml::MarkGroupId categoryId, - bool successful) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onImportFinishedMethod, - jni::ToJavaString(env, serverId), static_cast(categoryId), - static_cast(successful)); - jni::HandleJavaException(env); -} - -void OnTagsReceived(JNIEnv * env, bool successful, BookmarkCatalog::TagGroups const & groups, - uint32_t maxTagsCount) -{ - ASSERT(g_bookmarkManagerClass, ()); - ASSERT(g_catalogTagClass, ()); - ASSERT(g_catalogTagsGroupClass, ()); - - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - - jni::TScopedLocalObjectArrayRef tagGroupsRef(env, - jni::ToJavaArray(env, g_catalogTagsGroupClass, groups, - [](JNIEnv * env, BookmarkCatalog::TagGroup const & tagGroup) - { - jni::TScopedLocalRef tagGroupNameRef(env, jni::ToJavaString(env, tagGroup.m_name)); - - jni::TScopedLocalObjectArrayRef tagsRef(env, - jni::ToJavaArray(env, g_catalogTagClass, tagGroup.m_tags, - [](JNIEnv * env, BookmarkCatalog::Tag const & tag) - { - jni::TScopedLocalRef tagIdRef(env, jni::ToJavaString(env, tag.m_id)); - jni::TScopedLocalRef tagNameRef(env, jni::ToJavaString(env, tag.m_name)); - return env->NewObject(g_catalogTagClass, g_catalogTagConstructor, - tagIdRef.get(), tagNameRef.get(), - static_cast(tag.m_color[0]), - static_cast(tag.m_color[1]), - static_cast(tag.m_color[2])); - })); - - return env->NewObject(g_catalogTagsGroupClass, g_catalogTagsGroupConstructor, - tagGroupNameRef.get(), tagsRef.get()); - })); - - env->CallVoidMethod(bookmarkManagerInstance, g_onTagsReceivedMethod, - static_cast(successful), tagGroupsRef.get(), - static_cast(maxTagsCount)); - jni::HandleJavaException(env); -} - -void OnCustomPropertiesReceived(JNIEnv * env, bool successful, - BookmarkCatalog::CustomProperties const & properties) -{ - ASSERT(g_bookmarkManagerClass, ()); - ASSERT(g_catalogCustomPropertyOptionClass, ()); - ASSERT(g_catalogCustomPropertyClass, ()); - - jni::TScopedLocalObjectArrayRef propsRef(env, - jni::ToJavaArray(env, g_catalogCustomPropertyClass, properties, - [](JNIEnv * env, BookmarkCatalog::CustomProperty const & customProperty) - { - jni::TScopedLocalRef nameRef(env, jni::ToJavaString(env, customProperty.m_name)); - jni::TScopedLocalRef keyRef(env, jni::ToJavaString(env, customProperty.m_key)); - jni::TScopedLocalObjectArrayRef optionsRef(env, - jni::ToJavaArray(env, g_catalogCustomPropertyOptionClass, customProperty.m_options, - [](JNIEnv * env, BookmarkCatalog::CustomProperty::Option const & option) - { - jni::TScopedLocalRef valueRef(env, jni::ToJavaString(env, option.m_value)); - jni::TScopedLocalRef optNameRef(env, jni::ToJavaString(env, option.m_name)); - return env->NewObject(g_catalogCustomPropertyOptionClass, - g_catalogCustomPropertyOptionConstructor, - valueRef.get(), optNameRef.get()); - })); - return env->NewObject(g_catalogCustomPropertyClass, - g_catalogCustomPropertyConstructor, - keyRef.get(), nameRef.get(), - static_cast(customProperty.m_isRequired), - optionsRef.get()); - })); - - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onCustomPropertiesReceivedMethod, - static_cast(successful), propsRef.get()); - jni::HandleJavaException(env); -} - -void OnPingFinished(JNIEnv * env, bool isSuccessful) -{ - ASSERT(g_bookmarkManagerClass, ()); - - auto bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onPingFinishedMethod, - static_cast(isSuccessful)); - jni::HandleJavaException(env); -} - -void OnCheckExpiredCategories(JNIEnv * env, bool hasExpiredCategories) -{ - ASSERT(g_bookmarkManagerClass, ()); - - auto bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onCheckExpiredCategoriesMethod, - static_cast(hasExpiredCategories)); - jni::HandleJavaException(env); -} - -void OnUploadStarted(JNIEnv * env, kml::MarkGroupId originCategoryId) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - env->CallVoidMethod(bookmarkManagerInstance, g_onUploadStartedMethod, - static_cast(originCategoryId)); - jni::HandleJavaException(env); -} - -void OnUploadFinished(JNIEnv * env, BookmarkCatalog::UploadResult uploadResult, - std::string const & description, kml::MarkGroupId originCategoryId, - kml::MarkGroupId resultCategoryId) -{ - ASSERT(g_bookmarkManagerClass, ()); - jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, - g_bookmarkManagerInstanceField); - jni::TScopedLocalRef const descriptionStr(env, jni::ToJavaString(env, description)); - env->CallVoidMethod(bookmarkManagerInstance, g_onUploadFinishedMethod, - static_cast(uploadResult), descriptionStr.get(), - static_cast(originCategoryId), static_cast(resultCategoryId)); - jni::HandleJavaException(env); -} - void OnCategorySortingResults(JNIEnv * env, long long timestamp, BookmarkManager::SortedBlocksCollection && sortedBlocks, BookmarkManager::SortParams::Status status) @@ -547,40 +280,26 @@ jobject MakeCategory(JNIEnv * env, kml::MarkGroupId id) auto const & manager = frm()->GetBookmarkManager(); auto const & data = manager.GetCategoryData(id); - auto const isFromCatalog = manager.IsCategoryFromCatalog(data.m_id); auto const tracksCount = manager.GetTrackIds(data.m_id).size(); auto const bookmarksCount = manager.GetUserMarkIds(data.m_id).size(); - auto const isMyCategory = manager.IsMyCategory(data.m_id); auto const isVisible = manager.IsVisible(data.m_id); auto const preferBookmarkStr = GetPreferredBookmarkStr(data.m_name); auto const annotation = GetPreferredBookmarkStr(data.m_annotation); auto const description = GetPreferredBookmarkStr(data.m_description); - auto const serverId = manager.GetCategoryServerId(data.m_id); jni::TScopedLocalRef preferBookmarkStrRef(env, jni::ToJavaString(env, preferBookmarkStr)); - jni::TScopedLocalRef authorIdRef(env, jni::ToJavaString(env, data.m_authorId)); - jni::TScopedLocalRef authorNameRef(env, jni::ToJavaString(env, data.m_authorName)); jni::TScopedLocalRef annotationRef(env, jni::ToJavaString(env, annotation)); jni::TScopedLocalRef descriptionRef(env, jni::ToJavaString(env, description)); - jni::TScopedLocalRef serverIdRef(env, jni::ToJavaString(env, serverId)); - jni::TScopedLocalRef imageUrlRef(env, jni::ToJavaString(env, data.m_imageUrl)); return env->NewObject(g_bookmarkCategoryClass, g_bookmarkCategoryConstructor, static_cast(data.m_id), preferBookmarkStrRef.get(), - authorIdRef.get(), - authorNameRef.get(), annotationRef.get(), descriptionRef.get(), static_cast(tracksCount), static_cast(bookmarksCount), - static_cast(isFromCatalog), - static_cast(isMyCategory), - static_cast(isVisible), - static_cast(data.m_accessRules), - serverIdRef.get(), - imageUrlRef.get()); + static_cast(isVisible)); } jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids) @@ -616,18 +335,6 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIE callbacks.m_onFileError = std::bind(&OnAsyncLoadingFileError, env, _1, _2); frm()->GetBookmarkManager().SetAsyncLoadingCallbacks(std::move(callbacks)); - frm()->GetBookmarkManager().SetCloudHandlers( - std::bind(&OnSynchronizationStarted, env, _1), - std::bind(&OnSynchronizationFinished, env, _1, _2, _3), - std::bind(&OnRestoreRequested, env, _1, _2, _3), - std::bind(&OnRestoredFilesPrepared, env)); - - frm()->GetBookmarkManager().SetCatalogHandlers(nullptr, nullptr, - std::bind(&OnImportStarted, env, _1), - std::bind(&OnImportFinished, env, _1, _2, _3), - std::bind(&OnUploadStarted, env, _1), - std::bind(&OnUploadFinished, env, _1, _2, _3, _4)); - frm()->GetBookmarkManager().SetBookmarksChangedCallback(std::bind(&OnBookmarksChanged, env)); frm()->LoadBookmarks(); @@ -820,15 +527,6 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryName( static_cast(catId))); } -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCategoryAuthor( - JNIEnv * env, jobject thiz, jlong catId) -{ - auto const & data = frm()->GetBookmarkManager().GetCategoryData( - static_cast(catId)); - return ToJavaString(env, data.m_authorName); -} - JNIEXPORT jint JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarksCount( JNIEnv * env, jobject thiz, jlong catId) @@ -991,51 +689,23 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativePrepareForSearch( JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible( - JNIEnv * env, jobject thiz, jint type) + JNIEnv * env, jobject thiz) { - auto const value = static_cast(type); - return static_cast(frm()->GetBookmarkManager().AreAllCategoriesInvisible(value)); + return static_cast(frm()->GetBookmarkManager().AreAllCategoriesInvisible()); } JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible( - JNIEnv * env, jobject thiz, jint type) + JNIEnv * env, jobject thiz) { - auto const value = static_cast(type); - return static_cast(frm()->GetBookmarkManager().AreAllCategoriesVisible(value)); + return static_cast(frm()->GetBookmarkManager().AreAllCategoriesVisible()); } JNIEXPORT void JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility( - JNIEnv * env, jobject thiz, jboolean visible, jint type) + JNIEnv * env, jobject thiz, jboolean visible) { - auto const filter = static_cast(type); - frm()->GetBookmarkManager().SetAllCategoriesVisibility(filter, static_cast(visible)); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeSetChildCategoriesVisibility( - JNIEnv * env, jobject thiz, jlong categoryId, jint compilationType, jboolean visible) -{ - frm()->GetBookmarkManager().SetChildCategoriesVisibility(static_cast(categoryId), - static_cast(compilationType), - static_cast(visible)); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreAllCompilationsInvisible( - JNIEnv * env, jobject thiz, jlong categoryId, jint compilationType) -{ - return static_cast(frm()->GetBookmarkManager().AreAllCompilationsInvisible(static_cast(categoryId), - static_cast(compilationType))); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreAllCompilationsVisible( - JNIEnv * env, jobject thiz, jlong categoryId, jint compilationType) -{ - return static_cast(frm()->GetBookmarkManager().AreAllCompilationsVisible(static_cast(categoryId), - static_cast(compilationType))); + frm()->GetBookmarkManager().SetAllCategoriesVisibility(static_cast(visible)); } JNIEXPORT jint JNICALL @@ -1109,163 +779,6 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeAreNotificationsEn return static_cast(frm()->GetBookmarkManager().AreNotificationsEnabled()); } -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeImportFromCatalog( - JNIEnv * env, jobject, jstring serverId, jstring filePath) -{ - auto & bm = frm()->GetBookmarkManager(); - bm.ImportDownloadedFromCatalog(ToNativeString(env, serverId), ToNativeString(env, filePath)); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeUploadToCatalog( - JNIEnv * env, jobject, jint accessRules, jlong catId) -{ - auto & bm = frm()->GetBookmarkManager(); - bm.UploadToCatalog(static_cast(catId), - static_cast(accessRules)); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogDeeplink( - JNIEnv * env, jobject, jlong catId) -{ - auto & bm = frm()->GetBookmarkManager(); - return ToJavaString(env, bm.GetCategoryCatalogDeeplink(static_cast(catId))); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogPublicLink( - JNIEnv * env, jobject, jlong catId) -{ - auto & bm = frm()->GetBookmarkManager(); - return ToJavaString(env, bm.GetCategoryCatalogPublicLink(static_cast(catId))); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogDownloadUrl( - JNIEnv * env, jobject, jstring serverId) -{ - auto & bm = frm()->GetBookmarkManager(); - return ToJavaString(env, bm.GetCatalog().GetDownloadUrl(ToNativeString(env, serverId))); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetWebEditorUrl( - JNIEnv * env, jobject, jstring serverId) -{ - auto & bm = frm()->GetBookmarkManager(); - return ToJavaString(env, bm.GetCatalog().GetWebEditorUrl(ToNativeString(env, serverId), - languages::GetCurrentNorm())); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogFrontendUrl( - JNIEnv * env, jobject, jint utm) -{ - auto & bm = frm()->GetBookmarkManager(); - return ToJavaString(env, bm.GetCatalog().GetFrontendUrl(static_cast(utm))); -} - -JNIEXPORT jobjectArray JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCatalogHeaders(JNIEnv * env, - jobject) -{ - auto const & bm = frm()->GetBookmarkManager(); - return jni::ToKeyValueArray(env, bm.GetCatalog().GetHeaders()); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeInjectCatalogUTMContent(JNIEnv * env, - jobject, jstring url, jint content) -{ - return ToJavaString(env, InjectUTMContent(ToNativeString(env, url), - static_cast(content))); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsCategoryFromCatalog( - JNIEnv *, jobject, jlong catId) -{ - auto & bm = frm()->GetBookmarkManager(); - return static_cast(bm.IsCategoryFromCatalog(static_cast(catId))); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRequestCatalogTags( - JNIEnv * env, jobject) -{ - auto & bm = frm()->GetBookmarkManager(); - bm.GetCatalog().RequestTagGroups(languages::GetCurrentNorm(), - [env](bool successful, BookmarkCatalog::TagGroups const & groups, uint32_t maxTagsCount) - { - OnTagsReceived(env, successful, groups, maxTagsCount); - }); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeRequestCatalogCustomProperties( - JNIEnv * env, jobject) -{ - auto & bm = frm()->GetBookmarkManager(); - bm.GetCatalog().RequestCustomProperties(languages::GetCurrentNorm(), - [env](bool successful, BookmarkCatalog::CustomProperties const & properties) - { - OnCustomPropertiesReceived(env, successful, properties); - }); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativePingBookmarkCatalog( - JNIEnv * env, jobject) -{ - auto & bm = frm()->GetBookmarkManager(); - bm.GetCatalog().Ping([env](bool isSuccessful) - { - OnPingFinished(env, isSuccessful); - }); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeCheckExpiredCategories(JNIEnv * env, - jobject) -{ - frm()->GetBookmarkManager().CheckExpiredCategories([env](bool hasExpiredCategories) - { - OnCheckExpiredCategories(env, hasExpiredCategories); - }); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeDeleteExpiredCategories(JNIEnv * env, - jobject) -{ - frm()->GetBookmarkManager().DeleteExpiredCategories(); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeResetExpiredCategories(JNIEnv * env, - jobject) -{ - frm()->GetBookmarkManager().ResetExpiredCategories(); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGuidesIds(JNIEnv * env, jobject) -{ - auto & bm = frm()->GetBookmarkManager(); - auto const guides = bm.GetCategoriesFromCatalog( - std::bind(&BookmarkManager::IsGuide, std::placeholders::_1)); - return ToJavaString(env, strings::JoinStrings(guides.begin(), guides.end(), ',')); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsGuide(JNIEnv * env, jobject, - jint accessRulesIndex) -{ - return static_cast(BookmarkManager::IsGuide(static_cast(accessRulesIndex))); -} - JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, @@ -1306,22 +819,6 @@ Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetChildrenCollect return MakeCategories(env, ids); } -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeIsCompilation(JNIEnv *env, jobject, - jlong id) -{ - auto const & bm = frm()->GetBookmarkManager(); - return static_cast(bm.IsCompilation(static_cast(id))); -} - -JNIEXPORT jint JNICALL -Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeGetCompilationType(JNIEnv *env, - jobject, jlong id) -{ - auto const & bm = frm()->GetBookmarkManager(); - return static_cast(bm.GetCompilationType(static_cast(id))); -} - JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_bookmarks_data_BookmarkManager_nativeHasLastSortingType( JNIEnv *, jobject, jlong catId) diff --git a/android/jni/com/mapswithme/maps/discovery/DiscoveryManager.cpp b/android/jni/com/mapswithme/maps/discovery/DiscoveryManager.cpp deleted file mode 100644 index 0249536c92..0000000000 --- a/android/jni/com/mapswithme/maps/discovery/DiscoveryManager.cpp +++ /dev/null @@ -1,189 +0,0 @@ -#include "com/mapswithme/core/jni_helper.hpp" -#include "com/mapswithme/maps/Framework.hpp" -#include "com/mapswithme/maps/SearchEngine.hpp" -#include "com/mapswithme/maps/discovery/Locals.hpp" -#include "com/mapswithme/maps/promo/Promo.hpp" - -#include "map/discovery/discovery_manager.hpp" -#include "map/search_product_info.hpp" - -#include "search/result.hpp" - - -#include "geometry/mercator.hpp" - -#include "platform/preferred_languages.hpp" - -#include -#include -#include - -using namespace std::placeholders; - -namespace -{ -jclass g_discoveryManagerClass = nullptr; -jfieldID g_discoveryManagerInstanceField; -jmethodID g_onResultReceivedMethod; -jmethodID g_onLocalExpertsReceivedMethod; -jmethodID g_onCityGalleryReceivedMethod; -jmethodID g_onErrorMethod; -uint32_t g_lastRequestId = 0; - -void PrepareClassRefs(JNIEnv * env) -{ - if (g_discoveryManagerClass != nullptr) - return; - - g_discoveryManagerClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/DiscoveryManager"); - - g_discoveryManagerInstanceField = jni::GetStaticFieldID(env, g_discoveryManagerClass, "INSTANCE", - "Lcom/mapswithme/maps/discovery/DiscoveryManager;"); - - jobject discoveryManagerInstance = env->GetStaticObjectField(g_discoveryManagerClass, - g_discoveryManagerInstanceField); - - g_onResultReceivedMethod = jni::GetMethodID(env, discoveryManagerInstance, "onResultReceived", - "([Lcom/mapswithme/maps/search/SearchResult;I)V"); - - g_onLocalExpertsReceivedMethod = jni::GetMethodID(env, discoveryManagerInstance, - "onLocalExpertsReceived", - "([Lcom/mapswithme/maps/discovery/LocalExpert;)V"); - g_onCityGalleryReceivedMethod = jni::GetMethodID(env, discoveryManagerInstance, - "onPromoCityGalleryReceived", - "(Lcom/mapswithme/maps/promo/PromoCityGallery;)V"); - g_onErrorMethod = jni::GetMethodID(env, discoveryManagerInstance, "onError", "(I)V"); -} - -struct DiscoveryCallback -{ - void operator()(uint32_t const requestId, search::Results const & results, - std::vector const & productInfo, - discovery::ItemType const type, m2::PointD const & viewportCenter) const - { - if (g_lastRequestId != requestId) - return; - - ASSERT(g_discoveryManagerClass != nullptr, ()); - JNIEnv * env = jni::GetEnv(); - - auto const lat = mercator::YToLat(viewportCenter.y); - auto const lon = mercator::XToLon(viewportCenter.x); - jni::TScopedLocalObjectArrayRef jResults( - env, BuildSearchResults(results, productInfo, true /* hasPosition */, lat, lon)); - jobject discoveryManagerInstance = env->GetStaticObjectField(g_discoveryManagerClass, - g_discoveryManagerInstanceField); - env->CallVoidMethod(discoveryManagerInstance, g_onResultReceivedMethod, - jResults.get(), static_cast(type)); - - jni::HandleJavaException(env); - } - - void operator()(uint32_t const requestId, std::vector const & experts) const - { - if (g_lastRequestId != requestId) - return; - - ASSERT(g_discoveryManagerClass != nullptr, ()); - JNIEnv * env = jni::GetEnv(); - - jni::TScopedLocalObjectArrayRef jLocals(env, ToLocalExpertsArray(experts)); - jobject discoveryManagerInstance = env->GetStaticObjectField(g_discoveryManagerClass, - g_discoveryManagerInstanceField); - env->CallVoidMethod(discoveryManagerInstance, g_onLocalExpertsReceivedMethod, jLocals.get()); - - jni::HandleJavaException(env); - } - - void operator()(uint32_t const requestId, promo::CityGallery const & cityGallery) const - { - if (g_lastRequestId != requestId) - return; - - ASSERT(g_discoveryManagerClass != nullptr, ()); - JNIEnv * env = jni::GetEnv(); - - jni::TScopedLocalRef gallery(env, promo::MakeCityGallery(env, cityGallery)); - jobject discoveryManagerInstance = - env->GetStaticObjectField(g_discoveryManagerClass, g_discoveryManagerInstanceField); - env->CallVoidMethod(discoveryManagerInstance, g_onCityGalleryReceivedMethod, gallery.get()); - - jni::HandleJavaException(env); - } -}; - -void OnDiscoveryError(uint32_t const requestId, discovery::ItemType const type) -{ - if (g_lastRequestId != requestId) - return; - - ASSERT(g_discoveryManagerClass != nullptr, ()); - - JNIEnv * env = jni::GetEnv(); - jobject discoveryManagerInstance = env->GetStaticObjectField(g_discoveryManagerClass, - g_discoveryManagerInstanceField); - env->CallVoidMethod(discoveryManagerInstance, g_onErrorMethod, static_cast(type)); - - jni::HandleJavaException(env); -} -} // namespace - -extern "C" { - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_discovery_DiscoveryManager_nativeDiscover(JNIEnv * env, jclass, - jobject params) -{ - PrepareClassRefs(env); - - discovery::ClientParams p; - auto const paramsClass = env->GetObjectClass(params); - static auto const currencyField = env->GetFieldID(paramsClass, "mCurrency", "Ljava/lang/String;"); - { - auto const currency = static_cast(env->GetObjectField(params, currencyField)); - std::string const res = jni::ToNativeString(env, currency); - if (!res.empty()) - p.m_currency = res; - } - - static auto const langField = env->GetFieldID(paramsClass, "mLang", "Ljava/lang/String;"); - { - auto const lang = static_cast(env->GetObjectField(params, langField)); - std::string const res = languages::Normalize(jni::ToNativeString(env, lang)); - if (!res.empty()) - p.m_lang = res; - } - - static auto const itemsCountField = env->GetFieldID(paramsClass, "mItemsCount", "I"); - { - auto const count = env->GetIntField(params, itemsCountField); - ASSERT_GREATER(count, 0, ()); - p.m_itemsCount = static_cast(count); - } - - static auto const itemTypesField = env->GetFieldID(paramsClass, "mItemTypes", "[I"); - { - auto const array = static_cast(env->GetObjectField(params, itemTypesField)); - auto const length = env->GetArrayLength(array); - ASSERT_GREATER(length, 0, ()); - - auto const dtor = [array, env](jint * data) { env->ReleaseIntArrayElements(array, data, 0); }; - std::unique_ptr data{env->GetIntArrayElements(array, nullptr), dtor}; - - std::vector itemTypes; - for (jsize i = 0; i < length; ++i) - itemTypes.emplace_back(static_cast(data.get()[i])); - - p.m_itemTypes = std::move(itemTypes); - } - - g_lastRequestId = g_framework->NativeFramework()->Discover(std::move(p), DiscoveryCallback(), - std::bind(&OnDiscoveryError, _1, _2)); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_discovery_DiscoveryManager_nativeGetLocalExpertsUrl(JNIEnv * env, jclass) -{ - return jni::ToJavaString(env, g_framework->NativeFramework()->GetDiscoveryLocalExpertsUrl()); -} -} // extern "C" diff --git a/android/jni/com/mapswithme/maps/discovery/Locals.cpp b/android/jni/com/mapswithme/maps/discovery/Locals.cpp deleted file mode 100644 index dad84ce9b1..0000000000 --- a/android/jni/com/mapswithme/maps/discovery/Locals.cpp +++ /dev/null @@ -1,121 +0,0 @@ -#include "com/mapswithme/maps/discovery/Locals.hpp" -#include "com/mapswithme/maps/Framework.hpp" - -#include - -namespace -{ -jclass g_localsClass = nullptr; -jobject g_localsInstance; -jmethodID g_onLocalsReceivedMethod; -jmethodID g_onLocalsErrorReceivedMethod; -jclass g_localExpertClass; -jmethodID g_localExpertConstructor; -jclass g_localErrorClass; -jmethodID g_localErrorConstructor; -uint64_t g_lastRequestId = 0; - -void PrepareClassRefs(JNIEnv * env) -{ - if (g_localsClass != nullptr) - return; - - g_localsClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/Locals"); - static jfieldID const localsInstanceField = jni::GetStaticFieldID(env, g_localsClass, "INSTANCE", - "Lcom/mapswithme/maps/discovery/Locals;"); - g_localsInstance = env->GetStaticObjectField(g_localsClass, localsInstanceField); - g_onLocalsReceivedMethod = jni::GetMethodID(env, g_localsInstance, "onLocalsReceived", - "([Lcom/mapswithme/maps/discovery/LocalExpert;)V"); - g_onLocalsErrorReceivedMethod = jni::GetMethodID(env, g_localsInstance, - "onLocalsErrorReceived", - "(Lcom/mapswithme/maps/discovery/LocalsError;)V"); - - // int id, @NonNull String name, @NonNull String country, - // @NonNull String city, double rating, int reviewCount, - // double price, @NonNull String currency, @NonNull String motto, - // @NonNull String about, @NonNull String offer, @NonNull String pageUrl, - // @NonNull String photoUrl - g_localExpertClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/LocalExpert"); - g_localExpertConstructor = - jni::GetConstructorID(env, g_localExpertClass, - "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;DID" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); - - // @ErrorCode int code, @NonNull String message - g_localErrorClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/discovery/LocalsError"); - g_localErrorConstructor = jni::GetConstructorID(env, g_localErrorClass, - "(ILjava/lang/String;)V"); -} -} // namespace - -jobjectArray ToLocalExpertsArray(std::vector const & locals) -{ - JNIEnv * env = jni::GetEnv(); - PrepareClassRefs(env); - - auto const localExpertBuilder = [](JNIEnv * env, locals::LocalExpert const & expert) - { - jni::TScopedLocalRef jName(env, jni::ToJavaString(env, expert.m_name)); - jni::TScopedLocalRef jCountry(env, jni::ToJavaString(env, expert.m_country)); - jni::TScopedLocalRef jCity(env, jni::ToJavaString(env, expert.m_city)); - jni::TScopedLocalRef jCurrency(env, jni::ToJavaString(env, expert.m_currency)); - jni::TScopedLocalRef jMotto(env, jni::ToJavaString(env, expert.m_motto)); - jni::TScopedLocalRef jAboutExpert(env, jni::ToJavaString(env, expert.m_aboutExpert)); - jni::TScopedLocalRef jOfferDescription(env, jni::ToJavaString(env, expert.m_offerDescription)); - jni::TScopedLocalRef jPageUrl(env, jni::ToJavaString(env, expert.m_pageUrl)); - jni::TScopedLocalRef jPhotoUrl(env, jni::ToJavaString(env, expert.m_photoUrl)); - - return env->NewObject(g_localExpertClass, g_localExpertConstructor, - expert.m_id, jName.get(), jCountry.get(), jCity.get(), - expert.m_rating, expert.m_reviewCount, expert.m_pricePerHour, - jCurrency.get(), jMotto.get(), jAboutExpert.get(), - jOfferDescription.get(), jPageUrl.get(), jPhotoUrl.get()); - }; - - return jni::ToJavaArray(env, g_localExpertClass, locals, localExpertBuilder); - -} - -void OnLocalsSuccess(uint64_t requestId, std::vector const & locals, - size_t pageNumber, size_t countPerPage, bool hasPreviousPage, - bool hasNextPage) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - jni::TScopedLocalObjectArrayRef jLocals(env, ToLocalExpertsArray(locals)); - env->CallVoidMethod(g_localsInstance, g_onLocalsReceivedMethod, jLocals.get()); - - jni::HandleJavaException(env); -} - -void OnLocalsError(uint64_t requestId, int errorCode, std::string const & errorMessage) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - - jni::TScopedLocalRef errorStr(env, jni::ToJavaString(env, errorMessage)); - jni::TScopedLocalRef errorObj(env, env->NewObject(g_localErrorClass, g_localErrorConstructor, - errorCode, errorStr.get())); - - env->CallVoidMethod(g_localsInstance, g_onLocalsErrorReceivedMethod, errorObj.get()); - - jni::HandleJavaException(env); -} - -extern "C" { - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_discovery_Locals_nativeRequestLocals(JNIEnv * env, jclass clazz, - jobject policy, jdouble lat, - jdouble lon) -{ - PrepareClassRefs(env); - g_lastRequestId = g_framework->GetLocals(env, policy, lat, lon, &OnLocalsSuccess, - &OnLocalsError); -} -} // extern "C" diff --git a/android/jni/com/mapswithme/maps/discovery/Locals.hpp b/android/jni/com/mapswithme/maps/discovery/Locals.hpp deleted file mode 100644 index bba258c693..0000000000 --- a/android/jni/com/mapswithme/maps/discovery/Locals.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once - -#include "com/mapswithme/core/jni_helper.hpp" - - -#include - -extern jobjectArray ToLocalExpertsArray(std::vector const & locals); diff --git a/android/jni/com/mapswithme/maps/guides/Guides.cpp b/android/jni/com/mapswithme/maps/guides/Guides.cpp deleted file mode 100644 index c9fa52c2ed..0000000000 --- a/android/jni/com/mapswithme/maps/guides/Guides.cpp +++ /dev/null @@ -1,116 +0,0 @@ -#include "android/jni/com/mapswithme/maps/guides/Guides.hpp" - -#include "android/jni/com/mapswithme/platform/Platform.hpp" - -namespace -{ -jclass g_galleryClass = nullptr; -jclass g_itemClass = nullptr; -jclass g_cityParamsClass = nullptr; -jclass g_outdoorParamsClass = nullptr; -jmethodID g_galleryConstructor = nullptr; -jmethodID g_itemConstructor = nullptr; -jmethodID g_cityParamsConstructor = nullptr; -jmethodID g_outdoorParamsConstructor = nullptr; - -void PrepareClassRefs(JNIEnv *env) -{ - if (g_galleryClass != nullptr) - return; - - g_galleryClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/guides/GuidesGallery"); - g_galleryConstructor = jni::GetConstructorID(env, g_galleryClass, - "([Lcom/mapswithme/maps/guides/GuidesGallery$Item;)V"); - g_itemClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/guides/GuidesGallery$Item"); - // public Item(@NonNull String guideId, @NonNull String url, @NonNull String imageUrl, - // @NonNull String title, @NonNull String subTitle, int type, - // boolean downloaded, @Nullable CityParams cityParams, - // @Nullable OutdoorParams outdoorParams) - g_itemConstructor - = jni::GetConstructorID(env, g_itemClass, "(Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;" - "IZLcom/mapswithme/maps/guides/GuidesGallery$CityParams;" - "Lcom/mapswithme/maps/guides/GuidesGallery$OutdoorParams;)" - "V"); - g_cityParamsClass - = jni::GetGlobalClassRef(env, "com/mapswithme/maps/guides/GuidesGallery$CityParams"); - // public CityParams(int bookmarksCount, boolean isTrackAvailable) - g_cityParamsConstructor = jni::GetConstructorID(env, g_cityParamsClass, "(IZ)V"); - g_outdoorParamsClass - = jni::GetGlobalClassRef(env, "com/mapswithme/maps/guides/GuidesGallery$OutdoorParams"); - // public OutdoorParams(double distance, long duration, int ascent) - g_outdoorParamsConstructor - = jni::GetConstructorID(env, g_outdoorParamsClass, "(Ljava/lang/String;DJI)V"); - jni::HandleJavaException(env); -} -} // namespace - -namespace guides -{ -jobject CreateGallery(JNIEnv *env, GuidesManager::GuidesGallery const & gallery) -{ - PrepareClassRefs(env); - - auto const itemBuilder = [](JNIEnv *env, GuidesManager::GuidesGallery::Item const & item) - { - jni::TScopedLocalRef guideId(env, jni::ToJavaString(env, item.m_guideId)); - jni::TScopedLocalRef url(env, jni::ToJavaString(env, item.m_url)); - jni::TScopedLocalRef imageUrl(env, jni::ToJavaString(env, item.m_imageUrl)); - jni::TScopedLocalRef title(env, jni::ToJavaString(env, item.m_title)); - auto const type = static_cast(item.m_type); - auto const downloaded = static_cast(item.m_downloaded); - jni::TScopedLocalRef cityParams(env, nullptr); - jni::TScopedLocalRef outdoorParams(env, nullptr); - if (item.m_type == GuidesManager::GuidesGallery::Item::Type::City) - { - cityParams.reset(env->NewObject(g_cityParamsClass, g_cityParamsConstructor, - static_cast(item.m_cityParams.m_bookmarksCount), - static_cast(item.m_cityParams.m_trackIsAvailable))); - } else if (item.m_type == GuidesManager::GuidesGallery::Item::Type::Outdoor) - { - outdoorParams.reset(env->NewObject(g_outdoorParamsClass, g_outdoorParamsConstructor, - jni::ToJavaString(env, item.m_outdoorsParams.m_tag), - static_cast(item.m_outdoorsParams.m_distance), - static_cast(item.m_outdoorsParams.m_duration), - static_cast(item.m_outdoorsParams.m_ascent))); - } - - return env->NewObject(g_itemClass, g_itemConstructor, guideId.get(), url.get(), imageUrl.get(), - title.get(), type, downloaded, cityParams.get(), - outdoorParams.get()); - }; - - jni::TScopedLocalObjectArrayRef items(env, jni::ToJavaArray(env, g_itemClass, gallery.m_items, - itemBuilder)); - return env->NewObject(g_galleryClass, g_galleryConstructor, items.get()); -} -} // namespace guides - -namespace platform -{ -bool IsGuidesLayerFirstLaunch() -{ - JNIEnv * env = jni::GetEnv(); - static const jclass sharedPropertiesClass = jni::GetGlobalClassRef(env, "com/mapswithme/util/SharedPropertiesUtils"); - static const jmethodID getter = jni::GetStaticMethodID(env, sharedPropertiesClass, - "shouldShowNewMarkerForLayerMode", - "(Landroid/content/Context;Ljava/lang/String;)Z"); - jobject context = android::Platform::Instance().GetContext(); - jni::ScopedLocalRef mode(env, jni::ToJavaString(env, "GUIDES")); - - return env->CallStaticBooleanMethod(sharedPropertiesClass, getter, context, mode.get()); -} - -void SetGuidesLayerFirstLaunch(bool /* isFirstLaunch */) -{ - JNIEnv * env = jni::GetEnv(); - static const jclass sharedPropertiesClass = jni::GetGlobalClassRef(env, "com/mapswithme/util/SharedPropertiesUtils"); - static const jmethodID setter = jni::GetStaticMethodID(env, sharedPropertiesClass, - "setLayerMarkerShownForLayerMode", - "(Landroid/content/Context;Ljava/lang/String;)V"); - jobject context = android::Platform::Instance().GetContext(); - jni::ScopedLocalRef mode(env, jni::ToJavaString(env, "GUIDES")); - - env->CallStaticVoidMethod(sharedPropertiesClass, setter, context, mode.get()); -} -} // namespace platform diff --git a/android/jni/com/mapswithme/maps/guides/Guides.hpp b/android/jni/com/mapswithme/maps/guides/Guides.hpp deleted file mode 100644 index 4a8d393f86..0000000000 --- a/android/jni/com/mapswithme/maps/guides/Guides.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "com/mapswithme/core/jni_helper.hpp" -#include "map/guides_manager.hpp" - -namespace guides -{ -jobject CreateGallery(JNIEnv * env, GuidesManager::GuidesGallery const & gallery); -} // namespace - -namespace platform -{ -bool IsGuidesLayerFirstLaunch(); -void SetGuidesLayerFirstLaunch(bool isFirstLaunch); -} // namespace platform diff --git a/android/jni/com/mapswithme/maps/guides/GuidesManager.cpp b/android/jni/com/mapswithme/maps/guides/GuidesManager.cpp deleted file mode 100644 index 4cbb52570b..0000000000 --- a/android/jni/com/mapswithme/maps/guides/GuidesManager.cpp +++ /dev/null @@ -1,113 +0,0 @@ -#include "com/mapswithme/core/jni_helper.hpp" -#include "com/mapswithme/maps/Framework.hpp" -#include "com/mapswithme/maps/guides/Guides.hpp" -#include "com/mapswithme/platform/Platform.hpp" - -#include - -namespace -{ -jclass g_guidesManagerClass = nullptr; -jmethodID g_guidesManagerFromMethod = nullptr; -jmethodID g_onGalleryChangedMethod = nullptr; -std::shared_ptr g_guidesManager = nullptr; - -void PrepareClassRefs(JNIEnv *env) -{ - if (g_guidesManagerClass != nullptr) - return; - - g_guidesManagerClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/maplayer/guides/GuidesManager"); - g_guidesManagerFromMethod = jni::GetStaticMethodID( - env, g_guidesManagerClass, "from", - "(Landroid/content/Context;)Lcom/mapswithme/maps/maplayer/guides/GuidesManager;"); - auto context = android::Platform::Instance().GetContext(); - g_guidesManager = jni::make_global_ref(env->CallStaticObjectMethod(g_guidesManagerClass, - g_guidesManagerFromMethod, - context)); - g_onGalleryChangedMethod = jni::GetMethodID(env, *g_guidesManager, "onGalleryChanged", "(Z)V"); - jni::HandleJavaException(env); -} - -static void GuidesStateChanged(GuidesManager::GuidesState state, - std::shared_ptr const & listener) -{ - JNIEnv * env = jni::GetEnv(); - env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener, "onStateChanged", "(I)V"), - static_cast(state)); - jni::HandleJavaException(env); -} - -static void GalleryChanged(bool reload) -{ - JNIEnv * env = jni::GetEnv(); - PrepareClassRefs(env); - env->CallVoidMethod(*g_guidesManager, g_onGalleryChangedMethod, static_cast(reload)); - jni::HandleJavaException(env); -} -} // namespace - -extern "C" -{ -using namespace std::placeholders; - -JNIEXPORT void JNICALL Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeSetGuidesStateChangedListener( - JNIEnv * env, jclass clazz, jobject listener) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - g_framework->SetGuidesListener( - std::bind(&GuidesStateChanged, std::placeholders::_1, jni::make_global_ref(listener))); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeRemoveGuidesStateChangedListener( - JNIEnv * env, jclass clazz) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - g_framework->SetGuidesListener(nullptr); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeSetActiveGuide( - JNIEnv * env, jclass clazz, jstring guideId) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - auto & manager = g_framework->NativeFramework()->GetGuidesManager(); - manager.SetActiveGuide(jni::ToNativeString(env, guideId)); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeGetActiveGuide( - JNIEnv * env, jclass clazz) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - auto & manager = g_framework->NativeFramework()->GetGuidesManager(); - return jni::ToJavaString(env, manager.GetActiveGuide()); -} - -JNIEXPORT jobject JNICALL -Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeGetGallery( - JNIEnv * env, jclass clazz) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - auto & manager = g_framework->NativeFramework()->GetGuidesManager(); - auto const gallery = manager.GetGallery(); - return guides::CreateGallery(env, gallery); -} - -JNIEXPORT void JNICALL Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeSetGalleryChangedListener( - JNIEnv * env, jclass clazz) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - auto & manager = g_framework->NativeFramework()->GetGuidesManager(); - manager.SetGalleryListener(std::bind(&GalleryChanged, std::placeholders::_1)); -} - -JNIEXPORT void JNICALL Java_com_mapswithme_maps_maplayer_guides_GuidesManager_nativeRemoveGalleryChangedListener( - JNIEnv * env, jclass clazz) -{ - CHECK(g_framework, ("Framework isn't created yet!")); - auto & manager = g_framework->NativeFramework()->GetGuidesManager(); - manager.SetGalleryListener(nullptr); -} -} diff --git a/android/jni/com/mapswithme/maps/onboarding/Onboarding.cpp b/android/jni/com/mapswithme/maps/onboarding/Onboarding.cpp deleted file mode 100644 index 319b39193a..0000000000 --- a/android/jni/com/mapswithme/maps/onboarding/Onboarding.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "com/mapswithme/core/jni_helper.hpp" - -#include "map/onboarding.hpp" - -extern "C" -{ -JNIEXPORT jobject JNICALL -Java_com_mapswithme_maps_onboarding_OnboardingTip_nativeGetTip(JNIEnv * env, jclass) -{ - if (!onboarding::CanShowTipButton()) - return nullptr; - - static jclass g_tipClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/onboarding/OnboardingTip"); - static jmethodID g_tipConstructor = - jni::GetConstructorID(env, g_tipClass, "(ILjava/lang/String;)V"); - - auto const tip = onboarding::GetTip(); - - jni::TScopedLocalRef url(env, jni::ToJavaString(env, tip.m_url)); - - return env->NewObject(g_tipClass, g_tipConstructor, static_cast(tip.m_type), url.get()); -} -} // extern "C" diff --git a/android/jni/com/mapswithme/maps/promo/Promo.cpp b/android/jni/com/mapswithme/maps/promo/Promo.cpp deleted file mode 100644 index 664ec5c5d4..0000000000 --- a/android/jni/com/mapswithme/maps/promo/Promo.cpp +++ /dev/null @@ -1,197 +0,0 @@ -#include "com/mapswithme/maps/promo/Promo.hpp" - -#include "com/mapswithme/maps/Framework.hpp" - - -#include "geometry/mercator.hpp" - -#include - -using namespace std::placeholders; - -namespace -{ -jclass g_galleryClass = nullptr; -jclass g_itemClass = nullptr; -jclass g_placeClass = nullptr; -jclass g_authorClass = nullptr; -jclass g_categoryClass = nullptr; -jmethodID g_galleryConstructor = nullptr; -jmethodID g_itemConstructor = nullptr; -jmethodID g_placeConstructor = nullptr; -jmethodID g_authorConstructor = nullptr; -jmethodID g_categoryConstructor = nullptr; -jclass g_promoClass = nullptr; -jfieldID g_promoInstanceField = nullptr; -jmethodID g_onGalleryReceived = nullptr; -jmethodID g_onErrorReceived = nullptr; -jclass g_afterBooking = nullptr; -jmethodID g_afterBookingConstructor = nullptr; -uint64_t g_lastRequestId = 0; - -void PrepareClassRefs(JNIEnv * env) -{ - if (g_galleryClass != nullptr) - return; - - g_galleryClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoCityGallery"); - g_galleryConstructor = - jni::GetConstructorID(env, g_galleryClass, - "([Lcom/mapswithme/maps/promo/PromoCityGallery$Item;" - "Ljava/lang/String;Ljava/lang/String;)V"); - g_itemClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoCityGallery$Item"); - g_itemConstructor = - jni::GetConstructorID(env, g_itemClass, - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Lcom/mapswithme/maps/promo/PromoCityGallery$Place;" - "Lcom/mapswithme/maps/promo/PromoCityGallery$Author;" - "Lcom/mapswithme/maps/promo/PromoCityGallery$LuxCategory;)V"); - g_placeClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoCityGallery$Place"); - g_placeConstructor = - jni::GetConstructorID(env, g_placeClass, "(Ljava/lang/String;Ljava/lang/String;)V"); - g_authorClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoCityGallery$Author"); - g_authorConstructor = - jni::GetConstructorID(env, g_authorClass, "(Ljava/lang/String;Ljava/lang/String;)V"); - g_categoryClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoCityGallery$LuxCategory"); - g_categoryConstructor = - jni::GetConstructorID(env, g_categoryClass, "(Ljava/lang/String;Ljava/lang/String;)V"); - - g_promoClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/Promo"); - g_promoInstanceField = - jni::GetStaticFieldID(env, g_promoClass, "INSTANCE", "Lcom/mapswithme/maps/promo/Promo;"); - jobject promoInstance = env->GetStaticObjectField(g_promoClass, g_promoInstanceField); - g_onGalleryReceived = jni::GetMethodID(env, promoInstance, "onCityGalleryReceived", - "(Lcom/mapswithme/maps/promo/PromoCityGallery;)V"); - g_onErrorReceived = jni::GetMethodID(env, promoInstance, "onErrorReceived", "()V"); - g_afterBooking = jni::GetGlobalClassRef(env, "com/mapswithme/maps/promo/PromoAfterBooking"); - g_afterBookingConstructor = - jni::GetConstructorID(env, g_afterBooking, - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); - jni::HandleJavaException(env); -} - -void OnSuccess(uint64_t requestId, promo::CityGallery const & gallery) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - jni::TScopedLocalRef cityGallery(env, promo::MakeCityGallery(env, gallery)); - jobject promoInstance = env->GetStaticObjectField(g_promoClass, g_promoInstanceField); - env->CallVoidMethod(promoInstance, g_onGalleryReceived, cityGallery.get()); - - jni::HandleJavaException(env); -} - -void OnError(uint64_t requestId) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - jobject promoInstance = env->GetStaticObjectField(g_promoClass, g_promoInstanceField); - env->CallVoidMethod(promoInstance, g_onErrorReceived); - - jni::HandleJavaException(env); -} -} // namespace - -namespace promo -{ -jobject MakeCityGallery(JNIEnv * env, promo::CityGallery const & gallery) -{ - PrepareClassRefs(env); - - auto const itemBuilder = [](JNIEnv * env, promo::CityGallery::Item const & item) - { - jni::TScopedLocalRef name(env, jni::ToJavaString(env, item.m_name)); - jni::TScopedLocalRef url(env, jni::ToJavaString(env, item.m_url)); - jni::TScopedLocalRef imageUrl(env, jni::ToJavaString(env, item.m_imageUrl)); - jni::TScopedLocalRef access(env, jni::ToJavaString(env, item.m_access)); - jni::TScopedLocalRef tier(env, jni::ToJavaString(env, item.m_tier)); - jni::TScopedLocalRef tourCategory(env, jni::ToJavaString(env, item.m_tourCategory)); - jni::TScopedLocalRef placeName(env, jni::ToJavaString(env, item.m_place.m_name)); - jni::TScopedLocalRef placeDescription(env, jni::ToJavaString(env, item.m_place.m_description)); - jni::TScopedLocalRef authorId(env, jni::ToJavaString(env, item.m_author.m_id)); - jni::TScopedLocalRef authorName(env, jni::ToJavaString(env, item.m_author.m_name)); - jni::TScopedLocalRef luxCategoryName(env, jni::ToJavaString(env, item.m_luxCategory.m_name)); - jni::TScopedLocalRef luxCategoryColor(env, jni::ToJavaString(env, item.m_luxCategory.m_color)); - - jni::TScopedLocalRef place( - env, env->NewObject(g_placeClass, g_placeConstructor, placeName.get(), placeDescription.get())); - jni::TScopedLocalRef author( - env, env->NewObject(g_authorClass, g_authorConstructor, authorId.get(), authorName.get())); - jni::TScopedLocalRef luxCategory( - env, env->NewObject(g_categoryClass, g_categoryConstructor, luxCategoryName.get(), - luxCategoryColor.get())); - - return env->NewObject(g_itemClass, g_itemConstructor, name.get(), url.get(), imageUrl.get(), - access.get(), tier.get(), tourCategory.get(), place.get(), author.get(), - luxCategory.get()); - }; - - jni::TScopedLocalObjectArrayRef items(env, jni::ToJavaArray(env, g_itemClass, gallery.m_items, - itemBuilder)); - jni::TScopedLocalRef moreUrl(env, jni::ToJavaString(env, gallery.m_moreUrl)); - jni::TScopedLocalRef category(env, jni::ToJavaString(env, gallery.m_category)); - - return env->NewObject(g_galleryClass, g_galleryConstructor, items.get(), moreUrl.get(), - category.get()); -} -} - -extern "C" { -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_promo_Promo_nativeRequestCityGallery(JNIEnv * env, jclass, - jobject policy, jdouble lat, - jdouble lon, jint utm) -{ - PrepareClassRefs(env); - auto const point = mercator::FromLatLon(static_cast(lat), static_cast(lon)); - ++g_lastRequestId; - g_framework->GetPromoCityGallery(env, policy, point, static_cast(utm), - std::bind(OnSuccess, g_lastRequestId, _1), - std::bind(OnError, g_lastRequestId)); -} - -JNIEXPORT void JNICALL -Java_com_mapswithme_maps_promo_Promo_nativeRequestPoiGallery(JNIEnv * env, jclass, - jobject policy, jdouble lat, - jdouble lon, jobjectArray tags, - jint utm) -{ - PrepareClassRefs(env); - auto const point = mercator::FromLatLon(static_cast(lat), static_cast(lon)); - jsize const size = env->GetArrayLength(tags); - promo::Tags nativeTags; - for (jsize i = 0; i < size; ++i) - { - auto tag = jni::ToNativeString(env, static_cast(env->GetObjectArrayElement(tags, i))); - nativeTags.emplace_back(std::move(tag)); - } - bool useCoordinates = - GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_WIFI; - ++g_lastRequestId; - g_framework->GetPromoPoiGallery(env, policy, point, nativeTags, useCoordinates, - static_cast(utm), std::bind(OnSuccess, g_lastRequestId, _1), - std::bind(OnError, g_lastRequestId)); -} - -JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_promo_Promo_nativeGetCityUrl(JNIEnv * env, jclass, jobject policy, - jdouble lat, jdouble lon) -{ - PrepareClassRefs(env); - - auto const cityUrl = g_framework->GetPromoCityUrl(env, policy, lat, lon); - - if (cityUrl.empty()) - return nullptr; - - return jni::ToJavaString(env, cityUrl); -} -} // extern "C" diff --git a/android/jni/com/mapswithme/maps/promo/Promo.hpp b/android/jni/com/mapswithme/maps/promo/Promo.hpp deleted file mode 100644 index aa02b32ef9..0000000000 --- a/android/jni/com/mapswithme/maps/promo/Promo.hpp +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "com/mapswithme/core/jni_helper.hpp" - -namespace promo -{ -struct CityGallery; - -jobject MakeCityGallery(JNIEnv * env, promo::CityGallery const & gallery); -} // namespace promo diff --git a/android/jni/com/mapswithme/maps/taxi/TaxiManager.cpp b/android/jni/com/mapswithme/maps/taxi/TaxiManager.cpp deleted file mode 100644 index 62d737c069..0000000000 --- a/android/jni/com/mapswithme/maps/taxi/TaxiManager.cpp +++ /dev/null @@ -1,145 +0,0 @@ -#include "com/mapswithme/maps/Framework.hpp" -#include "com/mapswithme/core/jni_helper.hpp" - - -namespace -{ -jclass g_productClass; -jclass g_taxiManagerClass; -jclass g_taxiInfoClass; -jclass g_taxiInfoErrorClass; -jmethodID g_taxiInfoConstructor; -jmethodID g_taxiInfoErrorConstructor; -jobject g_taxiManagerInstance; -jmethodID g_productConstructor; -jfieldID g_taxiManagerInstanceField; -jmethodID g_taxiInfoCallbackMethod; -jmethodID g_taxiErrorCallbackMethod; -jclass g_taxiLinksClass; -jmethodID g_taxiLinksConstructor; -uint64_t g_lastRequestId; - -void PrepareClassRefs(JNIEnv * env) -{ - if (g_taxiManagerClass) - return; - - g_taxiManagerClass = - jni::GetGlobalClassRef(env, "com/mapswithme/maps/taxi/TaxiManager"); - g_productClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/taxi/TaxiInfo$Product"); - g_productConstructor = jni::GetConstructorID( - env, g_productClass, - "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); - g_taxiInfoClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/taxi/TaxiInfo"); - g_taxiInfoErrorClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/taxi/TaxiInfoError"); - g_taxiManagerInstanceField = jni::GetStaticFieldID( - env, g_taxiManagerClass, "INSTANCE", "Lcom/mapswithme/maps/taxi/TaxiManager;"); - g_taxiManagerInstance = - env->GetStaticObjectField(g_taxiManagerClass, g_taxiManagerInstanceField); - g_taxiInfoCallbackMethod = - jni::GetMethodID(env, g_taxiManagerInstance, "onTaxiProvidersReceived", - "([Lcom/mapswithme/maps/taxi/TaxiInfo;)V"); - g_taxiErrorCallbackMethod = jni::GetMethodID(env, g_taxiManagerInstance, - "onTaxiErrorsReceived", "([Lcom/mapswithme/maps/taxi/TaxiInfoError;)V"); - g_taxiInfoConstructor = jni::GetConstructorID(env, g_taxiInfoClass, - "(I[Lcom/mapswithme/maps/taxi/TaxiInfo$Product;)V"); - g_taxiInfoErrorConstructor = jni::GetConstructorID(env, g_taxiInfoErrorClass, - "(ILjava/lang/String;)V"); - g_taxiLinksClass = jni::GetGlobalClassRef(env, "com/mapswithme/util/SponsoredLinks"); - g_taxiLinksConstructor = - jni::GetConstructorID(env, g_taxiLinksClass, "(Ljava/lang/String;Ljava/lang/String;)V"); -} - -void OnTaxiInfoReceived(taxi::ProvidersContainer const & providers, uint64_t const requestId) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - - auto const productBuilder = [](JNIEnv * env, taxi::Product const & item) - { - jni::TScopedLocalRef jProductId(env, jni::ToJavaString(env, item.m_productId)); - jni::TScopedLocalRef jName(env, jni::ToJavaString(env, item.m_name)); - jni::TScopedLocalRef jTime(env, jni::ToJavaString(env, item.m_time)); - jni::TScopedLocalRef jPrice(env, jni::ToJavaString(env, item.m_price)); - jni::TScopedLocalRef jCurrency(env, jni::ToJavaString(env, item.m_currency)); - return env->NewObject(g_productClass, g_productConstructor, jProductId.get(), jName.get(), - jTime.get(), jPrice.get(), jCurrency.get()); - }; - - auto const providerBuilder = [productBuilder](JNIEnv * env, taxi::Provider const & item) - { - return env->NewObject(g_taxiInfoClass, g_taxiInfoConstructor, item.GetType(), - jni::ToJavaArray(env, g_productClass, item.GetProducts(), productBuilder)); - }; - - jni::TScopedLocalObjectArrayRef jProviders(env, jni::ToJavaArray(env, g_taxiInfoClass, providers, - providerBuilder)); - - jobject const taxiManagerInstance = env->GetStaticObjectField(g_taxiManagerClass, - g_taxiManagerInstanceField); - env->CallVoidMethod(taxiManagerInstance, g_taxiInfoCallbackMethod, jProviders.get()); - - jni::HandleJavaException(env); -} - -void OnTaxiError(taxi::ErrorsContainer const & errors, uint64_t const requestId) -{ - if (g_lastRequestId != requestId) - return; - - JNIEnv * env = jni::GetEnv(); - - jobject const taxiManagerInstance = env->GetStaticObjectField(g_taxiManagerClass, - g_taxiManagerInstanceField); - - auto const errorBuilder = [](JNIEnv * env, taxi::ProviderError const & error) - { - jni::TScopedLocalRef jErrorCode(env, jni::ToJavaString(env, taxi::DebugPrint(error.m_code))); - return env->NewObject(g_taxiInfoErrorClass, g_taxiInfoErrorConstructor, error.m_type, - jErrorCode.get()); - }; - - - jni::TScopedLocalObjectArrayRef jErrors(env, jni::ToJavaArray(env, g_taxiInfoErrorClass, errors, errorBuilder)); - - env->CallVoidMethod(taxiManagerInstance, g_taxiErrorCallbackMethod, jErrors.get()); - - jni::HandleJavaException(env); -} -} // namespace - -extern "C" { - -JNIEXPORT void JNICALL Java_com_mapswithme_maps_taxi_TaxiManager_nativeRequestTaxiProducts( - JNIEnv * env, jclass clazz, jobject policy, jdouble srcLat, jdouble srcLon, jdouble dstLat, - jdouble dstLon) -{ - PrepareClassRefs(env); - - ms::LatLon const from(srcLat, srcLon); - ms::LatLon const to(dstLat, dstLon); - - g_lastRequestId = - g_framework->RequestTaxiProducts(env, policy, from, to, &OnTaxiInfoReceived, &OnTaxiError); -} - -JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_taxi_TaxiManager_nativeGetTaxiLinks( - JNIEnv * env, jclass clazz, jobject policy, jint providerType, jstring productId, jdouble srcLat, - jdouble srcLon, jdouble dstLat, jdouble dstLon) -{ - PrepareClassRefs(env); - - ms::LatLon const from(srcLat, srcLon); - ms::LatLon const to(dstLat, dstLon); - - taxi::Provider::Type type = static_cast(providerType); - taxi::RideRequestLinks const links = - g_framework->GetTaxiLinks(env, policy, type, jni::ToNativeString(env, productId), from, to); - - return env->NewObject(g_taxiLinksClass, g_taxiLinksConstructor, - jni::ToJavaString(env, links.m_deepLink), - jni::ToJavaString(env, links.m_universalLink)); -} -} // extern "C" diff --git a/android/multidex-config.txt b/android/multidex-config.txt index 5aef164106..5a82efb92e 100644 --- a/android/multidex-config.txt +++ b/android/multidex-config.txt @@ -1,14 +1,11 @@ com/google/firebase/iid/Registrar.class -com/mapswithme/maps/ads/Banner.class com/mapswithme/maps/api/ParsingResult.class com/mapswithme/maps/bookmarks/data/Bookmark.class com/mapswithme/maps/bookmarks/data/ElevationInfo.class com/mapswithme/maps/bookmarks/data/FeatureId.class com/mapswithme/maps/bookmarks/data/MapObject.class com/mapswithme/maps/location/PlatformSocket.class -com/mapswithme/maps/onboarding/OnboardingTip.class com/mapswithme/maps/search/PopularityProvider.class -com/mapswithme/maps/ugc/UGC$Rating.class com/mapswithme/maps/widget/placepage/PlacePageData.class com/mapswithme/util/AbstractHttpUploader.class com/mapswithme/util/HttpBackgroundUploader.class diff --git a/android/res/color/subscription_card_bg.xml b/android/res/color/subscription_card_bg.xml deleted file mode 100644 index 97de08fb14..0000000000 --- a/android/res/color/subscription_card_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/color/subscription_card_bg_night.xml b/android/res/color/subscription_card_bg_night.xml deleted file mode 100644 index 497b03aced..0000000000 --- a/android/res/color/subscription_card_bg_night.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/color/subscription_card_color.xml b/android/res/color/subscription_card_color.xml deleted file mode 100644 index bcb96e4860..0000000000 --- a/android/res/color/subscription_card_color.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/color/subscription_card_color_night.xml b/android/res/color/subscription_card_color_night.xml deleted file mode 100644 index 4bb5ca7522..0000000000 --- a/android/res/color/subscription_card_color_night.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable-hdpi/img_annual_subscription_offer.png b/android/res/drawable-hdpi/img_annual_subscription_offer.png deleted file mode 100755 index 64ec02483f08e59ec47f123772c28300ec764008..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^AAq=!gAGW&-l_MVfq^mE)5S5QV$R#kj=T&C0tXBZ z?0bP0l+XkK+Dd`Y diff --git a/android/res/drawable-hdpi/img_monthly_subscription_offer.png b/android/res/drawable-hdpi/img_monthly_subscription_offer.png deleted file mode 100755 index 30a7a1fa5068e312d36f90bdf4f26e28e2c20df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^AAmTIgAGVZTFzU@z`z*o>EaktG3V`NM_vX6fdd8y z_CG(&EWc?<=!Wy(&gd+7`G=3;o}|Pf9-c(DHUnno8I6i(4hW!05%n1{C>Lz4HtM1N#O~7srr_Id88UGBPOe z956Vr|M|j(*>ast`|cWV1}aCYUVUS<4qwqXg6$EhJli17$8Pqv6lw*>l;!PC{xWt~$(696`^Y;XVo diff --git a/android/res/drawable-mdpi/img_monthly_subscription_offer.png b/android/res/drawable-mdpi/img_monthly_subscription_offer.png deleted file mode 100755 index 874453cf1206749eac1a2a4c613f7152431db36c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3xL>@gAGXTYSB#xQkOkl978JRyuD<|$e_S;z~I3C x=e}CYUVUS<4qwqXg6$El%2h-uzq?r*4$5&?RT!PC{xWt~$(69BY^YS;h( diff --git a/android/res/drawable-mdpi/img_sightseeing_subscription.png b/android/res/drawable-mdpi/img_sightseeing_subscription.png deleted file mode 100755 index 54372fde29fcc8165e9653a0f93b475adb0b7d72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1105 zcmeAS@N?(olHy`uVBq!ia0y~yU@8W(?{KgIN$FH|83qOx2~QWtkcv5PuQ~EECW?C{d7#OoN2&6q@U^sL}hQVRROlAfSW1xA7 uX?zR{XU;G(w2Uem4T8~BFf1}c8Do+$-?_ diff --git a/android/res/drawable-xhdpi/img_annual_subscription_offer.png b/android/res/drawable-xhdpi/img_annual_subscription_offer.png deleted file mode 100755 index bb64dd5010df9f6832bfc3c31cefe6a920c49411..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 573 zcmeAS@N?(olHy`uVBq!ia0y~yU~~Yor*W_W$@L9^It&aZMYvb!+r-m3Ix3?h5qGBoJ2aimBpOh|2Tn8wHyIm#IpVIXg{nnh83Met={N?`DG L^>bP0l+XkKFHew8 diff --git a/android/res/drawable-xhdpi/img_sightseeing_subscription.png b/android/res/drawable-xhdpi/img_sightseeing_subscription.png deleted file mode 100755 index 7d7ba044e088eaca50811c4c32806eb52a23bf76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3220 zcmeAS@N?(olHy`uVBq!ia0y~yV0p&Cz_^2h4Jh)^;RR5FC)(4+F{EP7+Z%?A3<^94 z3=Zsn{;)|-g{!Lk{23;oGKPCrr67vo&xsk#K&qj^kR8NjOy&boOvhwE6ibgKh~kha z22lbAKx-Hn6cWxb0x5?BqZ&cMF&a3dDF>7eMsvq#(E&;aqs8NB-7#7}0yDyB<6*Rc i1S$|m8%V>efwZHWpDlN14X-CCay?!BT-G@yGywonzt4OC diff --git a/android/res/drawable-xxhdpi/img_annual_subscription_offer.png b/android/res/drawable-xxhdpi/img_annual_subscription_offer.png deleted file mode 100755 index f1b1dcd14d9a212f4042ee806d658c56b169f89a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 958 zcmeAS@N?(olHy`uVBq!ia0y~yV0-{%KjdHok^=wJS{N9ZTRmMILn`LHy=utFpuls$ z;K2Up51ZsvxPFzMKf}au&#IJx;m?T%Mumg}3<3rT3>*>$3@khn3`}f142;Zd4GoOU n4hKf1M}uWFIgpQ`njxgN@xNAH`b_h diff --git a/android/res/drawable-xxhdpi/img_monthly_subscription_offer.png b/android/res/drawable-xxhdpi/img_monthly_subscription_offer.png deleted file mode 100755 index 4a30773b5d58c4c6fec892ecc93d4bcad1822bc0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 935 zcmeAS@N?(olHy`uVBq!ia0y~yV0-{%-{xQgl3V4R{23US^E_P~Ln`LHy=utFpuls$ z;K2Up51ZsvxPFzMKf}au&#IJx;m?T%Mumg}3<3rT3>*>$3@khn3`}f142;Zd4GoOU m4hKf1M}uWFIS`Qz3K(m*vTT-f=iLCzfDE3lelF{r5}E)Ko1?t| diff --git a/android/res/drawable-xxhdpi/img_sightseeing_subscription.png b/android/res/drawable-xxhdpi/img_sightseeing_subscription.png deleted file mode 100755 index 45b1b5c55768a73fbc4811b5b08bbcaa52bde1d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6359 zcmeAS@N?(olHy`uVBq!ia0y~yV2@;AV4A|g1{86-*_hA3ATiI=#WAE}&fA*@c@HQE z9N2K_Z@FEVf__Vi|AhK$XKH{7L150$e0B(nVb75iRtS^BCk(=9I4~+S8WP|T7)=wS zSz$CQjAjL32#nSWqxIuxO95OIjAn(=tT37tMzaDa1V&rPqb+1`P8e+tT37t uz#%Z26-KkdXjT}_3cwH;?JUAOiwVqMN;p)HAF%8Jr3_D3KbLh*2~7YkQ{$>CJAa0WVZq}+d<+Z^beTCA1dXRFgWxuvM_WQ0!=bx6JSs{ y#=yjIM8bigL1I+VXb_C1g3*jHS{9%dhk7o-tgdUH|KkLfx(uGKelF{r5}E+p+4MpH diff --git a/android/res/drawable-xxxhdpi/img_sightseeing_subscription.png b/android/res/drawable-xxxhdpi/img_sightseeing_subscription.png deleted file mode 100755 index b87b2690282b80d1649275bad907d04becfa3ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10766 zcmeI2y-LGi7=_h?751uRy^?aFGmxgH$&M@e-ta z1*;-BbafHjiZ0?E2sXUDpBLaJPp0#QknkPO`JQ*k=~{Kg&x~e7#E&ZBx`@{nN$(Hz zb?@Zr&5p?IOB60`9A16CrhJ(ST8)qIqvCeyVY7FnF+VraeNM02ue)*6A~U&nx2WXX zDO;S^F4Lwb@ALhpOY!cI>EoWqG1KCmEI6GVJaBrN511ENWKNJGil$lMsIX3OngSfn z0?4#ZFjX*kX%?7GT_-@MSphOZre*mz$kZ%=OxFpJX;y$tkf~V!nbrxA2{JVc zAk%dMWSSKq6J%-@K&Ev9WP(i10?2fo0GVb5$OM_11(0c-0GS|Dv+y@$Hg^_-I*G2DbYk2i6*;%w)4R6Y|_y_9*2TT9} diff --git a/android/res/drawable/all_subs_header_bg.xml b/android/res/drawable/all_subs_header_bg.xml deleted file mode 100644 index 40c1663836..0000000000 --- a/android/res/drawable/all_subs_header_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_bought_content.xml b/android/res/drawable/bg_bought_content.xml deleted file mode 100644 index e5a4be914e..0000000000 --- a/android/res/drawable/bg_bought_content.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_bought_content_night.xml b/android/res/drawable/bg_bought_content_night.xml deleted file mode 100644 index 8547d531f3..0000000000 --- a/android/res/drawable/bg_bought_content_night.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_light.xml b/android/res/drawable/bg_guides_light.xml deleted file mode 100644 index ae742430d2..0000000000 --- a/android/res/drawable/bg_guides_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_guides_light_default.xml b/android/res/drawable/bg_guides_light_default.xml deleted file mode 100644 index 47077bcee5..0000000000 --- a/android/res/drawable/bg_guides_light_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_light_pressed.xml b/android/res/drawable/bg_guides_light_pressed.xml deleted file mode 100644 index 83d11f1a6e..0000000000 --- a/android/res/drawable/bg_guides_light_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_light_selected.xml b/android/res/drawable/bg_guides_light_selected.xml deleted file mode 100644 index c54873625d..0000000000 --- a/android/res/drawable/bg_guides_light_selected.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_night.xml b/android/res/drawable/bg_guides_night.xml deleted file mode 100644 index 3b71399864..0000000000 --- a/android/res/drawable/bg_guides_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_guides_night_default.xml b/android/res/drawable/bg_guides_night_default.xml deleted file mode 100644 index 154603effb..0000000000 --- a/android/res/drawable/bg_guides_night_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_night_pressed.xml b/android/res/drawable/bg_guides_night_pressed.xml deleted file mode 100644 index 4bb4fa9b1c..0000000000 --- a/android/res/drawable/bg_guides_night_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_guides_night_selected.xml b/android/res/drawable/bg_guides_night_selected.xml deleted file mode 100644 index 1a00348b7a..0000000000 --- a/android/res/drawable/bg_guides_night_selected.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_tag_night.xml b/android/res/drawable/bg_tag_night.xml deleted file mode 100644 index 69073591c7..0000000000 --- a/android/res/drawable/bg_tag_night.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/android/res/drawable/bookmark_subscription_screen_bg.xml b/android/res/drawable/bookmark_subscription_screen_bg.xml deleted file mode 100644 index 3ce49657dd..0000000000 --- a/android/res/drawable/bookmark_subscription_screen_bg.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/android/res/drawable/bookmark_subscription_screen_bg_night.xml b/android/res/drawable/bookmark_subscription_screen_bg_night.xml deleted file mode 100644 index 262f79fcef..0000000000 --- a/android/res/drawable/bookmark_subscription_screen_bg_night.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/android/res/drawable/bookmarks_all_subs_central_content_bg.xml b/android/res/drawable/bookmarks_all_subs_central_content_bg.xml deleted file mode 100644 index ccd0de8fd1..0000000000 --- a/android/res/drawable/bookmarks_all_subs_central_content_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/bookmarks_sightseeing_subs_central_content_bg.xml b/android/res/drawable/bookmarks_sightseeing_subs_central_content_bg.xml deleted file mode 100644 index 317c81af1c..0000000000 --- a/android/res/drawable/bookmarks_sightseeing_subs_central_content_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_layers_routes_active.xml b/android/res/drawable/ic_layers_routes_active.xml deleted file mode 100644 index b5fccf1b9a..0000000000 --- a/android/res/drawable/ic_layers_routes_active.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/drawable/ic_layers_routes_active_night.xml b/android/res/drawable/ic_layers_routes_active_night.xml deleted file mode 100644 index 501351940e..0000000000 --- a/android/res/drawable/ic_layers_routes_active_night.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/drawable/ic_layers_routes_inactive.xml b/android/res/drawable/ic_layers_routes_inactive.xml deleted file mode 100644 index e751b2a130..0000000000 --- a/android/res/drawable/ic_layers_routes_inactive.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/android/res/drawable/ic_menu_download_guides.xml b/android/res/drawable/ic_menu_download_guides.xml deleted file mode 100644 index e3c9e5ddfd..0000000000 --- a/android/res/drawable/ic_menu_download_guides.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/sightseeing_subs_sale_bg.xml b/android/res/drawable/sightseeing_subs_sale_bg.xml deleted file mode 100644 index 9984514f39..0000000000 --- a/android/res/drawable/sightseeing_subs_sale_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/subscription_card_edge.xml b/android/res/drawable/subscription_card_edge.xml deleted file mode 100644 index 9466fd313d..0000000000 --- a/android/res/drawable/subscription_card_edge.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/subscription_card_edge_default.xml b/android/res/drawable/subscription_card_edge_default.xml deleted file mode 100644 index ab95fb1f4a..0000000000 --- a/android/res/drawable/subscription_card_edge_default.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/android/res/drawable/subscription_card_edge_selected.xml b/android/res/drawable/subscription_card_edge_selected.xml deleted file mode 100644 index ec8620d31b..0000000000 --- a/android/res/drawable/subscription_card_edge_selected.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/android/res/layout-land/fragment_bookmark_payment.xml b/android/res/layout-land/fragment_bookmark_payment.xml deleted file mode 100644 index 2681d82b11..0000000000 --- a/android/res/layout-land/fragment_bookmark_payment.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - diff --git a/android/res/layout-land/fragment_welcome.xml b/android/res/layout-land/fragment_welcome.xml deleted file mode 100644 index 8b3509b207..0000000000 --- a/android/res/layout-land/fragment_welcome.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/android/res/layout-land/info_page.xml b/android/res/layout-land/info_page.xml deleted file mode 100644 index d7275ed533..0000000000 --- a/android/res/layout-land/info_page.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - diff --git a/android/res/layout-land/map_navigation_buttons.xml b/android/res/layout-land/map_navigation_buttons.xml index 2df6dd6d6f..772e5d5e1c 100644 --- a/android/res/layout-land/map_navigation_buttons.xml +++ b/android/res/layout-land/map_navigation_buttons.xml @@ -30,14 +30,6 @@ android:background="?nav_bg_isolines" android:visibility="invisible"/> - - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/layout-sw600dp-land/info_page.xml b/android/res/layout-sw600dp-land/info_page.xml deleted file mode 100644 index ab47a52a1f..0000000000 --- a/android/res/layout-sw600dp-land/info_page.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - diff --git a/android/res/layout-sw600dp/info_page.xml b/android/res/layout-sw600dp/info_page.xml deleted file mode 100644 index bc5fb1f4dc..0000000000 --- a/android/res/layout-sw600dp/info_page.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - diff --git a/android/res/layout-w600dp/fragment_sightseeing_subscription.xml b/android/res/layout-w600dp/fragment_sightseeing_subscription.xml deleted file mode 100644 index 675ecaa7c6..0000000000 --- a/android/res/layout-w600dp/fragment_sightseeing_subscription.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml b/android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml deleted file mode 100644 index 2d4680f441..0000000000 --- a/android/res/layout-w600dp/pager_fragment_bookmarks_all_subscription.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - - - - - - - - - - - - -