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

[android] Fixed review notes

Browse source 
https://github.com/mapsme/omim/pull/11034#discussion_r294737135
https://github.com/mapsme/omim/pull/11034#discussion_r294745674
https://github.com/mapsme/omim/pull/11034#discussion_r294745870
https://github.com/mapsme/omim/pull/11034#discussion_r294745946
https://github.com/mapsme/omim/pull/11034#discussion_r294749045
https://github.com/mapsme/omim/pull/11034#discussion_r294751382
https://github.com/mapsme/omim/pull/11034#discussion_r294761542
https://github.com/mapsme/omim/pull/11034#discussion_r294754830
https://github.com/mapsme/omim/pull/11034#discussion_r294755861
https://github.com/mapsme/omim/pull/11034#discussion_r294757160
This commit is contained in:
Dmitry Donskoy 2019-06-19 14:10:56 +03:00 • committed by Aleksandr Zatsepin
parent ce09d9a509
commit 9994dc2104
17 changed files with 120 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/res/layout/catalog_promo_container.xml
View file

@ -12,11 +12,9 @@
android:layout_marginEnd="@dimen/margin_base"
android:layout_marginBottom="@dimen/margin_half_plus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:layout_height="wrap_content"/>
<android.support.v7.widget.RecyclerView
android:visibility="gone"
android:id="@+id/catalog_promo_recycler"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

13
android/res/layout/catalog_promo_container_wrapper.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingBottom="@dimen/margin_half_plus"
android:background="?attr/windowBackgroundForced"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingBottom="@dimen/margin_half_plus"
android:background="?attr/windowBackgroundForced"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/catalog_promo_container"/>
</LinearLayout>

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

@ -26,6 +26,7 @@ import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.gallery.GalleryAdapter;
import com.mapswithme.maps.gallery.ItemSelectedListener;
import com.mapswithme.maps.gallery.Items;
import com.mapswithme.maps.gallery.impl.BaseItemSelectedListener;
import com.mapswithme.maps.gallery.impl.Factory;
import com.mapswithme.maps.gallery.impl.LoggableItemSelectedListener;
import com.mapswithme.maps.metrics.UserActionsLogger;
@ -34,9 +35,8 @@ import com.mapswithme.maps.promo.PromoEntity;
import com.mapswithme.maps.search.SearchResult;
import com.mapswithme.maps.widget.PlaceholderView;
import com.mapswithme.maps.widget.ToolbarController;
import com.mapswithme.maps.widget.placepage.LoadingCatalogPromoListener;
import com.mapswithme.maps.widget.placepage.PlacePageView;
import com.mapswithme.maps.widget.placepage.RegularCatalogPromoListener;
import com.mapswithme.maps.gallery.impl.RegularCatalogPromoListener;
import com.mapswithme.maps.widget.recycler.ItemDecoratorFactory;
import com.mapswithme.util.ConnectionState;
import com.mapswithme.util.Language;
@ -128,6 +128,12 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove
setLayoutManagerAndItemDecoration(getContext(), getGallery(R.id.food));
}
private void initCatalogPromoGallery()
{
RecyclerView catalogPromoRecycler = getGallery(R.id.catalog_promo_recycler);
setLayoutManagerAndItemDecoration(requireContext(), catalogPromoRecycler);
}
private void initLocalExpertsGallery()
{
setLayoutManagerAndItemDecoration(getContext(), getGallery(R.id.localGuides));
@ -212,7 +218,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);
LoadingCatalogPromoListener<Items.Item> listener = new LoadingCatalogPromoListener<>(requireActivity());
BaseItemSelectedListener<Items.Item> listener = new BaseItemSelectedListener<>(requireActivity(), /* FIXME */ItemType.CAFES);
promoRecycler.setAdapter(Factory.createCatalogPromoLoadingAdapter(listener));
return;
}
@ -223,17 +229,6 @@ public class DiscoveryFragment extends BaseMwmToolbarFragment implements Discove
R.id.localGuides);
}
private void initCatalogPromoGallery()
{
View root = getRootView();
RecyclerView catalogPromoRecycler = root.findViewById(R.id.catalog_promo_recycler);
setLayoutManagerAndItemDecoration(requireContext(), catalogPromoRecycler);
View titleView = root.findViewById(R.id.catalog_promo_title);
UiUtils.show(titleView);
UiUtils.show(catalogPromoRecycler);
}
private void requestDiscoveryInfo()
{
DiscoveryParams params;

2
android/src/com/mapswithme/maps/discovery/DiscoveryManager.java
View file

@ -12,7 +12,7 @@ import com.mapswithme.util.log.LoggerFactory;
import java.util.EnumSet;
enum DiscoveryManager
public enum DiscoveryManager
{
INSTANCE;
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);

31
android/src/com/mapswithme/maps/gallery/AbstractActionButtonListener.java
View file

@ -1,31 +0,0 @@
package com.mapswithme.maps.gallery;
import android.app.Activity;
import android.support.annotation.NonNull;
public abstract class AbstractActionButtonListener<T extends Items.Item> implements ItemSelectedListener<T>
{
@NonNull
private final Activity mActivity;
public AbstractActionButtonListener(@NonNull Activity activity)
{
mActivity = activity;
}
@Override
public void onMoreItemSelected(@NonNull T item)
{
}
@Override
public void onActionButtonSelected(@NonNull T item, int position)
{
}
@NonNull
protected Activity getActivity()
{
return mActivity;
}
}

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

@ -417,35 +417,11 @@ public class Holders
@Override
protected void onItemSelected(@NonNull Items.Item item, int position)
{
ItemSelectedListener<Items.Item> listener = getListener();
if (listener == null)
return;
listener.onActionButtonSelected(item, position);
}
}
public static class BaseEmptyCatalogHolder extends SimpleViewHolder
{
public BaseEmptyCatalogHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
{
super(itemView, items, listener);
}
@Override
protected void onItemSelected(@NonNull Items.Item item, int position)
{
ItemSelectedListener<Items.Item> listener = getListener();
if (listener == null)
return;
listener.onItemSelected(item, position);
}
}
public static class CrossPromoLoadingHolder extends BaseEmptyCatalogHolder
public static class CrossPromoLoadingHolder extends SimpleViewHolder
{
public CrossPromoLoadingHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
@ -512,4 +488,28 @@ public class Holders
mProLabel.setBackgroundDrawable(shapeDrawable);
}
}
public static class CatalogErrorHolder extends SimpleViewHolder
{
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
protected void onItemSelected(@NonNull Items.Item item, int position)
{
ItemSelectedListener<Items.Item> listener = getListener();
if (listener == null)
return;
listener.onItemSelected(item, position);
}
}
}

