From b9435bb097753359da7d3d485c9b025198c530bb Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Mon, 27 Feb 2017 12:28:02 +0400 Subject: [PATCH 1/3] [android] Added progress bar and error message for place page banner. Fixed banner open/close behavior. --- android/res/layout/place_page_banner.xml | 35 ++++++ .../widget/placepage/BannerController.java | 104 +++++++++++++++--- .../maps/widget/placepage/PlacePageView.java | 17 ++- 3 files changed, 137 insertions(+), 19 deletions(-) diff --git a/android/res/layout/place_page_banner.xml b/android/res/layout/place_page_banner.xml index b9ba0c621f..29443c9f14 100644 --- a/android/res/layout/place_page_banner.xml +++ b/android/res/layout/place_page_banner.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/placepage_banner_height" + android:minHeight="@dimen/placepage_banner_height" android:paddingLeft="@dimen/margin_base" android:paddingRight="@dimen/margin_base" android:paddingTop="@dimen/margin_half" @@ -109,4 +110,38 @@ android:visibility="gone" tools:text="Заказать" tools:visibility="visible"/> + + + + + + + + diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index 3eff297d26..79a10d98ee 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -36,6 +36,10 @@ final class BannerController implements AdListener private static final Logger LOGGER = LoggerFactory.INSTANCE .getLogger(LoggerFactory.Type.MISC); private static final String TAG = BannerController.class.getName(); + private static final int MAX_MESSAGE_LINES = 100; + private static final int MIN_MESSAGE_LINES = 3; + private static final int MAX_TITLE_LINES = 2; + private static final int MIN_TITLE_LINES = 1; private static boolean isTouched(@Nullable View view, @NonNull MotionEvent event) { @@ -57,6 +61,12 @@ final class BannerController implements AdListener private final TextView mActionSmall; @Nullable private final TextView mActionLarge; + @Nullable + private final View mAds; + @Nullable + private final View mProgressBar; + @Nullable + private final View mError; private final float mCloseFrameHeight; @@ -75,11 +85,80 @@ final class BannerController implements AdListener mMessage = (TextView) bannerView.findViewById(R.id.tv__banner_message); mActionSmall = (TextView) bannerView.findViewById(R.id.tv__action_small); mActionLarge = (TextView) bannerView.findViewById(R.id.tv__action_large); + mAds = bannerView.findViewById(R.id.tv__ads); + mProgressBar = bannerView.findViewById(R.id.progress_bar); + mError = bannerView.findViewById(R.id.error); + } + + private void showProgress() + { + if (mProgressBar != null) + UiUtils.show(mProgressBar); + + updateVisibility(); + } + + private void hideProgress() + { + if (mProgressBar != null) + UiUtils.hide(mProgressBar); + + updateVisibility(); + } + + private boolean isDownloading() + { + return mProgressBar != null && !UiUtils.isHidden(mProgressBar); + } + + private void showError() + { + if (mError == null) + return; + + UiUtils.show(mError); + } + + private void hideError() + { + if (mError == null) + return; + + UiUtils.hide(mError); + } + + private boolean errorHasOccurred() + { + return mError != null && !UiUtils.isHidden(mError); + } + + private void updateVisibility() + { + if (mIcon == null || mTitle == null || mMessage == null || mActionSmall == null + || mActionLarge == null || mAds == null) + return; + + boolean hasError = errorHasOccurred(); + if (isDownloading() || hasError) + { + UiUtils.hide(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds); + if (hasError && mProgressBar != null) + UiUtils.hide(mProgressBar); + } + else + { + UiUtils.show(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds); + if (mOpened) + UiUtils.hide(mActionSmall); + else + UiUtils.hide(mActionLarge, mIcon); + } } void updateData(@Nullable Banner banner) { UiUtils.hide(mFrame); + hideError(); mBanner = banner; if (mBanner == null || TextUtils.isEmpty(mBanner.getId()) || !isShowcaseSwitchedOnLocal() @@ -100,6 +179,7 @@ final class BannerController implements AdListener mNativeAd.setAdListener(BannerController.this); mNativeAd.loadAd(EnumSet.of(NativeAd.MediaCacheFlag.ICON)); UiUtils.show(mFrame); + showProgress(); } boolean isBannerVisible() @@ -116,13 +196,10 @@ final class BannerController implements AdListener setFrameHeight(WRAP_CONTENT); loadIcon(mNativeAd); if (mMessage != null) - mMessage.setMaxLines(Integer.MAX_VALUE); + mMessage.setMaxLines(MAX_MESSAGE_LINES); if (mTitle != null) - mTitle.setMaxLines(2); - if (mActionSmall != null) - UiUtils.hide(mActionSmall); - if (mActionLarge != null) - UiUtils.show(mActionLarge); + mTitle.setMaxLines(MAX_TITLE_LINES); + updateVisibility(); Statistics.INSTANCE.trackEvent(Statistics.EventName.PP_BANNER_SHOW, Statistics.params() @@ -139,13 +216,10 @@ final class BannerController implements AdListener setFrameHeight((int) mCloseFrameHeight); UiUtils.hide(mIcon); if (mMessage != null) - mMessage.setMaxLines(3); + mMessage.setMaxLines(MIN_MESSAGE_LINES); if (mTitle != null) - mTitle.setMaxLines(1); - if (mActionSmall != null) - UiUtils.show(mActionSmall); - if (mActionLarge != null) - UiUtils.hide(mActionLarge); + mTitle.setMaxLines(MIN_TITLE_LINES); + updateVisibility(); return true; } @@ -175,7 +249,8 @@ final class BannerController implements AdListener @Override public void onError(Ad ad, AdError adError) { - UiUtils.hide(mFrame); + showError(); + updateVisibility(); LOGGER.e(TAG, adError.getErrorMessage()); } @@ -185,6 +260,9 @@ final class BannerController implements AdListener if (mNativeAd == null || mBanner == null) return; + hideProgress(); + updateVisibility(); + if (mTitle != null) mTitle.setText(mNativeAd.getAdTitle()); if (mMessage != null) diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index a7de4f941a..9fc9a95ec6 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -755,6 +755,16 @@ public class PlacePageView extends RelativeLayout mBannerController.open(); } + private void compensateViewHeight(int height) + { + if (mHeightCompensationView == null) + return; + + ViewGroup.LayoutParams lp = mHeightCompensationView.getLayoutParams(); + lp.height = height; + mHeightCompensationView.setLayoutParams(lp); + } + private void init(AttributeSet attrs, int defStyleAttr) { initViews(); @@ -832,12 +842,7 @@ public class PlacePageView extends RelativeLayout } } - if (mHeightCompensationView != null) - { - ViewGroup.LayoutParams lp = mHeightCompensationView.getLayoutParams(); - lp.height = heightCompensation; - mHeightCompensationView.setLayoutParams(lp); - } + compensateViewHeight(heightCompensation); if (mMapObject != null) mAnimationController.setState(state, mMapObject.getMapObjectType()); From faf7bd70b9eb0d18f5fc4d041a82d5713bbb4999 Mon Sep 17 00:00:00 2001 From: Roman Romanov Date: Mon, 27 Feb 2017 15:21:59 +0400 Subject: [PATCH 2/3] [android] remove progress bar visualization from banner. --- android/res/layout/place_page_banner.xml | 34 -------------- .../widget/placepage/BannerController.java | 44 +++++-------------- 2 files changed, 11 insertions(+), 67 deletions(-) diff --git a/android/res/layout/place_page_banner.xml b/android/res/layout/place_page_banner.xml index 29443c9f14..297ca9535a 100644 --- a/android/res/layout/place_page_banner.xml +++ b/android/res/layout/place_page_banner.xml @@ -110,38 +110,4 @@ android:visibility="gone" tools:text="Заказать" tools:visibility="visible"/> - - - - - - - - diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index 79a10d98ee..853a3eaded 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -63,10 +63,6 @@ final class BannerController implements AdListener private final TextView mActionLarge; @Nullable private final View mAds; - @Nullable - private final View mProgressBar; - @Nullable - private final View mError; private final float mCloseFrameHeight; @@ -74,6 +70,8 @@ final class BannerController implements AdListener private NativeAd mNativeAd; private boolean mOpened = false; + private boolean mProgress = false; + private boolean mError = false; BannerController(@NonNull View bannerView) { @@ -86,50 +84,33 @@ final class BannerController implements AdListener mActionSmall = (TextView) bannerView.findViewById(R.id.tv__action_small); mActionLarge = (TextView) bannerView.findViewById(R.id.tv__action_large); mAds = bannerView.findViewById(R.id.tv__ads); - mProgressBar = bannerView.findViewById(R.id.progress_bar); - mError = bannerView.findViewById(R.id.error); } private void showProgress() { - if (mProgressBar != null) - UiUtils.show(mProgressBar); - + mProgress = true; updateVisibility(); } private void hideProgress() { - if (mProgressBar != null) - UiUtils.hide(mProgressBar); - + mProgress = false; updateVisibility(); } private boolean isDownloading() { - return mProgressBar != null && !UiUtils.isHidden(mProgressBar); + return mProgress; } - private void showError() + private void showError(boolean value) { - if (mError == null) - return; - - UiUtils.show(mError); - } - - private void hideError() - { - if (mError == null) - return; - - UiUtils.hide(mError); + mError = value; } private boolean errorHasOccurred() { - return mError != null && !UiUtils.isHidden(mError); + return mError; } private void updateVisibility() @@ -138,12 +119,9 @@ final class BannerController implements AdListener || mActionLarge == null || mAds == null) return; - boolean hasError = errorHasOccurred(); - if (isDownloading() || hasError) + if (isDownloading() || errorHasOccurred()) { UiUtils.hide(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds); - if (hasError && mProgressBar != null) - UiUtils.hide(mProgressBar); } else { @@ -158,7 +136,7 @@ final class BannerController implements AdListener void updateData(@Nullable Banner banner) { UiUtils.hide(mFrame); - hideError(); + showError(false); mBanner = banner; if (mBanner == null || TextUtils.isEmpty(mBanner.getId()) || !isShowcaseSwitchedOnLocal() @@ -249,7 +227,7 @@ final class BannerController implements AdListener @Override public void onError(Ad ad, AdError adError) { - showError(); + showError(true); updateVisibility(); LOGGER.e(TAG, adError.getErrorMessage()); } From a83b337c5ae5e8c60a163994b88f9048d6916224 Mon Sep 17 00:00:00 2001 From: alexzatsepin Date: Tue, 28 Feb 2017 19:21:33 +0300 Subject: [PATCH 3/3] [android] Fixed review notes --- .../widget/placepage/BannerController.java | 48 +++++++------------ 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java index 853a3eaded..63e676df8f 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/BannerController.java +++ b/android/src/com/mapswithme/maps/widget/placepage/BannerController.java @@ -51,17 +51,17 @@ final class BannerController implements AdListener @NonNull private final View mFrame; - @Nullable + @NonNull private final ImageView mIcon; - @Nullable + @NonNull private final TextView mTitle; - @Nullable + @NonNull private final TextView mMessage; - @Nullable + @NonNull private final TextView mActionSmall; - @Nullable + @NonNull private final TextView mActionLarge; - @Nullable + @NonNull private final View mAds; private final float mCloseFrameHeight; @@ -108,18 +108,14 @@ final class BannerController implements AdListener mError = value; } - private boolean errorHasOccurred() + private boolean hasErrorOccurred() { return mError; } private void updateVisibility() { - if (mIcon == null || mTitle == null || mMessage == null || mActionSmall == null - || mActionLarge == null || mAds == null) - return; - - if (isDownloading() || errorHasOccurred()) + if (isDownloading() || hasErrorOccurred()) { UiUtils.hide(mIcon, mTitle, mMessage, mActionSmall, mActionLarge, mAds); } @@ -145,6 +141,7 @@ final class BannerController implements AdListener if (BuildConfig.DEBUG || BuildConfig.BUILD_TYPE.equals("beta")) { + AdSettings.addTestDevice("cbbc8cd2b6564ea727b5ca56bcf22622"); AdSettings.addTestDevice("c36b141fff9e11866d8cf9c601d2b7e0"); AdSettings.addTestDevice("189055740336d9d2687f41a775eaf867"); AdSettings.addTestDevice("36dd04f33c4cf92e3b7d21e9a5a9d985"); @@ -173,10 +170,8 @@ final class BannerController implements AdListener mOpened = true; setFrameHeight(WRAP_CONTENT); loadIcon(mNativeAd); - if (mMessage != null) - mMessage.setMaxLines(MAX_MESSAGE_LINES); - if (mTitle != null) - mTitle.setMaxLines(MAX_TITLE_LINES); + mMessage.setMaxLines(MAX_MESSAGE_LINES); + mTitle.setMaxLines(MAX_TITLE_LINES); updateVisibility(); Statistics.INSTANCE.trackEvent(Statistics.EventName.PP_BANNER_SHOW, @@ -193,10 +188,8 @@ final class BannerController implements AdListener mOpened = false; setFrameHeight((int) mCloseFrameHeight); UiUtils.hide(mIcon); - if (mMessage != null) - mMessage.setMaxLines(MIN_MESSAGE_LINES); - if (mTitle != null) - mTitle.setMaxLines(MIN_TITLE_LINES); + mMessage.setMaxLines(MIN_MESSAGE_LINES); + mTitle.setMaxLines(MIN_TITLE_LINES); updateVisibility(); return true; @@ -216,9 +209,6 @@ final class BannerController implements AdListener private void loadIcon(@NonNull NativeAd nativeAd) { - if (mIcon == null) - return; - UiUtils.show(mIcon); NativeAd.Image icon = nativeAd.getAdIcon(); NativeAd.downloadAndDisplayImage(icon, mIcon); @@ -241,14 +231,10 @@ final class BannerController implements AdListener hideProgress(); updateVisibility(); - if (mTitle != null) - mTitle.setText(mNativeAd.getAdTitle()); - if (mMessage != null) - mMessage.setText(mNativeAd.getAdBody()); - if (mActionSmall != null) - mActionSmall.setText(mNativeAd.getAdCallToAction()); - if (mActionLarge != null) - mActionLarge.setText(mNativeAd.getAdCallToAction()); + mTitle.setText(mNativeAd.getAdTitle()); + mMessage.setText(mNativeAd.getAdBody()); + mActionSmall.setText(mNativeAd.getAdCallToAction()); + mActionLarge.setText(mNativeAd.getAdCallToAction()); List clickableViews = new ArrayList<>(); clickableViews.add(mTitle);