Merge branch 'main' of github.com:cake-tech/cake_wallet into ionia

cake-tech · mkyq · Jul 28, 2022 · May 30, 2022 · Jun 15, 2022 · Jun 16, 2022
commit 69577e192a24b3ba976ced4d5f29ed3e23d7ebed
diff --git a/assets/images/mini_search_icon.png b/assets/images/mini_search_icon.png
diff --git a/assets/images/search_icon.png b/assets/images/search_icon.png
diff --git a/lib/di.dart b/lib/di.dart
@@ -148,6 +148,8 @@ import 'package:cake_wallet/src/screens/ionia/cards/ionia_payment_status_page.da
 import 'package:cake_wallet/view_model/ionia/ionia_payment_status_view_model.dart';
 import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
 import 'package:cake_wallet/ionia/ionia_any_pay_payment_info.dart';
+import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
+import 'package:cake_wallet/core/wallet_loading_service.dart';
 
 final getIt = GetIt.instance;
 
@@ -661,6 +663,11 @@ Future setup(
 
   getIt.registerFactory(() => YatService());
 
+  getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>(),
+    walletType: getIt.get<AppStore>().wallet.type));
+
+  getIt.registerFactoryParam<FullscreenQRPage, String, bool>(
+          (String qrData, bool isLight) => FullscreenQRPage(qrData: qrData, isLight: isLight,));
   getIt.registerFactory(() => AddressResolver(yatService: getIt.get<YatService>()));
 
   getIt.registerFactory(() => IoniaApi());

diff --git a/lib/router.dart b/lib/router.dart
@@ -66,6 +66,7 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'
 import 'package:flutter/services.dart';
 import 'package:cake_wallet/wallet_types.g.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/address_page.dart';
+import 'package:cake_wallet/src/screens/receive/fullscreen_qr_page.dart';
 import 'package:cake_wallet/src/screens/ionia/ionia.dart';
 import 'package:cake_wallet/src/screens/ionia/cards/ionia_payment_status_page.dart';
 import 'package:cake_wallet/anypay/any_pay_payment_committed_info.dart';
@@ -398,6 +399,16 @@ Route<dynamic> createRoute(RouteSettings settings) {
               getIt.get<UnspentCoinsDetailsPage>(
                   param1: args));
 
+    case Routes.fullscreenQR:
+      final args = settings.arguments as Map<String, dynamic>;
+
+      return MaterialPageRoute<void>(
+          builder: (_) =>
+              getIt.get<FullscreenQRPage>(
+                param1: args['qrData'] as String,
+                param2: args['isLight'] as bool,
+              ));
+
     case Routes.ioniaWelcomePage:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<IoniaWelcomePage>());  
 

