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

[android] Added UI for local ad in PP

Browse source
This commit is contained in:
Александр Зацепин 2017-04-21 17:48:10 +03:00
parent e9b2161b0b
commit e342d1809d
9 changed files with 86 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/jni/com/mapswithme/maps/UserMarkHelper.cpp
View file

@ -81,7 +81,8 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
static jmethodID const ctorId =
jni::GetConstructorID(env, g_bookmarkClazz,
"(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;"
"[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;)V");
"[Lcom/mapswithme/maps/ads/Banner;ZLjava/lang/String;"
"Lcom/mapswithme/maps/ads/LocalAdInfo;)V");
auto const & bac = info.GetBookmarkAndCategory();
BookmarkCategory * cat = g_framework->NativeFramework()->GetBmCategory(bac.m_categoryIndex);

12
android/res/layout-land/place_page_details.xml
View file

@ -71,11 +71,11 @@
<include layout="@layout/place_page_taxi"/>
<include layout="@layout/divider_horizontal"/>
<include layout="@layout/place_page_more"/>
<include layout="@layout/divider_horizontal"/>
<include layout="@layout/divider_horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_half"/>
<include layout="@layout/place_page_editor"/>
@ -83,6 +83,12 @@
<include layout="@layout/place_page_add"/>
<include layout="@layout/place_page_local_ad"/>
<include layout="@layout/divider_horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_half"/>
</LinearLayout>
</com.mapswithme.maps.widget.ObservableScrollView>

10
android/res/layout/place_page_add.xml
View file

@ -6,13 +6,9 @@
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<ImageView
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_add_place"
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:text="@string/placepage_add_place_button"/>
</LinearLayout>
android:text="@string/placepage_add_place_button"
android:gravity="center"/>
</LinearLayout>

8
android/res/layout/place_page_add_business.xml
View file

@ -7,14 +7,10 @@
android:visibility="visible"
tools:visibility="visible">
<ImageView
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_add_place"
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:gravity="center"
android:text="@string/placepage_add_business_button"/>
</LinearLayout>
</LinearLayout>

12
android/res/layout/place_page_details.xml
View file

@ -57,11 +57,11 @@
<include layout="@layout/place_page_taxi"/>
<include layout="@layout/divider_horizontal"/>
<include layout="@layout/place_page_more"/>
<include layout="@layout/divider_horizontal"/>
<include layout="@layout/divider_horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_half"/>
<include layout="@layout/place_page_editor"/>
@ -69,6 +69,12 @@
<include layout="@layout/place_page_add"/>
<include layout="@layout/place_page_local_ad"/>
<include layout="@layout/divider_horizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/margin_half"/>
</LinearLayout>
<include layout="@layout/shadow_top"/>

9
android/res/layout/place_page_editor.xml
View file

@ -5,14 +5,9 @@
android:id="@+id/ll__place_editor"
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<ImageView
style="@style/PlacePageMetadataIcon"
android:src="@drawable/ic_edit"
android:tint="?colorAccent"/>
<TextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText.Button"
android:gravity="center"
android:text="@string/edit_place"/>
</LinearLayout>
</LinearLayout>

13
android/res/layout/place_page_local_ad.xml Normal file
View file

@ -0,0 +1,13 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll__local_ad"
style="@style/PlacePageItemFrame"
tools:showIn="@layout/place_page_details"
tools:visibility="visible">
<TextView
android:id="@+id/tv__local_ad"
style="@style/PlacePageMetadataText.Button"
android:gravity="center"
android:text="@string/placepage_add_place_button"/>
</LinearLayout>

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