8
android/src/com/mapswithme/maps/gallery/SimpleSingleItemAdapterStrategy.java
View file

@ -12,9 +12,15 @@ import com.mapswithme.maps.MwmApplication;
public abstract class SimpleSingleItemAdapterStrategy<T extends Holders.BaseViewHolder<Items.Item>>
extends SingleItemAdapterStrategy<T>
{
protected SimpleSingleItemAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener,
@Nullable String url)
{
super(url, listener);
}
protected SimpleSingleItemAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener)
{
super(null, listener);
this(listener, null);
}
@Override

19
android/src/com/mapswithme/maps/gallery/impl/CatalogPromoErrorAdapterStrategy.java
View file

@ -5,15 +5,12 @@ import android.support.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.maps.gallery.Holders;
import com.mapswithme.maps.gallery.ItemSelectedListener;
import com.mapswithme.maps.gallery.Items;
import java.util.List;
class CatalogPromoErrorAdapterStrategy extends SimpleErrorAdapterStrategy
{
CatalogPromoErrorAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener)
@ -31,20 +28,6 @@ class CatalogPromoErrorAdapterStrategy extends SimpleErrorAdapterStrategy
@Override
protected Holders.SimpleViewHolder createViewHolder(@NonNull View itemView)
{
return new ErrorHolder(itemView, mItems, getListener());
}
private class ErrorHolder extends Holders.BaseEmptyCatalogHolder
{
public ErrorHolder(@NonNull View itemView, @NonNull List<Items.Item> items,
@Nullable ItemSelectedListener<Items.Item> listener)
{
super(itemView, items, listener);
View progress = itemView.findViewById(R.id.progress);
progress.setVisibility(View.INVISIBLE);
TextView subtitle = itemView.findViewById(R.id.subtitle);
subtitle.setText("");
}
return new Holders.CatalogErrorHolder(itemView, mItems, getListener());
}
}

5
android/src/com/mapswithme/maps/gallery/impl/CatalogPromoLoadingAdapterStrategy.java
View file

@ -13,9 +13,10 @@ import com.mapswithme.maps.gallery.Items;
class CatalogPromoLoadingAdapterStrategy extends SimpleLoadingAdapterStrategy
{
CatalogPromoLoadingAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener)
CatalogPromoLoadingAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener,
@NonNull String url)
{
super(listener);
super(listener, url);
}
@NonNull

5
android/src/com/mapswithme/maps/gallery/impl/Factory.java
View file

