From 3ffec15df8da124d179f2d86735e0686d7e4a761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Fri, 24 Apr 2020 18:39:40 +0300 Subject: [PATCH] [android] Added guides gallery skeleton place page controller --- android/res/layout/activity_map.xml | 1 + .../layout/guides_gallery_bottom_sheet.xml | 14 ++++ .../placepage/GuidesGalleryViewRenderer.java | 75 +++++++++++++++++++ .../PlacePageControllerComposite.java | 9 ++- .../widget/placepage/PlacePageFactory.java | 11 ++- 5 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 android/res/layout/guides_gallery_bottom_sheet.xml create mode 100644 android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java diff --git a/android/res/layout/activity_map.xml b/android/res/layout/activity_map.xml index a4c877dc95c..e6d482a20c3 100644 --- a/android/res/layout/activity_map.xml +++ b/android/res/layout/activity_map.xml @@ -98,6 +98,7 @@ + + + diff --git a/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java new file mode 100644 index 00000000000..95b2a0b6dc6 --- /dev/null +++ b/android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java @@ -0,0 +1,75 @@ +package com.mapswithme.maps.widget.placepage; + +import android.os.Bundle; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.mapswithme.maps.guides.GuidesGallery; + +public class GuidesGalleryViewRenderer implements PlacePageViewRenderer, + PlacePageStateObserver +{ + @Nullable + private GuidesGallery mGallery; + + @Override + public void render(@NonNull PlacePageData data) + { + mGallery = (GuidesGallery) data; + } + + @Override + public void onHide() + { + + } + + @Override + public void initialize(@Nullable View view) + { + + } + + @Override + public void destroy() + { + + } + + @Override + public void onSave(@NonNull Bundle outState) + { + + } + + @Override + public void onRestore(@NonNull Bundle inState) + { + + } + + @Override + public boolean support(@NonNull PlacePageData data) + { + return data instanceof GuidesGallery; + } + + @Override + public void onPlacePageDetails() + { + + } + + @Override + public void onPlacePagePreview() + { + + } + + @Override + public void onPlacePageClosed() + { + + } +} diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java index 873b0d0204c..b0c8b6e3291 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java @@ -113,8 +113,8 @@ public void initialize(@Nullable Activity activity) throw new AssertionError("Place page controllers already initialized!"); PlacePageController richController = - PlacePageFactory.createRichPlacePageController(mAdsProvider, mSlideListener, - mRoutingModeListener); + PlacePageFactory.createRichController(mAdsProvider, mSlideListener, + mRoutingModeListener); richController.initialize(activity); mControllers.add(richController); @@ -123,6 +123,11 @@ public void initialize(@Nullable Activity activity) elevationProfileController.initialize(activity); mControllers.add(elevationProfileController); + PlacePageController guidesGalleryController = + PlacePageFactory.createGuidesGalleryController(mSlideListener); + guidesGalleryController.initialize(activity); + mControllers.add(guidesGalleryController); + mActiveController = richController; } diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java index f55d0faad3f..0d644d6b169 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java @@ -17,7 +17,7 @@ public static PlacePageController createCompositePlacePageController( } @NonNull - static PlacePageController createRichPlacePageController( + static PlacePageController createRichController( @NonNull AdsRemovalPurchaseControllerProvider provider, @NonNull PlacePageController.SlideListener listener, @Nullable RoutingModeListener routingModeListener) @@ -32,4 +32,13 @@ static PlacePageController createElevationProfilePlacePageController( ElevationProfileViewRenderer renderer = new ElevationProfileViewRenderer(); return new SimplePlacePageController(R.id.elevation_profile, renderer, renderer, listener); } + + @NonNull + static PlacePageController createGuidesGalleryController( + @NonNull PlacePageController.SlideListener listener) + { + GuidesGalleryViewRenderer renderer = new GuidesGalleryViewRenderer(); + return new SimplePlacePageController(R.id.guides_gallery_bottom_sheet, renderer, renderer, + listener); + } }