@ -2,12 +2,10 @@ package com.mapswithme.maps.widget.placepage;
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;
import android.location.Location;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.ColorInt;
import android.support.annotation.NonNull;
@ -46,6 +44,7 @@ import com.mapswithme.maps.R;
import com.mapswithme.maps.ads.CompoundNativeAdLoader;
import com.mapswithme.maps.ads.DefaultAdTracker;
import com.mapswithme.maps.ads.Factory;
import com.mapswithme.maps.ads.LocalAdInfo;
import com.mapswithme.maps.api.ParsedMwmRequest;
import com.mapswithme.maps.bookmarks.data.Bookmark;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
@ -157,6 +156,8 @@ public class PlacePageView extends RelativeLayout
private View mEditPlace;
private View mAddOrganisation;
private View mAddPlace;
private View mLocalAd;
private TextView mTvLocalAd;
// Bookmark
private View mBookmarkFrame;
private WebView mWvBookmarkNote;
@ -354,6 +355,9 @@ public class PlacePageView extends RelativeLayout
mAddOrganisation.setOnClickListener(this);
mAddPlace = mDetails.findViewById(R.id.ll__place_add);
mAddPlace.setOnClickListener(this);
mLocalAd = mDetails.findViewById(R.id.ll__local_ad);
mLocalAd.setOnClickListener(this);
mTvLocalAd = (TextView) mLocalAd.findViewById(R.id.tv__local_ad);
latlon.setOnLongClickListener(this);
address.setOnLongClickListener(this);
mPhone.setOnLongClickListener(this);
@ -508,10 +512,10 @@ public class PlacePageView extends RelativeLayout
break;
case BOOKING_SEARCH:
if (mMapObject != null)
if (mMapObject != null && !TextUtils.isEmpty(mMapObject.getBookingSearchUrl()))
{
Statistics.INSTANCE.trackBookingSearchEvent(mMapObject);
followUrl(mMapObject.getBookingSearchUrl());
Utils.openUrl(getContext(), mMapObject.getBookingSearchUrl());
}
break;
@ -843,7 +847,7 @@ public class PlacePageView extends RelativeLayout
try
{
followUrl(book ? info.getUrl() : info.getDescriptionUrl());
Utils.openUrl(getContext(), book ? info.getUrl() : info.getDescriptionUrl());
}
catch (ActivityNotFoundException e)
{
@ -1226,13 +1230,30 @@ public class PlacePageView extends RelativeLayout
if (inRouting || MapManager.nativeIsLegacyMode())
{
UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace);
UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mLocalAd);
}
else
{
UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
UiUtils.showIf(Editor.nativeShouldShowAddBusiness(), mAddOrganisation);
UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
refreshLocalAdInfo(mapObject);
}
}
private void refreshLocalAdInfo(@NonNull MapObject mapObject)
{
LocalAdInfo localAdInfo = mapObject.getLocalAdInfo();
boolean isLocalAdAvailable = localAdInfo != null && localAdInfo.isAvailable();
if (isLocalAdAvailable && !TextUtils.isEmpty(localAdInfo.getUrl()))
{
mTvLocalAd.setText(localAdInfo.isCustomer() ? R.string.view_campaign_button
: R.string.create_campaign_button);
UiUtils.show(mLocalAd);
}
else
{
UiUtils.hide(mLocalAd);
}
}
@ -1505,6 +1526,17 @@ public class PlacePageView extends RelativeLayout
case R.id.ll__place_add:
addPlace();
break;
case R.id.ll__local_ad:
if (mMapObject != null)
{
LocalAdInfo localAdInfo = mMapObject.getLocalAdInfo();
if (localAdInfo == null)
throw new AssertionError("A local ad must be non-null if button is shown!");
if (!TextUtils.isEmpty(localAdInfo.getUrl()))
Utils.openUrl(getContext(), localAdInfo.getUrl());
}
break;
case R.id.ll__more:
onSponsoredClick(false /* book */, true /* isMoreDetails */);
break;
@ -1525,7 +1557,7 @@ public class PlacePageView extends RelativeLayout
Utils.callPhone(getContext(), mTvPhone.getText().toString());
break;
case R.id.ll__place_website:
followUrl(mTvWebsite.getText().toString());
Utils.openUrl(getContext(), mTvWebsite.getText().toString());
break;
case R.id.ll__place_wiki:
// TODO: Refactor and use separate getters for Wiki and all other PP meta info too.
@ -1534,7 +1566,7 @@ public class PlacePageView extends RelativeLayout
LOGGER.e(TAG, "Cannot follow url, mMapObject is null!", new Throwable());
break;
}
followUrl(mMapObject.getMetadata(Metadata.MetadataType.FMD_WIKIPEDIA));
Utils.openUrl(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WIKIPEDIA));
break;
case R.id.direction_frame:
Statistics.INSTANCE.trackEvent(Statistics.EventName.PP_DIRECTION_ARROW);
@ -1572,7 +1604,7 @@ public class PlacePageView extends RelativeLayout
{
//null checking is done in 'isSponsored' method
//noinspection ConstantConditions
followUrl(mSponsored.getReviewUrl());
Utils.openUrl(getContext(), mSponsored.getReviewUrl());
if (mMapObject != null)
Statistics.INSTANCE.trackHotelEvent(PP_HOTEL_REVIEWS_LAND, mSponsored, mMapObject);
}
@ -1586,15 +1618,6 @@ public class PlacePageView extends RelativeLayout
}
}
private void followUrl(String url)
{
final Intent intent = new Intent(Intent.ACTION_VIEW);
if (!url.startsWith("http://") && !url.startsWith("https://"))
url = "http://" + url;
intent.setData(Uri.parse(url));
getContext().startActivity(intent);
}
private void toggleIsBookmark(@NonNull MapObject mapObject)
{
if (MapObject.isOfType(MapObject.BOOKMARK, mapObject))

6
android/src/com/mapswithme/util/Utils.java
View file

@ -204,7 +204,11 @@ public class Utils
public static void openUrl(@NonNull Context activity, @NonNull String url)
{
activity.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
final Intent intent = new Intent(Intent.ACTION_VIEW);
if (!url.startsWith("http://") && !url.startsWith("https://"))
url = "http://" + url;
intent.setData(Uri.parse(url));
activity.startActivity(intent);
}
public static void sendSupportMail(@NonNull Activity activity, @NonNull String subject)