diff options
| author | Dmitry Donskoy <donskdmitry@mail.ru> | 2019-06-06 19:10:07 +0300 |
|---|---|---|
| committer | Aleksandr Zatsepin <alexzatsepin@users.noreply.github.com> | 2019-06-07 11:39:57 +0300 |
| commit | d46cd16182e016630dfc8401e2d0ecd7b78e7154 (patch) | |
| tree | 2f71d820f334703b48820eed3be5eb7ad42bed78 /android | |
| parent | 0e8f704106667c9d73e150dc5c95c09a311042fa (diff) | |
[android] Fixed review notes
https://github.com/mapsme/omim/pull/11016#discussion_r291244431
https://github.com/mapsme/omim/pull/11016#discussion_r291237183
https://github.com/mapsme/omim/pull/11016#discussion_r291234177
Diffstat (limited to 'android')
| -rw-r--r-- | android/res/layout-land/onmap_downloader.xml | 2 | ||||
| -rw-r--r-- | android/src/com/mapswithme/maps/downloader/OnmapDownloader.java | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/android/res/layout-land/onmap_downloader.xml b/android/res/layout-land/onmap_downloader.xml index 2d16670f7f..1166e9fec5 100644 --- a/android/res/layout-land/onmap_downloader.xml +++ b/android/res/layout-land/onmap_downloader.xml @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/MwmTextAppearance.Title" - android:textSize="20sp" + android:textSize="@dimen/text_size_toolbar" android:gravity="center_horizontal" tools:text="Some title very loooooooooong title"/> <TextView diff --git a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java index 50c7cd7885..07063cafec 100644 --- a/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java +++ b/android/src/com/mapswithme/maps/downloader/OnmapDownloader.java @@ -263,21 +263,22 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener return; mPromoBanner = Framework.nativeGetDownloaderPromoBanner(mCurrentCountry.id); - boolean isPromoNotFound = mPromoBanner.getType() == DownloaderPromoBanner.DOWNLOADER_PROMO_TYPE_NO_PROMO; + boolean isPromoFound = mPromoBanner.getType() != DownloaderPromoBanner.DOWNLOADER_PROMO_TYPE_NO_PROMO; boolean enqueued = mCurrentCountry.status == CountryItem.STATUS_ENQUEUED; boolean progress = mCurrentCountry.status == CountryItem.STATUS_PROGRESS; boolean applying = mCurrentCountry.status == CountryItem.STATUS_APPLYING; - boolean hasDialog = enqueued || progress || applying; - mPromoContentDivider.setVisibility(isPromoNotFound || !hasDialog ? View.GONE : View.VISIBLE); + boolean isDownloading = enqueued || progress || applying; + UiUtils.showIf(isPromoFound && isDownloading, mPromoContentDivider); - if (isPromoNotFound) + if (!isPromoFound) return; - boolean hasPromo = mPromoBanner.getType() == DownloaderPromoBanner.DOWNLOADER_PROMO_TYPE_MEGAFON; + boolean hasMegafonPromo = mPromoBanner.getType() == DownloaderPromoBanner.DOWNLOADER_PROMO_TYPE_MEGAFON; + boolean hasCatalogPromo = mPromoBanner.getType() == DownloaderPromoBanner.DOWNLOADER_PROMO_TYPE_BOOKMARK_CATALOG; - UiUtils.showIf(hasDialog && hasPromo, mFrame, R.id.banner); - UiUtils.showIf(hasDialog && !hasPromo, mCatalogCallToActionContainer); + UiUtils.showIf(isDownloading && hasMegafonPromo, mFrame, R.id.banner); + UiUtils.showIf(isDownloading && hasCatalogPromo, mCatalogCallToActionContainer); } @Override |