diff --git a/lib/routes.dart b/lib/routes.dart
@@ -59,6 +59,7 @@ class Routes {
   static const moneroRestoreWalletFromWelcome = '/monero_restore_wallet';
   static const moneroNewWalletFromWelcome = '/monero_new_wallet';
   static const addressPage = '/address_page';
+  static const fullscreenQR = '/fullscreen_qr';
   static const ioniaWelcomePage = '/cake_pay_welcome_page';
   static const ioniaCreateAccountPage = '/cake_pay_create_account_page';
   static const ioniaLoginPage = '/cake_pay_login_page';

diff --git a/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart b/lib/src/screens/ionia/cards/ionia_manage_cards_page.dart
@@ -258,7 +258,7 @@ class _SearchWidget extends StatelessWidget {
     final searchIcon = Padding(
       padding: EdgeInsets.all(8),
       child: Image.asset(
-        'assets/images/search_icon.png',
+        'assets/images/mini_search_icon.png',
         color: Theme.of(context).textTheme.caption.decorationColor,
       ),
     );

diff --git a/lib/src/screens/ionia/widgets/ionia_filter_modal.dart b/lib/src/screens/ionia/widgets/ionia_filter_modal.dart
@@ -23,7 +23,7 @@ class IoniaFilterModal extends StatelessWidget {
     final searchIcon = Padding(
       padding: EdgeInsets.all(10),
       child: Image.asset(
-        'assets/images/search_icon.png',
+        'assets/images/mini_search_icon.png',
         color: Theme.of(context).accentColor,
       ),
     );

diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
@@ -534,6 +534,7 @@
   "search_currency": "Währung suchen",
   "new_template" : "neue Vorlage",
   "electrum_address_disclaimer": "Wir generieren jedes Mal neue Adressen, wenn Sie eine verwenden, aber vorherige Adressen funktionieren weiterhin",
+  "wallet_name_exists": "Wallet mit diesem Namen existiert bereits",
   "market_place": "Marktplatz",
   "cake_pay_title": "Cake Pay-Geschenkkarten",
   "cake_pay_subtitle": "Geschenkkarten kaufen und sofort einlösen",

diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
@@ -534,6 +534,7 @@
   "search_currency": "Search currency",
   "new_template" : "New Template",
   "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work",
+  "wallet_name_exists": "Wallet with that name has already existed",
   "market_place": "Marketplace",
   "cake_pay_title": "Cake Pay Gift Cards",
   "cake_pay_subtitle": "Buy gift cards and redeem instantly",

diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
@@ -534,6 +534,7 @@
   "search_currency": "Moneda de búsqueda",
   "new_template" : "Nueva plantilla",
   "electrum_address_disclaimer": "Generamos nuevas direcciones cada vez que usa una, pero las direcciones anteriores siguen funcionando",
+  "wallet_name_exists": "Wallet con ese nombre ya ha existido",
   "market_place": "Mercado",
   "cake_pay_title": "Tarjetas de regalo Cake Pay",
   "cake_pay_subtitle": "Compra tarjetas de regalo y canjéalas al instante",

diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
@@ -532,6 +532,7 @@
   "search_currency": "Devise de recherche",
   "new_template" : "Nouveau Modèle",
   "electrum_address_disclaimer": "Nous générons de nouvelles adresses à chaque fois que vous en utilisez une, mais les adresses précédentes continuent à fonctionner",
+  "wallet_name_exists": "Le portefeuille portant ce nom existe déjà",
   "market_place": "Place de marché",
   "cake_pay_title": "Cartes cadeaux Cake Pay",
   "cake_pay_subtitle": "Achetez des cartes-cadeaux et échangez-les instantanément",

diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
@@ -534,6 +534,7 @@
   "search_currency": "मुद्रा खोजें",
   "new_template" : "नया टेम्पलेट",
   "electrum_address_disclaimer": "हर बार जब आप एक का उपयोग करते हैं तो हम नए पते उत्पन्न करते हैं, लेकिन पिछले पते काम करना जारी रखते हैं",
+  "wallet_name_exists": "उस नाम वाला वॉलेट पहले से मौजूद है",
   "market_place": "मार्केटप्लेस",
   "cake_pay_title": "केक पे गिफ्ट कार्ड्स",
   "cake_pay_subtitle": "उपहार कार्ड खरीदें और तुरंत रिडीम करें",

diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
@@ -534,6 +534,7 @@
   "search_currency": "Traži valutu",
   "new_template" : "novi predložak",
   "electrum_address_disclaimer": "Minden egyes alkalommal új címeket generálunk, de a korábbi címek továbbra is működnek",
+  "wallet_name_exists": "Novčanik s tim nazivom već postoji",
   "market_place": "Tržnica",
   "cake_pay_title": "Cake Pay poklon kartice",
   "cake_pay_subtitle": "Kupite darovne kartice i odmah ih iskoristite",

diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
@@ -534,6 +534,7 @@
   "search_currency": "Cerca valuta",
   "new_template" : "Nuovo modello",
   "electrum_address_disclaimer": "Generiamo nuovi indirizzi ogni volta che ne utilizzi uno, ma gli indirizzi precedenti continuano a funzionare",
+  "wallet_name_exists": "Il portafoglio con quel nome è già esistito",
   "market_place": "Mercato",
   "cake_pay_title": "Carte regalo Cake Pay",
   "cake_pay_subtitle": "Acquista carte regalo e riscattale all'istante",

diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
@@ -534,6 +534,7 @@
   "search_currency": "検索通貨",
   "new_template" : "新しいテンプレート",
   "electrum_address_disclaimer": "使用するたびに新しいアドレスが生成されますが、以前のアドレスは引き続き機能します",
+  "wallet_name_exists": "その名前のウォレットはすでに存在しています",
   "market_place": "Marketplace",
   "cake_pay_title": "ケーキペイギフトカード",
   "cake_pay_subtitle": "ギフトカードを購入してすぐに利用できます",

diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
@@ -534,6 +534,7 @@
   "search_currency": "통화 검색",
   "new_template" : "새 템플릿",
   "electrum_address_disclaimer": "사용할 때마다 새 주소가 생성되지만 이전 주소는 계속 작동합니다.",
+  "wallet_name_exists": "해당 이름의 지갑이 이미 존재합니다.",
   "market_place": "마켓플레이스",
   "cake_pay_title": "케이크 페이 기프트 카드",
   "cake_pay_subtitle": "기프트 카드를 구매하고 즉시 사용",

diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
@@ -534,6 +534,7 @@
   "search_currency": "Zoek valuta",
   "new_template" : "Nieuwe sjabloon",
   "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work",
+  "wallet_name_exists": "Portemonnee met die naam bestaat al",
   "market_place": "Marktplaats",
   "cake_pay_title": "Cake Pay-cadeaubonnen",
   "cake_pay_subtitle": "Koop cadeaubonnen en wissel ze direct in",

diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
@@ -534,6 +534,7 @@
   "search_currency": "Wyszukaj walutę",
   "new_template" : "Nowy szablon",
   "electrum_address_disclaimer": "Za każdym razem, gdy korzystasz z jednego z nich, generujemy nowe adresy, ale poprzednie adresy nadal działają",
+  "wallet_name_exists": "Portfel o tej nazwie już istnieje",
   "market_place": "Rynek",
   "cake_pay_title": "Karty podarunkowe Cake Pay",
   "cake_pay_subtitle": "Kup karty podarunkowe i wykorzystaj je natychmiast",

diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
@@ -534,6 +534,7 @@
   "search_currency": "Pesquisar moeda",
   "new_template" : "Novo modelo",
   "electrum_address_disclaimer": "Geramos novos endereços cada vez que você usa um, mas os endereços anteriores continuam funcionando",
+  "wallet_name_exists": "A carteira com esse nome já existe",
   "market_place": "Mercado",
   "cake_pay_title": "Cartões de presente de pagamento de bolo",
   "cake_pay_subtitle": "Compre vales-presente e resgate instantaneamente",

diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
@@ -534,6 +534,7 @@
   "search_currency": "Валюта поиска",
   "new_template" : "Новый шаблон",
   "electrum_address_disclaimer": "Мы генерируем новые адреса каждый раз, когда вы их используете, но предыдущие адреса продолжают работать.",
+  "wallet_name_exists": "Кошелек с таким именем уже существует",
   "market_place": "Торговая площадка",
   "cake_pay_title": "Подарочные карты Cake Pay",
   "cake_pay_subtitle": "Купите подарочные карты и моментально погасите их",

diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
@@ -533,6 +533,7 @@
   "search_currency": "Шукати валюту",
   "new_template" : "Новий шаблон",
   "electrum_address_disclaimer": "Ми створюємо нові адреси щоразу, коли ви використовуєте їх, але попередні адреси продовжують працювати",
+  "wallet_name_exists": "Гаманець з такою назвою вже існує",
   "market_place": "Ринок",
   "cake_pay_title": "Подарункові картки Cake Pay",
   "cake_pay_subtitle": "Купуйте подарункові картки та використовуйте їх миттєво",

diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
@@ -532,6 +532,7 @@
   "search_currency": "搜索货币",
   "new_template" : "新模板",
   "electrum_address_disclaimer": "每次您使用一个地址时，我们都会生成新地址，但之前的地址仍然有效",
+  "wallet_name_exists": "同名的钱包已经存在",
   "market_place": "市场",
   "cake_pay_title": "Cake Pay 礼品卡",
   "cake_pay_subtitle": "购买礼品卡并立即兑换",