@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.mapswithme.maps.R;
import com.mapswithme.maps.discovery.DiscoveryManager;
import com.mapswithme.maps.discovery.LocalExpert;
import com.mapswithme.maps.gallery.Constants;
import com.mapswithme.maps.gallery.GalleryAdapter;
@ -103,7 +104,9 @@ public class Factory
@NonNull
public static GalleryAdapter createCatalogPromoLoadingAdapter(@NonNull ItemSelectedListener<Items.Item> listener)
{
return new GalleryAdapter<>(new CatalogPromoLoadingAdapterStrategy(listener));
CatalogPromoLoadingAdapterStrategy strategy =
new CatalogPromoLoadingAdapterStrategy(listener, DiscoveryManager.nativeGetLocalExpertsUrl());
return new GalleryAdapter<>(strategy);
}
@NonNull

2
android/src/com/mapswithme/maps/widget/placepage/RegularCatalogPromoListener.java → android/src/com/mapswithme/maps/gallery/impl/RegularCatalogPromoListener.java
View file

@ -1,4 +1,4 @@
package com.mapswithme.maps.widget.placepage;
package com.mapswithme.maps.gallery.impl;
import android.app.Activity;
import android.support.annotation.NonNull;

8
android/src/com/mapswithme/maps/gallery/impl/SimpleLoadingAdapterStrategy.java
View file

@ -17,7 +17,13 @@ public class SimpleLoadingAdapterStrategy
{
SimpleLoadingAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener)
{
super(listener);
this(listener, null);
}
public SimpleLoadingAdapterStrategy(@Nullable ItemSelectedListener<Items.Item> listener,
@Nullable String url)
{
super(listener, url);
}
@Override

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

@ -560,7 +560,7 @@ public class BottomSheetPlacePageController implements PlacePageController, Loca
public void onActivityStarted(Activity activity)
{
mBannerController.attach();
mPlacePage.attach(null);
mPlacePage.attach(activity);
}
@Override

29
android/src/com/mapswithme/maps/widget/placepage/CatalogPromoListener.java
View file

@ -1,29 +0,0 @@
package com.mapswithme.maps.widget.placepage;
import android.support.annotation.NonNull;
import com.mapswithme.maps.promo.Promo;
import com.mapswithme.maps.promo.PromoCityGallery;
class CatalogPromoListener implements Promo.Listener
{
@NonNull
private final PlacePageView mPlacePage;
CatalogPromoListener(@NonNull PlacePageView placePage)
{
mPlacePage = placePage;
}
@Override
public void onCityGalleryReceived(@NonNull PromoCityGallery gallery)
{
mPlacePage.setCatalogPromoGallery(gallery);
}
@Override
public void onErrorReceived()
{
mPlacePage.setCatalogPromoGalleryError();
}
}

23
android/src/com/mapswithme/maps/widget/placepage/ErrorCatalogPromoListener.java
View file

@ -3,16 +3,27 @@ package com.mapswithme.maps.widget.placepage;
import android.app.Activity;
import android.support.annotation.NonNull;
import com.mapswithme.maps.gallery.AbstractActionButtonListener;
import com.mapswithme.maps.gallery.Items;
import com.mapswithme.util.Utils;
public class ErrorCatalogPromoListener<T extends Items.Item> extends AbstractActionButtonListener<T>
public class ErrorCatalogPromoListener<T extends Items.Item> implements com.mapswithme.maps.gallery.ItemSelectedListener<T>
{
@NonNull
private final Activity mActivity;
public ErrorCatalogPromoListener(@NonNull Activity activity)
{
super(activity);
mActivity = activity;
}
@Override
public void onMoreItemSelected(@NonNull T item)
{
}
@Override
public void onActionButtonSelected(@NonNull T item, int position)
{
}
@Override
@ -20,4 +31,10 @@ public class ErrorCatalogPromoListener<T extends Items.Item> extends AbstractAct
{
Utils.showSystemSettings(getActivity());
}
@NonNull
protected Activity getActivity()
{
return mActivity;
}
}

22
android/src/com/mapswithme/maps/widget/placepage/LoadingCatalogPromoListener.java
View file

@ -1,22 +0,0 @@
package com.mapswithme.maps.widget.placepage;
import android.app.Activity;
import android.support.annotation.NonNull;
import com.mapswithme.maps.gallery.AbstractActionButtonListener;
import com.mapswithme.maps.gallery.Items;
import com.mapswithme.util.Utils;
public class LoadingCatalogPromoListener<T extends Items.Item> extends AbstractActionButtonListener<T>
{
public LoadingCatalogPromoListener(@NonNull Activity activity)
{
super(activity);
}
@Override
public void onItemSelected(@NonNull T item, int position)
{
Utils.openUrl(getActivity(), item.getUrl());
}
}

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

