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

[android] Added strings integration for discovery

Browse source
This commit is contained in:
Dmitry Donskoy 2019-06-21 16:19:38 +03:00 • committed by Aleksandr Zatsepin
parent 5d7cc1b011
commit 8e2e03613a
8 changed files with 79 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout-land/onmap_downloader.xml
View file

@ -149,7 +149,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half"
android:text="@string/popup_mwm_download_guides_cta"
android:text="@string/popup_mwm_download_guides_title"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
tools:text="very very very loooooooooooooooooong text"/>

3
android/res/layout/catalog_promo_placeholder_card.xml
View file

@ -21,7 +21,7 @@
android:id="@+id/progress"
android:layout_width="@dimen/margin_base_plus"
android:layout_height="@dimen/margin_base_plus"
android:layout_marginTop="@dimen/margin_double_plus"/>
android:layout_marginTop="@dimen/margin_base_plus"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
@ -53,6 +53,7 @@
android:textAppearance="@style/MwmTextAppearance.Discovery.Item.Button"
style="@style/MwmWidget.Discovery.Item.Button"
android:layout_gravity="bottom"
android:lines="1"
android:text="@string/details"/>
</android.support.v7.widget.CardView>
</FrameLayout>

1
android/res/layout/onmap_downloader.xml
View file

@ -131,6 +131,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half"
android:gravity="center"
android:text="@string/popup_mwm_download_guides_title"
android:textAppearance="?android:attr/textAppearanceLarge"
tools:text="Some title"/>
<Button

22
android/src/com/mapswithme/maps/discovery/DiscoveryFragment.java
View file

@ -1,5 +1,6 @@
package com.mapswithme.maps.discovery;
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -220,7 +221,7 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove
RecyclerView localGuides = getGallery(R.id.localGuides);
localGuides.setAdapter(Factory.createLocalExpertsLoadingAdapter());
RecyclerView promoRecycler = getGallery(R.id.catalog_promo_recycler);
BaseItemSelectedListener<Items.Item> listener = new BaseItemSelectedListener<>(requireActivity(), /* FIXME */ItemType.CAFES);
BaseItemSelectedListener<Items.Item> listener = new CatalogPromoSelectedListener(requireActivity());
promoRecycler.setAdapter(Factory.createCatalogPromoLoadingAdapter(listener));
return;
}
@ -533,4 +534,23 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove
void onShowFilter();
void onShowSimilarObjects(@NonNull Items.SearchItem item, @NonNull ItemType type);
}
private static class CatalogPromoSelectedListener extends LoggableItemSelectedListener<Items.Item>
{
public CatalogPromoSelectedListener(@NonNull Activity activity)
{
super(activity, ItemType.PROMO);
}
@Override
protected void onMoreItemSelectedInternal(@NonNull Items.Item item)
{
}
@Override
protected void onItemSelectedInternal(@NonNull Items.Item item, int position)
{
}
}
}

52
android/src/com/mapswithme/maps/gallery/Holders.java
View file

