From 1daa30543bbc6d2fb8ddc960397763c19f9f7f16 Mon Sep 17 00:00:00 2001 From: Dmitry Yunitsky Date: Tue, 24 Nov 2015 12:27:55 +0300 Subject: [PATCH] [android] Add showcase item to menu. --- android/AndroidManifest.xml | 4 + .../com/mapswithme/maps/PrivateVariables.cpp | 28 +++- android/proguard-mwm.txt | 18 +-- android/res/drawable-hdpi/ic_showcase.png | Bin 0 -> 254 bytes android/res/drawable-mdpi/ic_showcase.png | Bin 0 -> 130 bytes android/res/drawable-xhdpi/ic_showcase.png | Bin 0 -> 197 bytes android/res/drawable-xxhdpi/ic_showcase.png | Bin 0 -> 257 bytes android/res/drawable-xxxhdpi/ic_showcase.png | Bin 0 -> 305 bytes android/res/layout-land/menu_content.xml | 6 - android/res/layout/menu_content.xml | 98 +++++++----- android/res/layout/menu_content_grid.xml | 102 +++++++------ android/res/values/donottranslate.xml | 1 + android/res/xml-v21/prefs_misc.xml | 15 +- android/res/xml/prefs_misc.xml | 5 + .../src/com/mapswithme/maps/MwmActivity.java | 78 +++++++++- .../com/mapswithme/maps/PrivateVariables.java | 6 + .../mapswithme/maps/widget/menu/MainMenu.java | 32 ++-- .../util/statistics/AlohaHelper.java | 1 + .../util/statistics/MytargetHelper.java | 142 ++++++++++++++++++ 19 files changed, 411 insertions(+), 125 deletions(-) create mode 100644 android/res/drawable-hdpi/ic_showcase.png create mode 100644 android/res/drawable-mdpi/ic_showcase.png create mode 100644 android/res/drawable-xhdpi/ic_showcase.png create mode 100644 android/res/drawable-xxhdpi/ic_showcase.png create mode 100644 android/res/drawable-xxxhdpi/ic_showcase.png delete mode 100644 android/res/layout-land/menu_content.xml create mode 100644 android/src/com/mapswithme/util/statistics/MytargetHelper.java diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index d397d503c7..8c2135517e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -235,6 +235,10 @@ android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize" android:theme="@android:style/Theme.Translucent.NoTitleBar"/> + + NewStringUTF(ALOHALYTICS_URL); } JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_flurryKey(JNIEnv * env, jclass) + Java_com_mapswithme_maps_PrivateVariables_flurryKey(JNIEnv * env, jclass clazz) { return env->NewStringUTF(FLURRY_KEY); } JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_myTrackerKey(JNIEnv * env, jclass) + Java_com_mapswithme_maps_PrivateVariables_myTrackerKey(JNIEnv * env, jclass clazz) { return env->NewStringUTF(MY_TRACKER_KEY); } JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass) + Java_com_mapswithme_maps_PrivateVariables_parseApplicationId(JNIEnv * env, jclass clazz) { return env->NewStringUTF(PARSE_APPLICATION_ID); } JNIEXPORT jstring JNICALL - Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass) + Java_com_mapswithme_maps_PrivateVariables_parseClientKey(JNIEnv * env, jclass clazz) { return env->NewStringUTF(PARSE_CLIENT_KEY); } + + JNIEXPORT jstring JNICALL + Java_com_mapswithme_maps_PrivateVariables_myTargetSlot(JNIEnv * env, jclass clazz) + { + return env->NewStringUTF(MY_TARGET_KEY); + } + + JNIEXPORT jstring JNICALL + Java_com_mapswithme_maps_PrivateVariables_myTargetCheckUrl(JNIEnv * env, jclass clazz) + { + return env->NewStringUTF(AD_PERMISION_SERVER_URL); + } + + JNIEXPORT jlong JNICALL + Java_com_mapswithme_maps_PrivateVariables_myTargetCheckInterval(JNIEnv * env, jclass clazz) + { + return static_cast(AD_PERMISION_CHECK_DURATION); + } } diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt index 748912144d..3e30d1150a 100644 --- a/android/proguard-mwm.txt +++ b/android/proguard-mwm.txt @@ -1,30 +1,24 @@ # obfuscate supportV7 menu subclasses. it fixes bug with some Samsung and other devices ROMS based on android 4.2.2. # more details here : https://code.google.com/p/android/issues/detail?id=78377 -keep class !android.support.v7.internal.view.menu.**,** {*;} +# support library bug +-dontwarn android.support.** # flurry -dontwarn com.flurry.** -# support library bug --dontwarn android.support.** - # parse -dontwarn com.squareup.okhttp.** -dontwarn okio.** -dontwarn com.facebook.** +# myTarget +-dontwarn ru.mail.android.mytarget.** +-dontwarn com.mopub.** + -dontoptimize -keepattributes ** -# log proguard info -# -#-verbose -# -#-printseeds seeds.txt -#-printusage unused.txt -#-printmapping mapping.txt - - # Gson support -keep class com.mapswithme.util.Gsonable -keep class * implements com.mapswithme.util.Gsonable diff --git a/android/res/drawable-hdpi/ic_showcase.png b/android/res/drawable-hdpi/ic_showcase.png new file mode 100644 index 0000000000000000000000000000000000000000..6aa0b6a439d4e3fbd1d697c3ca0ecff87aa36d4b GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawj(WN{hEy=Vy|F#`Y^LENUdVnHU;dKf1_^C-b?bFl?%<@9A!q%w@RsO}Kuu)2aztOSp2+K6=G)!(oYQ;;1whMi2S2toT{P?^5&3FG-kM_T*|9@=7 zW*^a@){uqqe;59EZMQW0%insl4iGreZOK$UtK8?Ru=Q)8hZsCv{an^LB{Ts5-56{x literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_showcase.png b/android/res/drawable-mdpi/ic_showcase.png new file mode 100644 index 0000000000000000000000000000000000000000..56ed85b334008da3450dedaf441d778e4972fbc9 GIT binary patch literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tPfr)ekP61PS4L>kIBECHscS!Yyi2>;{V|5E;vd8F`-_b4AN=`4t0IHv eKsY0V2E+WsWh-ay?-d6c%HZkh=d#Wzp$P!i?k(v6 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xhdpi/ic_showcase.png b/android/res/drawable-xhdpi/ic_showcase.png new file mode 100644 index 0000000000000000000000000000000000000000..4af03e3243fbe4427b083d2a083f697fdd167dcf GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgdOTemLn;{G-q_A~*nr3Npgq$w z#NE=U(!yRrwvt!w6Ky@IY(o#MEC0bc}<-ZGW>(&HZ&GC)nKfw~=ve+A-hr z`_6oNGe7Fymp7-s{M`90l97ppLqNgdfc18v{X1rEo@+PXK;QntoJz3*?T2B9*0!9z qbDSNdpn-vLn^2zW9WRg#3>%n3WoPX+U|aPH#Pf9Zb6Mw<&;$Tn>EcU|zRsBj6r14b;uunK>+KCoz5@z8t_L?*-1&cOr84WzPHB_i-4&{TxWOh` zxV}z4c3WoeQ+C&PqVd<}%1_DA-nVv|e8`K9mp?aiDVMp`1tcCjcZOfn( zCKgVik^|K%9vrPWFnia7>xBpQuX*&GOJWUA7@KzURP(J6B`PNpQa2byNUi}})9~N+ W&na_JJw}a{Aik%opUXO@geCxiJyEX! literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxxhdpi/ic_showcase.png b/android/res/drawable-xxxhdpi/ic_showcase.png new file mode 100644 index 0000000000000000000000000000000000000000..85f5bd0860c04de6b495deb00f6bb0b9db0068f1 GIT binary patch literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvG8AvYpRA>UE^&j - - - - \ No newline at end of file diff --git a/android/res/layout/menu_content.xml b/android/res/layout/menu_content.xml index 57eb71f14f..cf40f31918 100644 --- a/android/res/layout/menu_content.xml +++ b/android/res/layout/menu_content.xml @@ -1,49 +1,65 @@ - - + + - + - - + + - + - + - + + + \ No newline at end of file diff --git a/android/res/layout/menu_content_grid.xml b/android/res/layout/menu_content_grid.xml index 3d60a64b21..a43ccdc2ba 100644 --- a/android/res/layout/menu_content_grid.xml +++ b/android/res/layout/menu_content_grid.xml @@ -1,51 +1,67 @@ - - + + - + - - + + - + - + - + + + \ No newline at end of file diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 397009c077..4f98701e31 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -40,6 +40,7 @@ MapStyle TtsEnabled TtsLanguage + DisplayShowcase %1$s: %2$s %2$s :%1$s diff --git a/android/res/xml-v21/prefs_misc.xml b/android/res/xml-v21/prefs_misc.xml index 97cf77367c..09754335cc 100644 --- a/android/res/xml-v21/prefs_misc.xml +++ b/android/res/xml-v21/prefs_misc.xml @@ -1,18 +1,25 @@ + + + android:switchTextOff="" + android:switchTextOn=""/> + android:switchTextOff="" + android:switchTextOn=""/> \ No newline at end of file diff --git a/android/res/xml/prefs_misc.xml b/android/res/xml/prefs_misc.xml index 257411bc42..9298dd176d 100644 --- a/android/res/xml/prefs_misc.xml +++ b/android/res/xml/prefs_misc.xml @@ -1,6 +1,11 @@ + +