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

[android] Added more btn handling for promo poi description

Browse source
This commit is contained in:
Александр Зацепин 2019-09-11 19:31:51 +03:00 • committed by yoksnod
parent ad0266f2cb
commit 4134a06c1d
4 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
android/src/com/mapswithme/maps/bookmarks/PlaceDescriptionActivity.java
View file

@ -1,5 +1,8 @@
package com.mapswithme.maps.bookmarks;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import com.mapswithme.maps.base.BaseToolbarActivity;
@ -11,4 +14,11 @@ public class PlaceDescriptionActivity extends BaseToolbarActivity
{
return PlaceDescriptionFragment.class;
}
public static void start(@NonNull Context context, @NonNull String description)
{
Intent intent = new Intent(context, PlaceDescriptionActivity.class)
.putExtra(PlaceDescriptionFragment.EXTRA_DESCRIPTION, description);
context.startActivity(intent);
}
}

3
android/src/com/mapswithme/maps/bookmarks/PlaceDescriptionFragment.java
View file

@ -29,7 +29,8 @@ public class PlaceDescriptionFragment extends BaseMwmFragment
public void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
mDescription = Objects.requireNonNull(getArguments().getString(EXTRA_DESCRIPTION));
mDescription = Objects.requireNonNull(Objects.requireNonNull(getArguments())
.getString(EXTRA_DESCRIPTION));
}
@Nullable

19
android/src/com/mapswithme/maps/promo/CatalogPromoController.java
View file

@ -7,12 +7,14 @@ import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.bumptech.glide.Glide;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.Detachable;
import com.mapswithme.maps.bookmarks.PlaceDescriptionActivity;
import com.mapswithme.maps.bookmarks.data.MapObject;
import com.mapswithme.maps.gallery.GalleryAdapter;
import com.mapswithme.maps.gallery.impl.Factory;
@ -186,12 +188,6 @@ public class CatalogPromoController implements Promo.Listener, Detachable<Activi
mPromoTitle.setText(R.string.pp_discovery_place_related_header);
PromoCityGallery.Item item = items[0];
PromoCityGallery.Place place = item.getPlace();
TextView poiName = mPlacePageView.findViewById(R.id.promo_poi_name);
poiName.setText(place.getName());
TextView poiDescription = mPlacePageView.findViewById(R.id.promo_poi_description);
poiDescription.setText(Html.fromHtml(place.getDescription()));
ImageView poiImage = mPlacePageView.findViewById(R.id.promo_poi_image);
Glide.with(poiImage.getContext())
@ -203,6 +199,17 @@ public class CatalogPromoController implements Promo.Listener, Detachable<Activi
bookmarkName.setText(item.getName());
TextView authorName = mPlacePageView.findViewById(R.id.place_single_bookmark_author);
authorName.setText(item.getAuthor().getName());
PromoCityGallery.Place place = item.getPlace();
UiUtils.hide(mPlacePageView, R.id.poi_description_container);
TextView poiName = mPlacePageView.findViewById(R.id.promo_poi_name);
poiName.setText(place.getName());
TextView poiDescription = mPlacePageView.findViewById(R.id.promo_poi_description);
poiDescription.setText(Html.fromHtml(place.getDescription()));
View more = mPlacePageView.findViewById(R.id.promo_poi_more);
more.setOnClickListener(v -> PlaceDescriptionActivity.start(mPlacePageView.getContext(),
place.getDescription()));
}
}

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

@ -3,7 +3,6 @@ package com.mapswithme.maps.widget.placepage;
import android.app.Activity;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Color;
@ -48,7 +47,6 @@ import com.mapswithme.maps.ads.LocalAdInfo;
import com.mapswithme.maps.api.ParsedMwmRequest;
import com.mapswithme.maps.base.Detachable;
import com.mapswithme.maps.bookmarks.PlaceDescriptionActivity;
import com.mapswithme.maps.bookmarks.PlaceDescriptionFragment;
import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
import com.mapswithme.maps.bookmarks.data.DistanceAndAzimut;
@ -778,9 +776,7 @@ public class PlacePageView extends NestedScrollView
Statistics.STATISTICS_CHANNEL_REALTIME);
Context context = mPlaceDescriptionContainer.getContext();
String description = Objects.requireNonNull(mMapObject).getDescription();
Intent intent = new Intent(context, PlaceDescriptionActivity.class)
.putExtra(PlaceDescriptionFragment.EXTRA_DESCRIPTION, description);
context.startActivity(intent);
PlaceDescriptionActivity.start(context, description);
}
private void initEditMapObjectBtn()