pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Renamed place page observer interface

Browse source
This commit is contained in:
alexzatsepin 2020-10-09 14:36:39 +03:00 • committed by Maria Velichko
parent c2a8894b5f
commit 97edaf3b10
9 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -145,7 +145,7 @@ import com.mapswithme.maps.widget.menu.MyPositionButton;
import com.mapswithme.maps.widget.placepage.PlacePageController;
import com.mapswithme.maps.widget.placepage.PlacePageData;
import com.mapswithme.maps.widget.placepage.PlacePageFactory;
import com.mapswithme.maps.widget.placepage.PlacePageStateObserver;
import com.mapswithme.maps.widget.placepage.PlacePageStateListener;
import com.mapswithme.maps.widget.placepage.RoutingModeListener;
import com.mapswithme.maps.widget.placepage.ToolbarBehavior;
import com.mapswithme.util.Counters;
@ -202,7 +202,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
OnGuidesLayerToggleListener,
GuidesGalleryListener,
NoConnectionListener,
PlacePageStateObserver
PlacePageStateListener
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = MwmActivity.class.getSimpleName();

2
android/src/com/mapswithme/maps/widget/placepage/BannerController.java
View file

@ -40,7 +40,7 @@ import static com.mapswithme.util.statistics.Statistics.PP_BANNER_STATE_DETAILS;
import static com.mapswithme.util.statistics.Statistics.PP_BANNER_STATE_PREVIEW;
final class BannerController implements PlacePageStateObserver
final class BannerController implements PlacePageStateListener
{
private static final Logger LOGGER = LoggerFactory.INSTANCE
.getLogger(LoggerFactory.Type.MISC);

2
android/src/com/mapswithme/maps/widget/placepage/ElevationProfileViewRenderer.java
View file

@ -19,7 +19,7 @@ import com.mapswithme.util.statistics.Statistics;
import java.util.Objects;
public class ElevationProfileViewRenderer implements PlacePageViewRenderer<PlacePageData>,
PlacePageStateObserver
PlacePageStateListener
{
// Must be correspond to map/elevation_info.hpp constants.
private static final int MAX_DIFFICULTY_LEVEL = 3;

2
android/src/com/mapswithme/maps/widget/placepage/GuidesGalleryViewRenderer.java
View file

@ -35,7 +35,7 @@ import java.util.List;
import java.util.Objects;
public class GuidesGalleryViewRenderer implements PlacePageViewRenderer<PlacePageData>,
PlacePageStateObserver,
PlacePageStateListener,
OnGuidesGalleryChangedListener
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);

8
android/src/com/mapswithme/maps/widget/placepage/PlacePageControllerComposite.java
View file

@ -22,7 +22,7 @@ class PlacePageControllerComposite implements PlacePageController
@Nullable
private final GuidesGalleryListener mGuidesGalleryListener;
@Nullable
private final PlacePageStateObserver mStateObserver;
private final PlacePageStateListener mStateListener;
@NonNull
private final List<PlacePageController> mControllers = new ArrayList<>();
@SuppressWarnings("NullableProblems")
@ -33,13 +33,13 @@ class PlacePageControllerComposite implements PlacePageController
@NonNull SlideListener slideListener,
@Nullable RoutingModeListener routingModeListener,
@Nullable GuidesGalleryListener galleryListener,
@Nullable PlacePageStateObserver stateObserver)
@Nullable PlacePageStateListener stateObserver)
{
mAdsProvider = adsProvider;
mSlideListener = slideListener;
mRoutingModeListener = routingModeListener;
mGuidesGalleryListener = galleryListener;
mStateObserver = stateObserver;
mStateListener = stateObserver;
}
@Override
@ -123,7 +123,7 @@ class PlacePageControllerComposite implements PlacePageController
PlacePageController richController =
PlacePageFactory.createRichController(mAdsProvider, mSlideListener,
mRoutingModeListener, mStateObserver);
mRoutingModeListener, mStateListener);
richController.initialize(activity);
mControllers.add(richController);

8
android/src/com/mapswithme/maps/widget/placepage/PlacePageFactory.java
View file

@ -14,10 +14,10 @@ public class PlacePageFactory
@NonNull PlacePageController.SlideListener slideListener,
@NonNull RoutingModeListener routingModeListener,
@Nullable GuidesGalleryListener galleryListener,
@Nullable PlacePageStateObserver stateObserver)
@Nullable PlacePageStateListener stateListener)
{
return new PlacePageControllerComposite(provider, slideListener, routingModeListener,
galleryListener, stateObserver);
galleryListener, stateListener);
}
@NonNull
@ -25,9 +25,9 @@ public class PlacePageFactory
@NonNull AdsRemovalPurchaseControllerProvider provider,
@NonNull PlacePageController.SlideListener listener,
@Nullable RoutingModeListener routingModeListener,
@Nullable PlacePageStateObserver stateObserver)
@Nullable PlacePageStateListener stateListener)
{
return new RichPlacePageController(provider, listener, routingModeListener, stateObserver);
return new RichPlacePageController(provider, listener, routingModeListener, stateListener);
}
@NonNull