@ -1,5 +1,6 @@
package com.mapswithme.maps.widget.placepage;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
@ -54,6 +55,7 @@ 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;
@ -65,7 +67,9 @@ import com.mapswithme.maps.gallery.Constants;
import com.mapswithme.maps.gallery.FullScreenGalleryActivity;
import com.mapswithme.maps.gallery.GalleryActivity;
import com.mapswithme.maps.gallery.Items;
import com.mapswithme.maps.gallery.impl.BaseItemSelectedListener;
import com.mapswithme.maps.gallery.impl.Factory;
import com.mapswithme.maps.gallery.impl.RegularCatalogPromoListener;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.promo.Promo;
import com.mapswithme.maps.promo.PromoCityGallery;
@ -125,7 +129,9 @@ public class PlacePageView extends NestedScrollView
LineCountTextView.OnLineCountCalculatedListener,
RecyclerClickListener,
NearbyAdapter.OnItemClickListener,
EditBookmarkFragment.EditBookmarkListener, Detachable<Void>
EditBookmarkFragment.EditBookmarkListener,
Detachable<Activity>,
Promo.Listener
{
private static final Logger LOGGER = LoggerFactory.INSTANCE.getLogger(LoggerFactory.Type.MISC);
private static final String TAG = PlacePageView.class.getSimpleName();
@ -361,9 +367,9 @@ public class PlacePageView extends NestedScrollView
}
@Override
public void attach(@NonNull Void object)
public void attach(@NonNull Activity object)
{
Promo.INSTANCE.setListener(new CatalogPromoListener(this));
Promo.INSTANCE.setListener(this);
}
@Override
@ -372,6 +378,28 @@ public class PlacePageView extends NestedScrollView
Promo.INSTANCE.setListener(null);
}
@Override
public void onCityGalleryReceived(@NonNull PromoCityGallery gallery)
{
String url = gallery.getMoreUrl();
List<PromoEntity> items = toEntities(gallery);
RegularCatalogPromoListener promoListener = new RegularCatalogPromoListener(getActivity());
com.mapswithme.maps.gallery.GalleryAdapter adapter = Factory.createCatalogPromoAdapter(getContext(),
items,
url,
promoListener,
GalleryPlacement.PLACEPAGE);
mCatalogPromoRecycler.setAdapter(adapter);
}
@Override
public void onErrorReceived()
{
ErrorCatalogPromoListener<Items.Item> listener = new ErrorCatalogPromoListener<>(getActivity());
com.mapswithme.maps.gallery.GalleryAdapter adapter = Factory.createCatalogPromoErrorAdapter(listener);
mCatalogPromoRecycler.setAdapter(adapter);
}
public interface SetMapObjectListener
{
void onSetMapObjectComplete(@NonNull NetworkPolicy policy, boolean isSameObject);
@ -840,11 +868,9 @@ public class PlacePageView extends NestedScrollView
private void initCatalogPromoView()
{
mCatalogPromoRecycler = findViewById(R.id.catalog_promo_recycler);
mCatalogPromoRecycler.setVisibility(VISIBLE);
mCatalogPromoTitleView = findViewById(R.id.catalog_promo_title);
mCatalogPromoTitleView.setVisibility(VISIBLE);
LoadingCatalogPromoListener<Items.Item> listener =
new LoadingCatalogPromoListener<>(getActivity());
BaseItemSelectedListener<Items.Item> listener =
new BaseItemSelectedListener<>(getActivity(), /* FIXME */ ItemType.CAFES);
com.mapswithme.maps.gallery.GalleryAdapter adapter =
Factory.createCatalogPromoLoadingAdapter(listener);
mCatalogPromoRecycler.setNestedScrollingEnabled(false);
@ -2105,19 +2131,6 @@ public class PlacePageView extends NestedScrollView
UiUtils.showIf(enabled, mCatalogPromoTitleView);
}
public void setCatalogPromoGallery(@NonNull PromoCityGallery gallery)
{
String url = gallery.getMoreUrl();
List<PromoEntity> items = toEntities(gallery);
RegularCatalogPromoListener promoListener = new RegularCatalogPromoListener(getActivity());
com.mapswithme.maps.gallery.GalleryAdapter adapter = Factory.createCatalogPromoAdapter(getContext(),
items,
url,
promoListener,
GalleryPlacement.PLACEPAGE);
mCatalogPromoRecycler.setAdapter(adapter);
}
@NonNull
public static List<PromoEntity> toEntities(@NonNull PromoCityGallery gallery)
{
@ -2135,13 +2148,6 @@ public class PlacePageView extends NestedScrollView
return items;
}
public void setCatalogPromoGalleryError()
{
ErrorCatalogPromoListener<Items.Item> listener = new ErrorCatalogPromoListener<>(getActivity());
com.mapswithme.maps.gallery.GalleryAdapter adapter = Factory.createCatalogPromoErrorAdapter(listener);
mCatalogPromoRecycler.setAdapter(adapter);
}
private class EditBookmarkClickListener implements OnClickListener
{
@Override