From 2b66e3a23b808b27971293ec75ea286e66bc565f Mon Sep 17 00:00:00 2001 From: Victor Sima Date: Sun, 15 Jan 2023 17:37:37 -0500 Subject: [PATCH] Feature - donation disclaimer modal (#75) * Feature - add donation modal disclaimer - #60 * Add missing strings * Upgraded AS - Reduced donation amount - Renamed id WIP * updated stirings key format - updated the donation address * code bump Co-authored-by: kcw-grunt --- .../activities/settings/AboutActivity.java | 8 +-- .../fragments/DynamicDonationFragment.java | 69 +++++++++---------- .../breadwallet/tools/util/BRConstants.java | 14 ++-- app/src/main/res/layout/activity_about.xml | 4 +- .../main/res/layout/bread_alert_dialog.xml | 13 ++-- .../res/layout/fragment_dynamic_donation.xml | 58 ++++++++-------- app/src/main/res/values-de/strings.xml | 15 ++-- app/src/main/res/values-es/strings.xml | 18 ++--- app/src/main/res/values-fr/strings.xml | 20 +++--- app/src/main/res/values-in/strings.xml | 17 ++--- app/src/main/res/values-it/strings.xml | 15 ++-- app/src/main/res/values-ja/strings.xml | 18 ++--- app/src/main/res/values-ko/strings.xml | 18 ++--- app/src/main/res/values-pt/strings.xml | 17 +++-- app/src/main/res/values-ru/strings.xml | 18 ++--- app/src/main/res/values-tr/strings.xml | 18 +++-- app/src/main/res/values-uk/strings.xml | 12 ++-- app/src/main/res/values-zh-rCN/strings.xml | 18 ++--- app/src/main/res/values-zh-rTW/strings.xml | 16 ++--- app/src/main/res/values/android_strings.xml | 1 - app/src/main/res/values/strings.xml | 17 +++-- build.gradle | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 23 files changed, 207 insertions(+), 203 deletions(-) diff --git a/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java b/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java index 7fd7da2e0..cbe3eaaaa 100644 --- a/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java +++ b/app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java @@ -25,7 +25,7 @@ public class AboutActivity extends BRActivity { private TextView policyText; private TextView infoText; - private ImageView redditShare; + private ImageView instagramShare; private ImageView twitterShare; private ImageView blogShare; private static AboutActivity app; @@ -57,14 +57,14 @@ protected void onCreate(Bundle savedInstanceState) { String verName = pInfo != null ? pInfo.versionName : " "; infoText.setText(getString(R.string.About_footer, verName)); - redditShare = (ImageView) findViewById(R.id.reddit_share_button); + instagramShare = (ImageView) findViewById(R.id.instagram_share_button); twitterShare = (ImageView) findViewById(R.id.twitter_share_button); blogShare = (ImageView) findViewById(R.id.blog_share_button); - redditShare.setOnClickListener(new View.OnClickListener() { + instagramShare.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BRConstants.REDDIT_LINK)); + Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BRConstants.INSTAGRAM_LINK)); startActivity(browserIntent); app.overridePendingTransition(R.anim.enter_from_bottom, R.anim.empty_300); } diff --git a/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java b/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java index 281ebd3be..0d5476400 100644 --- a/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java +++ b/app/src/main/java/com/breadwallet/presenter/fragments/DynamicDonationFragment.java @@ -1,5 +1,6 @@ package com.breadwallet.presenter.fragments; +import android.app.Activity; import android.os.Bundle; import android.util.Pair; import android.view.LayoutInflater; @@ -17,6 +18,7 @@ import androidx.fragment.app.Fragment; import com.breadwallet.R; +import com.breadwallet.presenter.customviews.BRDialogView; import com.breadwallet.presenter.entities.PaymentItem; import com.breadwallet.tools.manager.AnalyticsManager; import com.breadwallet.tools.manager.BRSharedPrefs; @@ -46,12 +48,14 @@ public class DynamicDonationFragment extends Fragment { private TextView feeVal; private TextView totalVal; + private TextView donationToTheLitewalletTeam; + private TextView amountSliderVal; private SeekBar seekBar; private String selectedIso; private boolean isLTCSwap = true; - private Pair chosenAddress; + private String chosenAddress = BRConstants.DONATION_ADDRESS; private long mDonationAmount; @@ -67,26 +71,10 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { isLTCSwap = BRSharedPrefs.getPreferredLTC(getContext()); addressVal = view.findViewById(R.id.addressVal); + addressVal.setText(chosenAddress); - chosenAddress = BRConstants.DONATION_ADDRESSES[0]; - addressVal.setText(chosenAddress.second); - - Spinner spinner = view.findViewById(R.id.spinnerAddresses); - spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - @Override - public void onItemSelected(AdapterView parent, View view, int position, long id) { - chosenAddress = BRConstants.DONATION_ADDRESSES[position]; - addressVal.setText(chosenAddress.second); - } - - @Override - public void onNothingSelected(AdapterView parent) { - //NO-OP - } - }); - ArrayAdapter adapter = new ArrayAdapter(getContext(), android.R.layout.simple_spinner_item, addresses()); - adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); - spinner.setAdapter(adapter); + donationToTheLitewalletTeam = view.findViewById(R.id.donationAddressesPhrase); + donationToTheLitewalletTeam.setText(getString(R.string.Donate_toThe_LWTeam)); TextView processingTimeLbl = view.findViewById(R.id.processingTimeLbl); processingTimeLbl.setText(getString(R.string.Confirmation_processingAndDonationTime, "2.5-5")); @@ -103,17 +91,19 @@ public void onNothingSelected(AdapterView parent) { Button donateBut = view.findViewById(R.id.donateBut); donateBut.setOnClickListener(v -> { - String memo = getString(R.string.Donate_toThe) + chosenAddress.first; - PaymentItem request = new PaymentItem(new String[]{chosenAddress.second}, null, mDonationAmount, null, false, memo); - - Bundle params = new Bundle(); - params.putString("DONATION_ACCOUNT", chosenAddress.first); - params.putLong("DONATION_AMOUNT", mDonationAmount); - params.putString("ADDRESS_SCHEME", "v2"); + BRDialogView dialog = new BRDialogView(); + dialog.setTitle(getString(R.string.Donate_Dialog_title)); + + dialog.setMessage(getString(R.string.Donate_Dialog_message)); + dialog.setNegButton(getString(R.string.Donate_Dialog_Negative_text)); + dialog.setPosButton(getString(R.string.Donate_Dialog_Positive_text)); + dialog.setPosListener(brDialogView -> { + dialog.dismiss(); + sendDonation(); + }); + dialog.setNegListener(brDialogView -> dialog.dismiss()); + dialog.show(((Activity) getActivity()).getFragmentManager(), dialog.getClass().getName()); - AnalyticsManager.logCustomEventWithParams(BRConstants._20200223_DD, params); - - BRSender.getInstance().sendTransaction(getContext(), request); }); amountSliderVal = view.findViewById(R.id.amountSliderVal); @@ -161,6 +151,17 @@ public void onStopTrackingTouch(SeekBar seekBar) { updateDonationValues(BRConstants.DONATION_AMOUNT); } + private void sendDonation() { + String memo = getString(R.string.Donate_toThe_LWTeam) + chosenAddress; + PaymentItem request = new PaymentItem(new String[]{chosenAddress}, null, mDonationAmount, null, false, memo); + Bundle params = new Bundle(); + params.putString("DONATION_ACCOUNT", chosenAddress); + params.putLong("DONATION_AMOUNT", mDonationAmount); + params.putString("ADDRESS_SCHEME", "v2"); + AnalyticsManager.logCustomEventWithParams(BRConstants._20200223_DD, params); + BRSender.getInstance().sendTransaction(getContext(), request); + } + private void setFeeToRegular() { FeeManager feeManager = FeeManager.getInstance(); @@ -183,14 +184,6 @@ private long newAmount(int progress) { return adjustedAmount + BRConstants.DONATION_AMOUNT; } - private String[] addresses() { - String[] addresses = new String[BRConstants.DONATION_ADDRESSES.length]; - for (int i = 0; i < BRConstants.DONATION_ADDRESSES.length; i++) { - addresses[i] = getString(R.string.Donate_toThe) + BRConstants.DONATION_ADDRESSES[i].first; - } - return addresses; - } - private void updateDonationValues(long donationAmount) { mDonationAmount = donationAmount; final BigDecimal donation = new BigDecimal(donationAmount); diff --git a/app/src/main/java/com/breadwallet/tools/util/BRConstants.java b/app/src/main/java/com/breadwallet/tools/util/BRConstants.java index 7bbcbf34f..19a84855f 100644 --- a/app/src/main/java/com/breadwallet/tools/util/BRConstants.java +++ b/app/src/main/java/com/breadwallet/tools/util/BRConstants.java @@ -80,12 +80,8 @@ public class BRConstants { /** * Donation */ - public static final Pair[] DONATION_ADDRESSES = new Pair[] - { - Pair.create("Litewallet Hardware Fundraiser", "MJ4W7NZya4SzE7R6xpEVdamGCimaQYPiWu"), - Pair.create("Litecoin Foundation", "MVZj7gBRwcVpa9AAWdJm8A3HqTst112eJe") - }; - public static final long DONATION_AMOUNT = 1_800_000; + public static final String DONATION_ADDRESS = "MJ4W7NZya4SzE7R6xpEVdamGCimaQYPiWu"; + public static final long DONATION_AMOUNT = 1_400_000; /** * Support Center article ids. @@ -93,8 +89,10 @@ public class BRConstants { public static final String loopBug = "android-loop-bug"; public static final String TWITTER_LINK = "https://twitter.com/Litewallet_App"; - public static final String REDDIT_LINK = "https://www.reddit.com/r/Litewallet"; - public static final String WEB_LINK = "https://litewalle.io"; + + public static final String INSTAGRAM_LINK = "https://www.instagram.com/litewallet.app"; + + public static final String WEB_LINK = "https://litewallet.io"; public static final String TOS_LINK = "https://litewallet.io/privacy/policy.html"; public static String CUSTOMER_SUPPORT_LINK = "https://support.litewallet.io"; public static String BITREFILL_AFFILIATE_LINK = "https://www.bitrefill.com/"; diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index b81905d9d..59954f089 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -169,13 +169,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="24dp" - android:text="@string/About.reddit" + android:text="@string/About.instagram" android:textSize="18sp" app:layout_constraintBottom_toTopOf="@+id/divider1" app:layout_constraintLeft_toLeftOf="@+id/divider1" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="Title"/> + app:layout_constraintTop_toBottomOf="@+id/dialog_title" + tools:text="Message"/> + android:textColor="@color/dark_blue" + tools:text="Positive"/> + android:textColor="@color/dark_blue" + tools:text="Negative"/> diff --git a/app/src/main/res/layout/fragment_dynamic_donation.xml b/app/src/main/res/layout/fragment_dynamic_donation.xml index 0c0bbe230..6a382c0eb 100644 --- a/app/src/main/res/layout/fragment_dynamic_donation.xml +++ b/app/src/main/res/layout/fragment_dynamic_donation.xml @@ -16,8 +16,8 @@ android:background="@drawable/pin_round_corner"> - + app:layout_constraintTop_toBottomOf="@id/addressVal" + tools:text="@string/Donate.toThe.LWTeam"/> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 089f251d3..59a3a6b57 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,15 +1,13 @@ - Loaf - + Blog Erstellt vom Litewallet-Team der Litecoin Foundation\n%1$s Datenschutzerklärung - Reddit Nutzungsbedingungen @@ -25,9 +23,11 @@ Mein Loaf - = + "\tSpende an die Litecoin Foundation " + "\tWir freuen uns über Ihre Spende an die Litecoin Foundation. Spenden sind endgültig und können nicht zurückerstattet werden. Vielen Dank für \tIhre anhaltende Unterstützung. " + Spenden + Absagen - VERWALTEN Anscheinend verwenden Sie eine Drittanbieter-Tastatur, die Ihre Eingaben aufzeichnen und Ihren Paper Key stehlen kann. Bitte wechseln Sie für zusätzlichen Schutz zur Standard-Tastatur von Android. @@ -185,7 +185,6 @@ ACHTUNG - Löschen Standortdienste sind deaktiviert @@ -195,7 +194,7 @@ Der Name deines Wallets erscheint ausschließlich im Transaktionsverlauf deines Kontos und kann von niemandem sonst eingesehen werden. - Name des Wallets + Name des Wallets Wallet verwalten @@ -718,7 +717,7 @@ Zu spendender Betrag: Adres: Spenden - "Spenden Sie an die " + Spende an: Litewallet Infrastruktur Luxus Diese Option garantiert praktisch die Annahme Ihrer Transaktion, obwohl Sie eine Prämie zahlen. 2.5 - 5+ Minuten diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8dacdb05c..34c1a1a59 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,15 +1,14 @@ - Loaf - + Blog Hecho por el equipo Litewallet de la Fundación Litecoin\n%1$s Política de privacidad - Reddit + Reddit Términos de uso @@ -25,9 +24,11 @@ Mi Loaf - = + "\tDonar a la Fundación Litecoin " + "\tAgradecemos su donación a la Fundación Litecoin. Las donaciones son finales y no pueden ser reembolsadas. Gracias por tu apoyo continuo. " + Donar + Cancelar - GESTIONAR Parece que estás usando un teclado de un tercero que puede grabar lo que escribes y robar tu clave de papel. Cambia al teclado predeterminado de Android para obtener protección adicional. @@ -185,7 +186,6 @@ AVISO - Borrar Los servicios de ubicación están desactivados. @@ -195,7 +195,7 @@ El nombre de tu cartera solo aparece en el historial de transacciones de tu cuenta y nadie más lo puede ver. - Nombre de la cartera + Nombre de la cartera Gestionar cartera @@ -718,8 +718,7 @@ Cantidad a donar: Dirección: Donar - "Done a la " - Lujo + Lujo Esta opción prácticamente garantiza la aceptación de su transacción aunque esté pagando una prima. 2.5 - 5+ minutos HISTORIA @@ -762,4 +761,5 @@ Idiomas Bitrefill Compre tarjetas de regalo\n• Recargue teléfonos prepagos\n• Steam, Amazon, Hotels.com\n• Funciona en 170 países + Donar a: Infraestructura Litewallet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5e9ea2a58..39397d42e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,15 +1,14 @@ - Loaf - + Blogue Fabriqué par l\'équipe Litewallet de la Fondation Litecoin\n%1$s Politique de confidentialité - Reddit + Reddit Conditions d\'utilisation @@ -25,9 +24,11 @@ Mon Loaf - = - - GÉRER + "\tFaire un don à la Fondation Litecoin " + "\tNous apprécions votre don à la Litecoin Foundation. Les dons sont définitifs et ne peuvent être remboursés. Merci pour votre soutien continu. " + Faire un don + Annuler + Il semble que vous utilisez un clavier tiers. Ce dernier peut enregistrer ce que vous tapez et voler votre portefeuille papier. Veuillez basculer vers le clavier Android par défaut pour plus de sécurité. @@ -185,7 +186,6 @@ AVERTISSEMENT - Supprimer Les services de localisation sont désactivés. @@ -195,7 +195,7 @@ Le nom de votre portefeuille n\'apparaît que dans l\'historique des transactions de votre compte et ne peut être vu par personne d\'autre. - Nom du portefeuille + Nom du portefeuille Gérer le portefeuille @@ -718,8 +718,7 @@ Montant à donner: Adresse: Faire un don - "Faire un don à " - Luxe + Luxe Cette option garantit pratiquement l\'acceptation de votre transaction même si vous payez une prime. 2.5 à 5+ minutes HISTORIQUE @@ -762,4 +761,5 @@ Langues Bitrefill Achetez des cartes-cadeaux\n• Rechargez des téléphones prépayés\n• Steam, Amazon, Hotels.com\n• Fonctionne dans 170 pays + Faire un don à : Litewallet Infrastructure diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 82bfc0d83..b183460f5 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1,15 +1,14 @@ - Loaf - + Situs web Dibuat oleh Tim Litewallet dari Litecoin Foundation\n%1$s Kebijakan pribadi - Reddit + Reddit Syarat Penggunaan @@ -25,9 +24,11 @@ Saya Loaf - = + "\tDonasi ke Yayasan Litecoin " + Kami menghargai donasi Anda ke Litecoin Foundation. Donasi bersifat final dan tidak dapat dikembalikan. Terima kasih atas dukungan Anda yang \tberkelanjutan. + Menyumbangkan + Membatalkan - MENGELOLA Sepertinya Anda menggunakan papan ketik pihak ketiga, yang dapat merekam apa yang Anda ketik dan mencuri Kunci Kertas Anda. Silakan beralih ke keyboard Android default untuk perlindungan ekstra. @@ -185,7 +186,6 @@ PERINGATAN - Membatalkan Layanan lokasi dinonaktifkan. @@ -716,7 +716,6 @@ Waktu pemrosesan: Proses transaksi ini akan memakan waktu %1$s menit. Jumlah Donasi: Menyumbangkan - Donasikan ke Alamat: Kemewahan Opsi ini secara virtual menjamin penerimaan transaksi Anda meskipun Anda membayar premi. @@ -759,7 +758,9 @@ Kartu Litecoin saat ini memiliki fungsi terbatas di Litewallet. Kunjungi litecoin.getblockcard.com untuk akses penuh Kartu Litecoin Beta - Bahasa + Nilai LTC saat ini di %1$s + Bahasa Bitrefill Beli kartu hadiah\n• Isi ulang ponsel prabayar\n• Steam, Amazon, Hotels.com\n• Berfungsi di 170 negara + Donasi ke: Infrastruktur Litewallet diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f311d4337..e7cbbfab5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,15 +1,13 @@ - Loaf - + Blog Realizzato dal team Litewallet della Fondazione Litecoin\n%1$s Informativa sulla Privacy - Reddit Termini di Utilizzo @@ -25,9 +23,11 @@ Il Mio Loaf - = + "\tDona alla Fondazione Litecoin " + Apprezziamo la tua donazione alla Fondazione Litecoin. Le donazioni sono definitive e non possono essere rimborsate. Grazie per il tuo \tcontinuo supporto. + Donare + Annulla - GESTISCI Sembra che tu stia utilizzando una tastiera di terze parti, che può registrare ciò che scrivi e rubare la tua Paper Key. Per favore, utilizza la tastiera Android di default per maggiore protezione. @@ -185,7 +185,6 @@ ATTENZIONE - Cancella I servizi di localizzazione sono disabilitati. @@ -195,7 +194,7 @@ Il nome del tuo portafoglio appare solo nella cronologia delle transazioni del tuo account e non può essere visto da nessun altro. - Nome Portafoglio + Nome Portafoglio Gestisci Portafoglio @@ -718,7 +717,6 @@ Importo da donare: Indirizzo: Donare - "Dona al " Lusso "Questa opzione garantisce virtualmente l'accettazione della tua transazione anche se stai pagando un premio." 2.5 - 5+ minuti @@ -762,4 +760,5 @@ Le lingue Bitrefill Acquista buoni regalo\n• Ricarica telefoni prepagati\n• Steam, Amazon, Hotels.com\n• Funziona in 170 paesi + Dona a: Litewallet Infrastructure diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a2ebf0e8b..572bf6e23 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,15 +1,14 @@ - ブレッド - + ブログ Litecoin FoundationのLitewalletチームが作成\n%1$s プライバシーポリシー - Reddit(レディット) + Reddit(レディット) 利用規約 @@ -25,9 +24,11 @@ マイブレッド - = - - 管理 + ライトコイン財団に寄付する + ライトコイン財団へのご寄付に感謝いたします。 寄付は最終的なものであり、返金することはできません。 今後ともよろしくお願いいたします。 + 寄付 + キャンセル + 現在、サードパーティーのキーボードを使用しているようです。これを使うと入力した内容が記録され、ペーパー・キーが盗まれる可能性があります。追加の保護措置としてAndroidのデフォルトキーボードに切り替えてください。 @@ -185,7 +186,6 @@ 警告 - 完全削除 位置情報サービスが無効化されています。 @@ -195,7 +195,7 @@ あなたのウォレットの名前はご自身のアカウントの取引履歴上でのみ表示され、あなた以外誰も閲覧することができません。 - ウォレットの名前 + ウォレットの名前 ウォレットを管理 @@ -718,7 +718,6 @@ 寄付金額: 住所: 寄付 - "に寄付する " ぜいたく このオプションは、プレミアムを支払っていますが、トランザクションの受け入れを事実上保証します。 2.5~5+分 @@ -763,4 +762,5 @@ 言語 Bitrefill ギフトカードの購入\n• プリペイド携帯電話の補充\n• Steam、Amazon、Hotels.com\n• 170 か国で利用可能 + 寄付先: Litewallet インフラストラクチャ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d4fc776a5..ff88df78b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,15 +1,14 @@ - Loaf - + 블로그 라이트 코인 재단 라이트 월렛 팀\n%1$s 개인정보 보호정책 - 레딧 + 레딧 이용 약관 @@ -25,9 +24,11 @@ 나의 Loaf - = - - 관리하기 + "\t라이트코인 재단에 기부 " + "\tLitecoin Foundation에 기부해 주셔서 감사합니다. 기부는 최종적이며 환불되지 않습니다. 지속적인 지원에 감사드립니다. " + 기부하다 + 취소 + 제3자가 제공한 키보드를 사용하고 계신 것 같습니다, 귀하의 입력을 기록하고 귀하의 페이퍼 키가 도난 당할 수 있습니다. 추가적인 보호를 위해 기본 안드로이드 키보드로 전환해 주세요. @@ -185,7 +186,6 @@ 경고 - 초기화 위치 서비스가 꺼졌습니다. @@ -195,7 +195,7 @@ 귀하의 지갑 이름은 귀하 계정의 거래 기록에서만 나타나며 다른 사람은 볼 수 없습니다. - 지갑 이름 + 지갑 이름 지갑 관리 @@ -718,7 +718,6 @@ 기부 금액 주소 기부 - "에 기부 " 사치 이 옵션은 귀하가 보험료를 지불하더라도 사실상 거래 수락을 보장합니다. 2.5~5+분 @@ -763,4 +762,5 @@ 언어 Bitrefill 기프트 카드 구매\n• 선불 전화 충전\n• Steam, Amazon, Hotels.com\n• 170개국에서 작동 + 기부: Litewallet 인프라 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ad6317f80..00a1cd8a6 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1,15 +1,13 @@ - Loaf - + Blog Feito pela equipe Litewallet da Fundação Litecoin\n%1$s Política de Privacidade - Reddit Termos de Uso @@ -25,9 +23,11 @@ Minha Loaf - = + "\tDoe para a Fundação Litecoin " + Agradecemos sua doação para a Litecoin Foundation. As doações são definitivas e não podem ser reembolsadas. Obrigado pelo seu apoio contínuo. + Doar + Cancelar - GERIR Ao que parece, está a utilizar um teclado de terceiros, o qual pode gravar aquilo que digita e furtar a sua Paper Key. Por favor, mude para o teclado predefinido do Android, a fim de ficar mais protegido. @@ -185,7 +185,6 @@ AVISO - Apagar Os serviços de localização estão desativados. @@ -195,7 +194,7 @@ O nome da sua carteira só aparece no histórico de transações da sua conta e não pode ser visto por mais ninguém. - Nome da Carteira + Nome da Carteira Gerir Carteira @@ -718,8 +717,7 @@ Valor para Doar: Endereço: Doar - "Doe para o " - Luxo + Luxo Essa opção praticamente garante a aceitação de sua transação, embora você esteja pagando um prêmio. 2.5 - 5+ minutos HISTORY @@ -762,4 +760,5 @@ Línguas Bitrefill Compre vales-presente\n• Recarregue telefones pré-pagos\n• Steam, Amazon, Hotels.com\n• Funciona em 170 países + Doe para: Litewallet Infrastructure diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5992405ae..e38c2f388 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,15 +1,14 @@ - Loaf - + Блог Сделано командой Litewallet Фонда Litecoin\n%1$s Политика конфиденциальности - - Reddit + + Instagram Условия использования @@ -25,9 +24,11 @@ Мой Loaf - = + "\tПожертвовать в фонд Litecoin " + Мы ценим ваше пожертвование в фонд Litecoin. Пожертвования являются окончательными и возврату не подлежат. Спасибо за вашу постоянную поддержку. + Пожертвовать + Отмена - УПРАВЛЕНИЕ Похоже, что вы пользуетесь клавиатурой третьей стороны, которая может записывать последовательность нажимаемых клавиш и похитить ваш Бумажный ключ. Переключитесь на клавиатуру Android по умолчанию для дополнительной защиты. @@ -185,7 +186,6 @@ ПРЕДУПРЕЖДЕНИЕ - Очистить Сервисы определения местоположения отключены. @@ -195,7 +195,7 @@ Название вашего кошелька отображается только в журнале транзакций вашей учетной записи, и ни один другой пользователь не может его видеть. - Название кошелька + Название кошелька Управление кошельком @@ -718,7 +718,6 @@ Сумма пожертвования: Адрес: жертвовать - "Пожертвовать " люкс Эта опция фактически гарантирует принятие вашей транзакции, хотя вы платите премию. 2.5 - 5+ минут @@ -762,4 +761,5 @@ Языки Bitrefill Покупайте подарочные карты\n• Пополняйте предоплаченные телефоны\n• Steam, Amazon, Hotels.com\n• Работает в 170 странах + Пожертвовать: Инфраструктура Litewallet diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d5a09f98f..763cf37dd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,8 +1,7 @@ - Loaf - + İnternet sitesi Litecoin Vakfı\'nın Litewallet Ekibi tarafından yapılmıştır\n%1$s @@ -11,7 +10,7 @@ Gizlilik Politikası - Reddit + Reddit Kullanım Şartları @@ -209,7 +208,7 @@ Cüzdan adınız yalnızca hesap işlem geçmişinizde görünür ve başkası tarafından görülemez. - Cüzdan Adı + Cüzdan Adı Cüzdanı Yönet @@ -736,8 +735,7 @@ Bağışlanacak Miktar: Adres: Bağış yap - "Bağış yapın " - Lüks + Lüks 2,5 - 5+ dakika Bu seçenek, bir prim ödüyor olsanız bile işleminizin kabul edilmesini neredeyse garanti eder. @@ -796,9 +794,15 @@ "Tam erişim için litecoin.getblockcard.com adresini ziyaret edin" "Litecoin Kartı Beta" - Diller + %1$s cinsinden geçerli LTC değeri + Diller Bitrefill Hediye kartları satın alın\n• Ön ödemeli telefonları yeniden doldurun\n• Steam, Amazon, Hotels.com\n• 170 ülkede çalışıyor + "\tLitecoin Vakfı'na bağış yapın " + Litecoin Vakfı\'na yaptığınız bağış için teşekkür ederiz. Bağışlar kesindir ve iade edilemez. Devam eden desteğiniz için teşekkürler. \tBağış yapmak + Bağış yapmak + İptal + Bağışta bulunun: Litewallet Altyapısı diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7d9d7fbc0..ce0de6c06 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,8 +1,7 @@ - Litewallet - + веб-сайт Створено командою Litewallet Litecoin Foundation\n%1$s @@ -11,7 +10,6 @@ Політика конфіденційності - Reddit Умови використання @@ -192,7 +190,7 @@ Ім’я вашого гаманця з’являється лише в історії транзакцій вашого облікового запису і нікому не доступне. - Назва гаманця + Назва гаманця Керування гаманцем @@ -706,7 +704,6 @@ Сума пожертвування: Адреса: Пожертвуйте - «Пожертвувати на» Розкіш 2.5 - 5+ хвилин Ця опція практично гарантує прийняття вашої транзакції, хоча ви платите премію. @@ -786,4 +783,9 @@ Копіювати адреси гаманця Bitrefill Купуйте подарункові картки\n• Поповнюйте передплачені телефони\n• Steam, Amazon, Hotels.com\n• Працює в 170 країнах + "\tЗробіть пожертву Litecoin Foundation " + "\tМи цінуємо вашу пожертву Litecoin Foundation. Пожертви є остаточними і не підлягають поверненню. Дякуємо за вашу постійну підтримку. " + Пожертвуйте + Скасувати + Пожертвуйте: Litewallet Infrastructure diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 979169515..d411ae488 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,15 +1,14 @@ - Loaf - + 博客 由萊特幣基金會的萊特錢包團隊製作\n%1$s 隐私政策 - Reddit + Reddit 使用条款 @@ -25,9 +24,11 @@ 我的 Loaf - = - - 管理 + 捐赠给莱特币基金会 + "\t感谢您对莱特币基金会的捐赠。 捐款是最终的,不能退还。 感谢您一直以来的支持。 " + + 取消 + 看起来您正在使用第三方键盘,它可以记录您键入的内容并窃取您的密钥(Paper Key)。请切换到默认的安卓键盘以便获得额外保护。 @@ -185,7 +186,6 @@ 警告 - 擦除 位置服务被禁用。 @@ -195,7 +195,7 @@ 您的钱包名称仅出现在您的帐户交易记录中,其他任何人无法看到。 - 钱包名称 + 钱包名称 管理钱包 @@ -718,7 +718,6 @@ 捐款金额: 地址: - "捐赠给 " 豪华 尽管您要支付一定的费用,但此选项实际上可以保证您接受交易。 2.5 - 5+ 分钟 @@ -762,4 +761,5 @@ 语言能力 Bitrefill 购买礼品卡\n• 为预付费手机充值\n• Steam、亚马逊、Hotels.com\n• 适用于 170 个国家/地区 + 捐赠给:Litewallet 基础设施 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 10eb0ccb7..ee6b530a3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,15 +1,13 @@ - Loaf - + 部落格 由莱特币基金会的莱特钱包团队制作\n%1$s 隱私政策 - Reddit 使用規定 @@ -25,9 +23,11 @@ 我的 Loaf - = + 捐贈給萊特幣基金會 + "\t感謝您對萊特幣基金會的捐贈。 捐款是最終的,不能退還。 感謝您一直以來的支持。 " + + 取消 - 管理 您似乎在使用第三方鍵盤,這可能會記錄您按下的鍵並竊取您的「紙鑰」。請切換至預設的 Android 鍵盤以獲得額外的保護。 @@ -105,7 +105,6 @@ 字組 #%1$s - 比特幣顯示單位 匯率 @@ -185,7 +184,6 @@ 警告 - 抹除 定位服務已停用。 @@ -195,7 +193,7 @@ 您的錢包名稱只會出現在您的帳戶交易記錄中,任何其他人都看不到。 - 電子錢包名稱 + 電子錢包名稱 管理電子錢包 @@ -718,7 +716,6 @@ 捐款金額: 地址: - "捐贈給 " 豪華 儘管您要支付一定的費用,但此選項實際上可以保證您接受交易。 2.5 - 5+ 分鐘 @@ -762,4 +759,5 @@ 語言能力 Bitrefill 購買禮品卡\n• 為預付費手機充值\n• Steam、亞馬遜、Hotels.com\n• 適用於 170 個國家/地區 + 捐贈給:Litewallet 基礎設施 diff --git a/app/src/main/res/values/android_strings.xml b/app/src/main/res/values/android_strings.xml index 56c454a83..f2e2f117c 100644 --- a/app/src/main/res/values/android_strings.xml +++ b/app/src/main/res/values/android_strings.xml @@ -2,7 +2,6 @@ en - LoafWallet Authentication required diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a911ff526..d64b8ddb5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,6 @@ - Loaf Website @@ -11,7 +10,7 @@ Privacy Policy - Reddit + Instagram Terms of Use @@ -192,7 +191,7 @@ Your wallet name only appears in your account transaction history and cannot be seen by anyone else. - Wallet Name + Wallet Name Manage Wallet @@ -719,16 +718,15 @@ Amount to Donate: Address: Donate - "Donate to the " Luxury 2.5 - 5+ minutes This option virtually guarantees acceptance of your transaction though you are paying a premium. - Simplex + Simplex "• Get Litecoin in 5 mins!\n• Buy Litecoin via credit card\n• Passport or State ID" - Moonpay + Moonpay "• Buy LTC with many fiat pairs\n• Pay with multiple methods\n• Global payment provider" Bitrefill @@ -802,4 +800,11 @@ Current LTC value in %1$s Languages Close + + + Donate to the Litecoin Foundation + We appreciate your donation to the Litecoin Foundation. Donations are final and can not be refunded. Thanks for your continuing support. + Donate + Cancel + Donate to: Litewallet Infrastructure diff --git a/build.gradle b/build.gradle index bce7b128c..1b540b693 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,14 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.6.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:7.4.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 823fcc0e4..58bc4048e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip