diff --git a/android/build.gradle b/android/build.gradle index 1119ba7f7e..17354ea019 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -16,8 +16,9 @@ allprojects { apply plugin: 'com.android.application' + dependencies { - compile libSupportV4, libSupportV7, libGooglePlayServices, libNineOldAndroids, libFacebookSdk + compile libSupportV4, libSupportV7, libGooglePlayServicesLocation, libGooglePlayServicesPlus, libNineOldAndroids, libFacebookSdk compile fileTree(dir: '3rd_party', include: '*.jar', exclude: 'mrgsmanifest.jar') } diff --git a/android/gradle.properties b/android/gradle.properties index beac24cc29..911259e3be 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -7,7 +7,8 @@ propDebugNdkFlags=V=1 NDK_DEBUG=1 DEBUG=1 propReleaseNdkFlags=V=1 NDK_DEBUG=0 PRODUCTION=1 libSupportV4=com.android.support:support-v4:21.+ libSupportV7=com.android.support:appcompat-v7:21.+ -libGooglePlayServices=com.google.android.gms:play-services-location:6.5.+ +libGooglePlayServicesLocation=com.google.android.gms:play-services-location:6.5.+ +libGooglePlayServicesPlus=com.google.android.gms:play-services-plus:6.5.+ libGradleAndroidPlugin=com.android.tools.build:gradle:1.0.+ libNineOldAndroids=com.nineoldandroids:library:2.4.0 libFacebookSdk=com.facebook.android:facebook-android-sdk:3.+ diff --git a/android/res/layout/fragment_google_plus_dialog.xml b/android/res/layout/fragment_google_plus_dialog.xml new file mode 100644 index 0000000000..90a7d3311d --- /dev/null +++ b/android/res/layout/fragment_google_plus_dialog.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java index c18397c211..2ab234074c 100644 --- a/android/src/com/mapswithme/maps/MWMActivity.java +++ b/android/src/com/mapswithme/maps/MWMActivity.java @@ -46,11 +46,11 @@ import com.mapswithme.country.ActiveCountryTree; import com.mapswithme.country.DownloadActivity; import com.mapswithme.country.DownloadFragment; import com.mapswithme.country.StorageOptions; -import com.mapswithme.maps.ads.AdsManager; -import com.mapswithme.maps.ads.MenuAd; import com.mapswithme.maps.Framework.OnBalloonListener; import com.mapswithme.maps.Framework.RoutingListener; import com.mapswithme.maps.MapStorage.Index; +import com.mapswithme.maps.ads.AdsManager; +import com.mapswithme.maps.ads.MenuAd; import com.mapswithme.maps.api.ParsedMmwRequest; import com.mapswithme.maps.background.WorkerService; import com.mapswithme.maps.bookmarks.BookmarkActivity; diff --git a/android/src/com/mapswithme/maps/ads/GooglePlusDialogFragment.java b/android/src/com/mapswithme/maps/ads/GooglePlusDialogFragment.java new file mode 100644 index 0000000000..fce107241e --- /dev/null +++ b/android/src/com/mapswithme/maps/ads/GooglePlusDialogFragment.java @@ -0,0 +1,32 @@ +package com.mapswithme.maps.ads; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.os.Bundle; +import android.support.annotation.NonNull; +import android.support.v4.app.DialogFragment; +import android.view.LayoutInflater; +import android.view.View; + +import com.google.android.gms.plus.PlusOneButton; +import com.mapswithme.maps.R; +import com.mapswithme.util.Constants; + +public class GooglePlusDialogFragment extends DialogFragment +{ + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) + { + final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final LayoutInflater inflater = getActivity().getLayoutInflater(); + + final View root = inflater.inflate(R.layout.fragment_google_plus_dialog, null); + builder.setView(root); + PlusOneButton plusButton = (PlusOneButton) root.findViewById(R.id.btn__gplus); + plusButton.initialize(Constants.Url.PLAY_MARKET_HTTPS_APP_PREFIX + Constants.Package.MWM_PRO_PACKAGE, 1); + + return builder.create(); + } +} diff --git a/android/src/com/mapswithme/util/Constants.java b/android/src/com/mapswithme/util/Constants.java index 63a0bee5fb..3b92fb61e0 100644 --- a/android/src/com/mapswithme/util/Constants.java +++ b/android/src/com/mapswithme/util/Constants.java @@ -18,6 +18,7 @@ public class Constants public static final String HTTP_GE0_PREFIX = "http://ge0.me/"; public static final String PLAY_MARKET_APP_PREFIX = "market://details?id="; + public static final String PLAY_MARKET_HTTPS_APP_PREFIX = "https://play.google.com/store/apps/details?id="; public static final String GEOLOCATION_SERVER_MAPSME = "http://geolocation.server/"; public static final String FB_MAPSME_COMMUNITY_HTTP = "http://www.facebook.com/MapsWithMe"; diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index 5124d89d25..ce8b2497cc 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -27,7 +27,6 @@ import android.view.animation.TranslateAnimation; import android.widget.ImageView; import android.widget.TextView; -import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.MWMApplication; import com.mapswithme.maps.R; import com.nineoldandroids.animation.Animator;