2
android/src/com/mapswithme/maps/widget/placepage/PlacePageStateObserver.java → android/src/com/mapswithme/maps/widget/placepage/PlacePageStateListener.java
View file

@ -1,6 +1,6 @@
package com.mapswithme.maps.widget.placepage;
public interface PlacePageStateObserver
public interface PlacePageStateListener
{
void onPlacePageDetails();
void onPlacePagePreview();

18
android/src/com/mapswithme/maps/widget/placepage/RichPlacePageController.java
View file

@ -83,7 +83,7 @@ public class RichPlacePageController implements PlacePageController, LocationLis
@Nullable
private final RoutingModeListener mRoutingModeListener;
@Nullable
private final PlacePageStateObserver mStateObserver;
private final PlacePageStateListener mStateListener;
@NonNull
private final BottomSheetChangedListener mBottomSheetChangedListener = new BottomSheetChangedListener()
{
@ -91,8 +91,8 @@ public class RichPlacePageController implements PlacePageController, LocationLis
public void onSheetHidden()
{
onHiddenInternal();
if (mStateObserver != null)
mStateObserver.onPlacePageClosed();
if (mStateListener != null)
mStateListener.onPlacePageClosed();
}
@Override
@ -106,8 +106,8 @@ public class RichPlacePageController implements PlacePageController, LocationLis
{
mBannerController.onPlacePageDetails();
mPlacePageTracker.onDetails();
if (mStateObserver != null)
mStateObserver.onPlacePageDetails();
if (mStateListener != null)
mStateListener.onPlacePageDetails();
}
@Override
@ -116,8 +116,8 @@ public class RichPlacePageController implements PlacePageController, LocationLis
mPlacePage.resetScroll();
mBannerController.onPlacePagePreview();
setPeekHeight();
if (mStateObserver != null)
mStateObserver.onPlacePagePreview();
if (mStateListener != null)
mStateListener.onPlacePagePreview();
}
@Override
@ -205,12 +205,12 @@ public class RichPlacePageController implements PlacePageController, LocationLis
RichPlacePageController(@NonNull AdsRemovalPurchaseControllerProvider provider,
@NonNull SlideListener listener,
@Nullable RoutingModeListener routingModeListener,
@Nullable PlacePageStateObserver stateObserver)
@Nullable PlacePageStateListener stateListener)
{
mPurchaseControllerProvider = provider;
mSlideListener = listener;
mRoutingModeListener = routingModeListener;
mStateObserver = stateObserver;
mStateListener = stateListener;
}
@SuppressLint("ClickableViewAccessibility")

18
android/src/com/mapswithme/maps/widget/placepage/SimplePlacePageController.java
View file

@ -36,7 +36,7 @@ public class SimplePlacePageController implements PlacePageController
@NonNull
private final PlacePageViewRenderer<PlacePageData> mViewRenderer;
@Nullable
private final PlacePageStateObserver mStateObserver;
private final PlacePageStateListener mStateListener;
@NonNull
private final BottomSheetChangedListener mBottomSheetChangedListener =
new BottomSheetChangedListener()
@ -45,8 +45,8 @@ public class SimplePlacePageController implements PlacePageController
public void onSheetHidden()
{
onHiddenInternal();
if (mStateObserver != null)
mStateObserver.onPlacePageClosed();
if (mStateListener != null)
mStateListener.onPlacePageClosed();
}
@Override
@ -63,8 +63,8 @@ public class SimplePlacePageController implements PlacePageController
{
if (UiUtils.isLandscape(mApplication))
PlacePageUtils.moveViewPortRight(mSheet, mViewPortMinWidth);
if (mStateObserver != null)
mStateObserver.onPlacePageDetails();
if (mStateListener != null)
mStateListener.onPlacePageDetails();
}
@Override
@ -72,8 +72,8 @@ public class SimplePlacePageController implements PlacePageController
{
if (UiUtils.isLandscape(mApplication))
PlacePageUtils.moveViewPortRight(mSheet, mViewPortMinWidth);
if (mStateObserver != null)
mStateObserver.onPlacePagePreview();
if (mStateListener != null)
mStateListener.onPlacePagePreview();
}
@Override
@ -103,13 +103,13 @@ public class SimplePlacePageController implements PlacePageController
private final int mSheetResId;
SimplePlacePageController(int sheetResId, @NonNull PlacePageViewRenderer<PlacePageData> renderer,
@Nullable PlacePageStateObserver stateObserver,
@Nullable PlacePageStateListener stateListener,
@NonNull SlideListener slideListener)
{
mSheetResId = sheetResId;
mSlideListener = slideListener;
mViewRenderer = renderer;
mStateObserver = stateObserver;
mStateListener = stateListener;
}
@Override