diff --git a/android/res/drawable/ic_contribute.xml b/android/res/drawable/ic_contribute.xml index 4ba64b5beb..de15bb484c 100644 --- a/android/res/drawable/ic_contribute.xml +++ b/android/res/drawable/ic_contribute.xml @@ -1,15 +1,9 @@ + android:viewportHeight="24" + android:viewportWidth="24"> - - + android:fillColor="@android:color/white" + android:pathData="M9.6,15.6 L11,14.175 8.825,12 11,9.825 9.6,8.4 6,12ZM14.4,15.6 L18,12 14.4,8.4 13,9.825 15.175,12 13,14.175ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z" /> diff --git a/android/res/drawable/ic_donate.xml b/android/res/drawable/ic_donate.xml new file mode 100644 index 0000000000..4ba64b5beb --- /dev/null +++ b/android/res/drawable/ic_donate.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml index 361669d6df..1e9b51586d 100644 --- a/android/res/layout/about.xml +++ b/android/res/layout/about.xml @@ -77,6 +77,12 @@ android:text="@string/report_a_bug" app:drawableStartCompat="@drawable/ic_report_a_bug"/> + + مساعدة اسئلة مكررة + + ﻉﺮﺒﺘﻳ كيف يمكنك دعمنا؟ diff --git a/android/res/values-be/strings.xml b/android/res/values-be/strings.xml index 34291a5d9b..9910f16b34 100644 --- a/android/res/values-be/strings.xml +++ b/android/res/values-be/strings.xml @@ -236,6 +236,8 @@ Дапамога Пытанні і адказы + + Ахвяраваць Як нас падтрымаць? diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index 89222ce77a..7448e51cb0 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -223,6 +223,8 @@ Помощ Въпроси и отговори + + Дарете Как да ни подкрепите? diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 1b60dcf53d..d0b2e15b05 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -216,6 +216,8 @@ Nápověda Otázky a odpovědi + + Darovat Jak nás podpořit? diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 1420e3d9eb..d29d628909 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -216,6 +216,8 @@ Hjælp Spørgsmål og svar + + Doner Sådan støtter vi os? diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 57bd9a45b2..11073433ec 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -235,6 +235,8 @@ Hilfe Fragen und Antworten + + Spenden Wie unterstützen Sie uns? diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index 3280c4f89d..2dde814b1c 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -217,6 +217,8 @@ Βοήθεια Ερωτήσεις και απαντήσεις + + Προσφέρω Πώς να μας υποστηρίξετε; diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index b5454cab38..ab1fb1f576 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -223,6 +223,8 @@ Ayuda Preguntas frecuentes + + Donar ¿Cómo apoyarnos? diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml index 9c7d68a1f8..795bd2ec2d 100644 --- a/android/res/values-eu/strings.xml +++ b/android/res/values-eu/strings.xml @@ -221,6 +221,8 @@ Laguntza Maiz galderak + + Dohaintza eman Nola lagundu diguzu? diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index 4ec0fbe484..1f3ae2a26a 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -209,6 +209,8 @@ کمک ﺦﺳﺎﭘ ﻭ ﺶﺳﺮﭘ + + ﺪﯿﻨﮐ ﺍﺪﻫﺍ چگونه از ما حمایت کنیم؟ diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 693fb184ff..6b289726b3 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -222,6 +222,8 @@ Ohje Kysymykset ja vastaukset + + Lahjoittaa Kuinka tukea meitä? diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 9a988158c7..447074d705 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -237,6 +237,8 @@ Aide Foire aux questions + + Faire un don Comment nous soutenir? diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 0df2522f0e..9695a23a2c 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -216,6 +216,8 @@ Segítség Kérdések és válaszok + + Adományoz Hogyan támogat minket? diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index 0ca4b57dc7..b8d6498bcb 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -218,6 +218,8 @@ Bantuan Pertanyaan dan jawaban + + Menyumbangkan Bagaimana cara mendukung kami? diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index db06ad6059..d46bc816ed 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -221,6 +221,8 @@ Aiuto Domande frequenti + + Donare Come sostenerci? diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index 0bd011a2b0..4d3de06747 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -164,6 +164,8 @@ עזרה תובושתו תולאש + + םוֹרתְלִ כיצד לתמוך בנו? diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 4275773179..7e5233a463 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -214,6 +214,8 @@ ヘルプ 質問と回答 + + 寄付 どのように私たちを支持する方法？ diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 29a78dcec9..ae79b835f7 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -216,6 +216,8 @@ 도움말 질문과 답변 + + 기부 우리를 지원하는 방법? diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index 53bc8dd95b..e9c56464da 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -218,6 +218,8 @@ Hjelp Spørsmål og svar + + Donere Hvordan støtte oss? diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index a93efd5e41..32373e2dbd 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -218,6 +218,8 @@ Hulp Vragen en antwoorden + + Doneren Hoe ons te steunen? diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 02e23f99a2..b5c01c9eb2 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -221,6 +221,8 @@ Pomoc Pytania i odpowiedzi + + Podarować Jak nas wspierać? diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml index 9fa54d4393..d54f3f7bd6 100644 --- a/android/res/values-pt-rBR/strings.xml +++ b/android/res/values-pt-rBR/strings.xml @@ -231,6 +231,8 @@ Ajuda Perguntas e respostas + + Doar Direitos autorais diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index 3b9d2fa484..5ec2c1a4df 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -221,6 +221,8 @@ Ajuda Perguntas e respostas + + Doar Como nos apoiar? diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 8c40fe62ae..b017505204 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -223,6 +223,8 @@ Ajutor Întrebări frecvente + + Donează Cum să ne sprijiniți? diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 68d488767f..b2629437d4 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -238,6 +238,8 @@ Справка Вопросы и ответы + + Поддержать рублём Как наc поддержать? diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 48e1c0ffb4..5529c94560 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -216,6 +216,8 @@ Nápoveda Otázky a odpovede + + Darovať Ako nás podporiť? diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 69a1e7559c..1f28d08a4f 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -214,6 +214,8 @@ Hjälp Frågor och svar + + Donera Hur stöder vi oss? diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index 8989387ab8..a34c8e5ed1 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -30,6 +30,8 @@ Habari Maswali na majibu + + Changia Jinsi ya kutuunga mkono? diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index 5d854e56f0..3c0d22010c 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -218,6 +218,8 @@ ความช่วยเหลือ คำถามและคำตอบ + + บริจาค วิธีการสนับสนุนเรา diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 50a24d2fab..3c1308956b 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -237,6 +237,8 @@ Yardım Sıkça Sorulan Sorular + + Bağış yapmak Sizi nasıl destekleyebilirim? diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 5f9e7ec047..6d27e5ab2f 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -231,6 +231,8 @@ Допомога Питання та відповіді + + Пожертвувати Як нас підтримати? diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 64db222b1f..c873058344 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -216,6 +216,8 @@ Trợ giúp Câu hỏi và trả lời + + Quyên tặng Làm thế nào để hỗ trợ chúng tôi? diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 4cc8596b8c..6a74924277 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -227,6 +227,8 @@ 幫助 問題和解答 + + 捐 如何支持我們？ diff --git a/android/res/values-zh/strings.xml b/android/res/values-zh/strings.xml index 5a51939b37..6142e0c815 100644 --- a/android/res/values-zh/strings.xml +++ b/android/res/values-zh/strings.xml @@ -224,6 +224,8 @@ 帮助 问题和解答 + + 捐 如何支持我们？ diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index d66b905867..ad64d662a6 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -256,6 +256,8 @@ Help Frequently Asked Questions + + Donate How to support us? diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index c102286ce4..885309f19b 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -86,6 +86,7 @@ import com.mapswithme.maps.widget.placepage.PlacePageController; import com.mapswithme.maps.widget.placepage.PlacePageData; import com.mapswithme.maps.widget.placepage.PlacePageFactory; import com.mapswithme.maps.widget.placepage.RoutingModeListener; +import com.mapswithme.util.Config; import com.mapswithme.util.Counters; import com.mapswithme.util.InputUtils; import com.mapswithme.util.PermissionsUtils; @@ -201,6 +202,8 @@ public class MwmActivity extends BaseMwmFragmentActivity @NonNull private PlacePageController mPlacePageController; + private String mDonatesUrl; + public interface LeftAnimationTrackListener { void onTrackStarted(boolean collapsed); @@ -447,6 +450,9 @@ public class MwmActivity extends BaseMwmFragmentActivity getDownloadMapsCounter(), this::onDownloadMapsOptionSelected )); + mDonatesUrl = Config.getDonateUrl(); + if (!TextUtils.isEmpty(mDonatesUrl)) + items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected)); items.add(new MenuBottomSheetItem(R.string.settings, R.drawable.ic_settings, this::onSettingsOptionSelected)); items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected)); return items; @@ -2004,6 +2010,11 @@ public class MwmActivity extends BaseMwmFragmentActivity showDownloader(false); } + public void onDonateOptionSelected() + { + Utils.openUrl(this, mDonatesUrl); + } + public void onSettingsOptionSelected() { Intent intent = new Intent(getActivity(), SettingsActivity.class); diff --git a/android/src/com/mapswithme/maps/help/HelpFragment.java b/android/src/com/mapswithme/maps/help/HelpFragment.java index c0aee14927..b4cab21495 100644 --- a/android/src/com/mapswithme/maps/help/HelpFragment.java +++ b/android/src/com/mapswithme/maps/help/HelpFragment.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.help; import android.os.Bundle; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,6 +15,7 @@ import com.mapswithme.maps.BuildConfig; import com.mapswithme.maps.Framework; import com.mapswithme.maps.R; import com.mapswithme.maps.base.BaseMwmFragment; +import com.mapswithme.util.Config; import com.mapswithme.util.Constants; import com.mapswithme.util.Graphics; import com.mapswithme.util.Utils; @@ -22,6 +24,8 @@ import java.text.SimpleDateFormat; public class HelpFragment extends BaseMwmFragment implements View.OnClickListener { + private String mDonateUrl; + private void setupItem(@IdRes int id, boolean tint, @NonNull View frame) { TextView view = frame.findViewById(id); @@ -47,6 +51,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + mDonateUrl = Config.getDonateUrl(); View root = inflater.inflate(R.layout.about, container, false); ((TextView) root.findViewById(R.id.version)) @@ -67,13 +72,16 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene setupItem(R.id.openstreetmap, true, root); setupItem(R.id.faq, true, root); setupItem(R.id.report, true, root); - if ("google".equalsIgnoreCase(BuildConfig.FLAVOR)) + if (TextUtils.isEmpty(mDonateUrl)) { - TextView view = root.findViewById(R.id.support_us); - view.setVisibility(View.GONE); + TextView donateView = root.findViewById(R.id.donate); + donateView.setVisibility(View.GONE); + TextView supportUsView = root.findViewById(R.id.support_us); + supportUsView.setVisibility(View.GONE); } else { + setupItem(R.id.donate, true, root); setupItem(R.id.support_us, true, root); } setupItem(R.id.rate, true, root); @@ -131,6 +139,8 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene Utils.sendBugReport(getActivity(), ""); else if (id == R.id.support_us) openLink(Constants.Url.SUPPORT_US); + else if (id == R.id.donate) + openLink(mDonateUrl); else if (id == R.id.rate) Utils.openAppInMarket(getActivity(), BuildConfig.REVIEW_URL); else if (id == R.id.copyright) diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java index 024e5e276d..e30c31b14e 100644 --- a/android/src/com/mapswithme/util/Config.java +++ b/android/src/com/mapswithme/util/Config.java @@ -41,6 +41,7 @@ public final class Config private static final String KEY_MISC_ENABLE_SCREEN_SLEEP = "EnableScreenSleep"; private static final String KEY_MISC_SHOW_ON_LOCK_SCREEN = "ShowOnLockScreen"; private static final String KEY_MISC_AGPS_TIMESTAMP = "AGPSTimestamp"; + private static final String KEY_DONATE_URL = "DonateUrl"; private Config() {} @@ -64,11 +65,13 @@ public final class Config return nativeGetLong(key, def); } + @NonNull private static String getString(String key) { return getString(key, ""); } + @NonNull private static String getString(String key, String def) { return nativeGetString(key, def); @@ -335,6 +338,11 @@ public final class Config nativeSetTransliteration(value); } + @NonNull + public static String getDonateUrl() + { + return getString(KEY_DONATE_URL); + } private static native boolean nativeGetBoolean(String name, boolean defaultValue); private static native void nativeSetBoolean(String name, boolean value); diff --git a/data/strings/strings.txt b/data/strings/strings.txt index 64b333e146..32e30d5f8b 100644 --- a/data/strings/strings.txt +++ b/data/strings/strings.txt @@ -5138,6 +5138,45 @@ zh-Hans = 问题和解答 zh-Hant = 問題和解答 + [donate] + comment = Button in the main menu + tags = android + en = Donate + ar = ﻉﺮﺒﺘﻳ + be = Ахвяраваць + bg = Дарете + cs = Darovat + da = Doner + de = Spenden + el = Προσφέρω + es = Donar + eu = Dohaintza eman + fa = ﺪﯿﻨﮐ ﺍﺪﻫﺍ + fi = Lahjoittaa + fr = Faire un don + he = םוֹרתְלִ + hu = Adományoz + id = Menyumbangkan + it = Donare + ja = 寄付 + ko = 기부 + nb = Donere + nl = Doneren + pl = Podarować + pt = Doar + pt-BR = Doar + ro = Donează + ru = Поддержать рублём + sk = Darovať + sv = Donera + sw = Changia + th = บริจาค + tr = Bağış yapmak + uk = Пожертвувати + vi = Quyên tặng + zh-Hans = 捐 + zh-Hant = 捐 + [how_to_support_us] comment = Button in the main Help dialog tags = android,ios