@ -421,17 +421,6 @@ public class Holders
}
}
public static class CrossPromoLoadingHolder extends SimpleViewHolder
{
public CrossPromoLoadingHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
{
super(itemView, items, listener);
TextView subtitle = itemView.findViewById(R.id.subtitle);
subtitle.setText("");
}
}
public static class CatalogPromoHolder extends BaseViewHolder<PromoEntity>
{
@NonNull
@ -489,17 +478,52 @@ public class Holders
}
}
public static class CatalogErrorHolder extends SimpleViewHolder
public static class CrossPromoLoadingHolder extends SimpleViewHolder
{
@NonNull
private final TextView mSubTitle;
@NonNull
private final TextView mButton;
public CrossPromoLoadingHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
{
super(itemView, items, listener);
mSubTitle = itemView.findViewById(R.id.subtitle);
mButton = itemView.findViewById(R.id.button);
}
@NonNull
protected TextView getButton()
{
return mButton;
}
@Override
public void bind(@NonNull Items.Item item)
{
super.bind(item);
getTitle().setText(R.string.gallery_pp_download_guides_offline_title);
mSubTitle.setText(R.string.gallery_pp_download_guides_offline_subtitle);
}
}
public static class CatalogErrorHolder extends CrossPromoLoadingHolder
{
public CatalogErrorHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
{
super(itemView, items, listener);
View progress = itemView.findViewById(R.id.progress);
UiUtils.invisible(progress);
TextView subtitle = itemView.findViewById(R.id.subtitle);
subtitle.setText("");
}
@Override
public void bind(@NonNull Items.Item item)
{
super.bind(item);
getButton().setText(R.string.gallery_pp_download_guides_offline_cta);
}
@Override

13
android/src/com/mapswithme/maps/gallery/impl/BaseItemSelectedListener.java
View file

@ -3,7 +3,6 @@ package com.mapswithme.maps.gallery.impl;
import android.app.Activity;
import android.support.annotation.NonNull;
import com.mapswithme.maps.discovery.ItemType;
import com.mapswithme.maps.gallery.ItemSelectedListener;
import com.mapswithme.maps.gallery.Items;
import com.mapswithme.util.Utils;
@ -14,13 +13,9 @@ public class BaseItemSelectedListener<I extends Items.Item>
@NonNull
private final Activity mContext;
@NonNull
private final ItemType mType;
public BaseItemSelectedListener(@NonNull Activity context, @NonNull ItemType type)
public BaseItemSelectedListener(@NonNull Activity context)
{
mContext = context;
mType = type;
}
@NonNull
@ -29,12 +24,6 @@ public class BaseItemSelectedListener<I extends Items.Item>
return mContext;
}
@NonNull
protected ItemType getType()
{
return mType;
}
@Override
public void onItemSelected(@NonNull I item, int position)
{

16
android/src/com/mapswithme/maps/gallery/impl/LoggableItemSelectedListener.java
View file

@ -8,9 +8,13 @@ import com.mapswithme.maps.gallery.Items;
public abstract class LoggableItemSelectedListener<I extends Items.Item> extends BaseItemSelectedListener<I>
{
@NonNull
private final ItemType mType;
public LoggableItemSelectedListener(@NonNull Activity context, @NonNull ItemType type)
{
super(context, type);
super(context);
mType = type;
}
@Override
@ -18,7 +22,7 @@ public abstract class LoggableItemSelectedListener<I extends Items.Item> extends
{
super.onMoreItemSelected(item);
onMoreItemSelectedInternal(item);
getType().getMoreClickEvent().log();
mType.getMoreClickEvent().log();
}
@Override
@ -26,7 +30,13 @@ public abstract class LoggableItemSelectedListener<I extends Items.Item> extends
{
super.onItemSelected(item, position);
onItemSelectedInternal(item, position);
getType().getItemClickEvent().log();
mType.getItemClickEvent().log();
}
@NonNull
protected ItemType getType()
{
return mType;
}
protected abstract void onMoreItemSelectedInternal(@NonNull I item);

5
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -55,7 +55,6 @@ import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.bookmarks.data.Metadata;
import com.mapswithme.maps.bookmarks.data.RoadWarningMarkType;
import com.mapswithme.maps.discovery.ItemType;
import com.mapswithme.maps.downloader.CountryItem;
import com.mapswithme.maps.downloader.DownloaderStatusIcon;
import com.mapswithme.maps.downloader.MapManager;
@ -870,7 +869,7 @@ public class PlacePageView extends NestedScrollView
mCatalogPromoRecycler = findViewById(R.id.catalog_promo_recycler);
mCatalogPromoTitleView = findViewById(R.id.catalog_promo_title);
BaseItemSelectedListener<Items.Item> listener =
new BaseItemSelectedListener<>(getActivity(), /* FIXME */ ItemType.CAFES);
new BaseItemSelectedListener<>(getActivity());
com.mapswithme.maps.gallery.GalleryAdapter adapter =
Factory.createCatalogPromoLoadingAdapter(listener);
mCatalogPromoRecycler.setNestedScrollingEnabled(false);
@ -1238,13 +1237,13 @@ public class PlacePageView extends NestedScrollView
private void processSponsored(@NonNull NetworkPolicy policy)
{
// Promo.INSTANCE.nativeRequestCityGallery(policy);
boolean hasPromoGallery = mSponsored != null && mSponsored.getType() == Sponsored.TYPE_PROMO_CATALOG;
toggleCatalogPromoGallery(hasPromoGallery);
if (mSponsored == null || mMapObject == null)
return;
Promo.INSTANCE.nativeRequestCityGallery(policy, mMapObject.getLat(), mMapObject.getLon());
mSponsored.updateId(mMapObject);
mSponsoredPrice = mSponsored.getPrice();
String currencyCode = Utils.getCurrencyCode();