Ecosystem/cake_wallet
1
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2024-09-29 09:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '4.1.0' into CAKE-216-exchange-status-bug

Browse source 
# Conflicts:
#	lib/di.dart
This commit is contained in:
OleksandrSobol 2020-12-24 22:14:24 +02:00
commit 9ca4bee602
23 changed files with 187 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/bitcoin/bitcoin_balance.dart
View file

@ -27,7 +27,8 @@ class BitcoinBalance extends Balance {
final int confirmed; final int confirmed;
final int unconfirmed; final int unconfirmed;
int get total => confirmed + unconfirmed; int get total =>
confirmed + (unconfirmed < 0 ? unconfirmed * -1 : unconfirmed);
int get availableBalance => confirmed + (unconfirmed < 0 ? unconfirmed : 0); int get availableBalance => confirmed + (unconfirmed < 0 ? unconfirmed : 0);

5
lib/bitcoin/bitcoin_wallet.dart
View file

@ -319,7 +319,10 @@ abstract class BitcoinWalletBase extends WalletBase<BitcoinBalance> with Store {
return PendingBitcoinTransaction(txb.build(), return PendingBitcoinTransaction(txb.build(),
eclient: eclient, amount: amount, fee: fee) eclient: eclient, amount: amount, fee: fee)
..addListener((transaction) => transactionHistory.addOne(transaction)); ..addListener((transaction) async {
transactionHistory.addOne(transaction);
await _updateBalance();
});
} }
String toJSON() => json.encode({ String toJSON() => json.encode({

3
lib/di.dart
View file

@ -428,7 +428,8 @@ Future setup(
(para1, param2) => NewWalletTypePage(getIt.get<WalletNewVM>(), (para1, param2) => NewWalletTypePage(getIt.get<WalletNewVM>(),
onTypeSelected: para1, isNewWallet: param2)); onTypeSelected: para1, isNewWallet: param2));
getIt.registerFactory(() => PreSeedPage()); getIt.registerFactoryParam<PreSeedPage, WalletType, void>(
(WalletType type, _) => PreSeedPage(type));
getIt.registerFactoryParam<TradeDetailsViewModel, Trade, void>((trade, _) => getIt.registerFactoryParam<TradeDetailsViewModel, Trade, void>((trade, _) =>
TradeDetailsViewModel(tradeForDetails: trade, trades: tradesSource)); TradeDetailsViewModel(tradeForDetails: trade, trades: tradesSource));

1
lib/entities/preferences_key.dart
View file

@ -10,6 +10,7 @@ class PreferencesKey {
static const allowBiometricalAuthenticationKey = static const allowBiometricalAuthenticationKey =
'allow_biometrical_authentication'; 'allow_biometrical_authentication';
static const currentTheme = 'current_theme'; static const currentTheme = 'current_theme';
static const isDarkThemeLegacy = 'dark_theme';
static const displayActionListModeKey = 'display_list_mode'; static const displayActionListModeKey = 'display_list_mode';
static const currentPinLength = 'current_pin_length'; static const currentPinLength = 'current_pin_length';
static const currentLanguageCode = 'language_code'; static const currentLanguageCode = 'language_code';

48
lib/generated/i18n.dart
View file

@ -143,7 +143,7 @@ class S implements WidgetsLocalizations {
String get please_select => "Please select:"; String get please_select => "Please select:";
String get please_try_to_connect_to_another_node => "Please try to connect to another node"; String get please_try_to_connect_to_another_node => "Please try to connect to another node";
String get pre_seed_button_text => "I understand. Show me my seed"; String get pre_seed_button_text => "I understand. Show me my seed";
String get pre_seed_description => "On the next page you will see a series of 25 words. This is your unique and private seed and it is the ONLY way to recover your wallet in case of loss or malfunction. It is YOUR responsibility to write it down and store it in a safe place outside of the Cake Wallet app."; String pre_seed_description(int words) => "On the next page you will see a series of ${words} words. This is your unique and private seed and it is the ONLY way to recover your wallet in case of loss or malfunction. It is YOUR responsibility to write it down and store it in a safe place outside of the Cake Wallet app.";
String get pre_seed_title => "IMPORTANT"; String get pre_seed_title => "IMPORTANT";
String get private_key => "Private key"; String get private_key => "Private key";
String get public_key => "Public key"; String get public_key => "Public key";
@ -259,7 +259,7 @@ class S implements WidgetsLocalizations {
String get subaddresses => "Subaddresses"; String get subaddresses => "Subaddresses";
String get sync_status_connected => "CONNECTED"; String get sync_status_connected => "CONNECTED";
String get sync_status_connecting => "CONNECTING"; String get sync_status_connecting => "CONNECTING";
String get sync_status_failed_connect => "FAILED CONNECT TO THE NODE"; String get sync_status_failed_connect => "DISCONNECTED";
String get sync_status_not_connected => "NOT CONNECTED"; String get sync_status_not_connected => "NOT CONNECTED";
String get sync_status_starting_sync => "STARTING SYNC"; String get sync_status_starting_sync => "STARTING SYNC";
String get sync_status_syncronized => "SYNCHRONIZED"; String get sync_status_syncronized => "SYNCHRONIZED";
@ -514,7 +514,7 @@ class $de extends S {
@override @override
String get choose_wallet_currency => "Bitte wählen Sie die Brieftaschenwährung:"; String get choose_wallet_currency => "Bitte wählen Sie die Brieftaschenwährung:";
@override @override
String get pre_seed_description => "Auf der nächsten Seite sehen Sie eine Reihe von 25 Wörtern. Dies ist Ihr einzigartiger und privater Samen und der EINZIGE Weg, um Ihren Geldbeutel im Falle eines Verlusts oder einer Fehlfunktion wiederherzustellen. Es liegt in IHRER Verantwortung, es aufzuschreiben und an einem sicheren Ort außerhalb der Cake Wallet App aufzubewahren."; String pre_seed_description(int words) => "Auf der nächsten Seite sehen Sie eine Reihe von ${words} Wörtern. Dies ist Ihr einzigartiger und privater Samen und der EINZIGE Weg, um Ihren Geldbeutel im Falle eines Verlusts oder einer Fehlfunktion wiederherzustellen. Es liegt in IHRER Verantwortung, es aufzuschreiben und an einem sicheren Ort außerhalb der Cake Wallet App aufzubewahren.";
@override @override
String get node_connection_successful => "Die Verbindung war erfolgreich"; String get node_connection_successful => "Die Verbindung war erfolgreich";
@override @override
@ -600,7 +600,7 @@ class $de extends S {
@override @override
String get exchange => "Austausch"; String get exchange => "Austausch";
@override @override
String get sync_status_failed_connect => "Verbindung zum Knoten fehlgeschlagen"; String get sync_status_failed_connect => "GETRENNT";
@override @override
String get send_estimated_fee => "Geschätzte Gebühr:"; String get send_estimated_fee => "Geschätzte Gebühr:";
@override @override
@ -1214,7 +1214,7 @@ class $hi extends S {
@override @override
String get choose_wallet_currency => "कृपया बटुआ मुद्रा चुनें:"; String get choose_wallet_currency => "कृपया बटुआ मुद्रा चुनें:";
@override @override
String get pre_seed_description => "अगले पेज पर आपको 25 शब्दों की एक श्रृंखला दिखाई देगी। यह आपका अद्वितीय और निजी बीज है और नुकसान या खराबी के मामले में अपने बटुए को पुनर्प्राप्त करने का एकमात्र तरीका है। यह आपकी जिम्मेदारी है कि इसे नीचे लिखें और इसे Cake Wallet ऐप के बाहर सुरक्षित स्थान पर संग्रहीत करें।"; String pre_seed_description(int words) => "अगले पेज पर आपको ${words} शब्दों की एक श्रृंखला दिखाई देगी। यह आपका अद्वितीय और निजी बीज है और नुकसान या खराबी के मामले में अपने बटुए को पुनर्प्राप्त करने का एकमात्र तरीका है। यह आपकी जिम्मेदारी है कि इसे नीचे लिखें और इसे Cake Wallet ऐप के बाहर सुरक्षित स्थान पर संग्रहीत करें।";
@override @override
String get node_connection_successful => "कनेक्शन सफल रहा"; String get node_connection_successful => "कनेक्शन सफल रहा";
@override @override
@ -1300,7 +1300,7 @@ class $hi extends S {
@override @override
String get exchange => "अदला बदली"; String get exchange => "अदला बदली";
@override @override
String get sync_status_failed_connect => "फेल हुआ कनेक्ट नोड"; String get sync_status_failed_connect => "डिस्कनेक्ट किया गया";
@override @override
String get send_estimated_fee => "अनुमानित शुल्क:"; String get send_estimated_fee => "अनुमानित शुल्क:";
@override @override
@ -1914,7 +1914,7 @@ class $ru extends S {
@override @override
String get choose_wallet_currency => "Пожалуйста, выберите валюту кошелька:"; String get choose_wallet_currency => "Пожалуйста, выберите валюту кошелька:";
@override @override
String get pre_seed_description => "На следующей странице вы увидите серию из 25 слов. Это ваша уникальная и личная мнемоническая фраза, и это ЕДИНСТВЕННЫЙ способ восстановить свой кошелек в случае потери или неисправности. ВАМ необходимо записать ее и хранить в надежном месте вне приложения Cake Wallet."; String pre_seed_description(int words) => "На следующей странице вы увидите серию из ${words} слов. Это ваша уникальная и личная мнемоническая фраза, и это ЕДИНСТВЕННЫЙ способ восстановить свой кошелек в случае потери или неисправности. ВАМ необходимо записать ее и хранить в надежном месте вне приложения Cake Wallet.";
@override @override
String get node_connection_successful => "Подключение прошло успешно"; String get node_connection_successful => "Подключение прошло успешно";
@override @override
@ -2000,7 +2000,7 @@ class $ru extends S {
@override @override
String get exchange => "Обмен"; String get exchange => "Обмен";
@override @override
String get sync_status_failed_connect => "ОШИБКА ПОДКЛЮЧЕНИЯ К НОДЕ"; String get sync_status_failed_connect => "ОТКЛЮЧЕНО";
@override @override
String get send_estimated_fee => "Предполагаемая комиссия:"; String get send_estimated_fee => "Предполагаемая комиссия:";
@override @override
@ -2614,7 +2614,7 @@ class $ko extends S {
@override @override
String get choose_wallet_currency => "지갑 통화를 선택하십시오:"; String get choose_wallet_currency => "지갑 통화를 선택하십시오:";
@override @override
String get pre_seed_description => "다음 페이지에서 25 개의 단어를 볼 수 있습니다. 이것은 귀하의 고유하고 개인적인 시드이며 분실 또는 오작동시 지갑을 복구하는 유일한 방법입니다. 기록해두고 Cake Wallet 앱 외부의 안전한 장소에 보관하는 것은 귀하의 책임입니다."; String pre_seed_description(int words) => "다음 페이지에서 ${words} 개의 단어를 볼 수 있습니다. 이것은 귀하의 고유하고 개인적인 시드이며 분실 또는 오작동시 지갑을 복구하는 유일한 방법입니다. 기록해두고 Cake Wallet 앱 외부의 안전한 장소에 보관하는 것은 귀하의 책임입니다.";
@override @override
String get node_connection_successful => "성공적으로 연결되었습니다."; String get node_connection_successful => "성공적으로 연결되었습니다.";
@override @override
@ -2700,7 +2700,7 @@ class $ko extends S {
@override @override
String get exchange => "교환"; String get exchange => "교환";
@override @override
String get sync_status_failed_connect => "노드에 연결하지 못했습니다"; String get sync_status_failed_connect => "연결 해제";
@override @override
String get send_estimated_fee => "예상 수수료:"; String get send_estimated_fee => "예상 수수료:";
@override @override
@ -3314,7 +3314,7 @@ class $pt extends S {
@override @override
String get choose_wallet_currency => "Escolha a moeda da carteira:"; String get choose_wallet_currency => "Escolha a moeda da carteira:";
@override @override
String get pre_seed_description => "Na próxima página, você verá uma série de 25 palavras. Esta é a sua semente única e privada e é a ÚNICA maneira de recuperar sua carteira em caso de perda ou mau funcionamento. É SUA responsabilidade anotá-lo e armazená-lo em um local seguro fora do aplicativo Cake Wallet."; String pre_seed_description(int words) => "Na próxima página, você verá uma série de ${words} palavras. Esta é a sua semente única e privada e é a ÚNICA maneira de recuperar sua carteira em caso de perda ou mau funcionamento. É SUA responsabilidade anotá-lo e armazená-lo em um local seguro fora do aplicativo Cake Wallet.";
@override @override
String get node_connection_successful => "A conexão foi bem sucedida"; String get node_connection_successful => "A conexão foi bem sucedida";
@override @override
@ -3400,7 +3400,7 @@ class $pt extends S {
@override @override
String get exchange => "Trocar"; String get exchange => "Trocar";
@override @override
String get sync_status_failed_connect => "Erro ao conectar com o nó"; String get sync_status_failed_connect => "DESCONECTADO";
@override @override
String get send_estimated_fee => "Taxa estimada:"; String get send_estimated_fee => "Taxa estimada:";
@override @override
@ -4014,7 +4014,7 @@ class $uk extends S {
@override @override
String get choose_wallet_currency => "Будь ласка, виберіть валюту гаманця:"; String get choose_wallet_currency => "Будь ласка, виберіть валюту гаманця:";
@override @override
String get pre_seed_description => "На наступній сторінці ви побачите серію з 25 слів. Це ваша унікальна та приватна мнемонічна фраза, і це ЄДИНИЙ спосіб відновити ваш гаманець на випадок втрати або несправності. ВАМ необхідно записати її та зберігати в безпечному місці поза програмою Cake Wallet."; String pre_seed_description(int words) => "На наступній сторінці ви побачите серію з ${words} слів. Це ваша унікальна та приватна мнемонічна фраза, і це ЄДИНИЙ спосіб відновити ваш гаманець на випадок втрати або несправності. ВАМ необхідно записати її та зберігати в безпечному місці поза програмою Cake Wallet.";
@override @override
String get node_connection_successful => "З'єднання було успішним"; String get node_connection_successful => "З'єднання було успішним";
@override @override
@ -4100,7 +4100,7 @@ class $uk extends S {
@override @override
String get exchange => "Обмін"; String get exchange => "Обмін";
@override @override
String get sync_status_failed_connect => "ПОМИЛКА ПІДКЛЮЧЕННЯ ДО ВУЗЛУ"; String get sync_status_failed_connect => "ВІДКЛЮЧЕНО";
@override @override
String get send_estimated_fee => "Ймовірна комісія:"; String get send_estimated_fee => "Ймовірна комісія:";
@override @override
@ -4714,7 +4714,7 @@ class $ja extends S {
@override @override
String get choose_wallet_currency => "ウォレット通貨を選択してください："; String get choose_wallet_currency => "ウォレット通貨を選択してください：";
@override @override
String get pre_seed_description => "次のページでは、一連の25語が表示されます。 これはあなたのユニークでプライベートなシードであり、紛失や誤動作が発生した場合にウォレットを回復する唯一の方法です。 それを書き留めて、Cake Wallet アプリの外の安全な場所に保管するのはあなたの責任です。"; String pre_seed_description(int words) => "次のページでは、一連の${words}語が表示されます。 これはあなたのユニークでプライベートなシードであり、紛失や誤動作が発生した場合にウォレットを回復する唯一の方法です。 それを書き留めて、Cake Wallet アプリの外の安全な場所に保管するのはあなたの責任です。";
@override @override
String get node_connection_successful => "接続に成功しました"; String get node_connection_successful => "接続に成功しました";
@override @override
@ -4800,7 +4800,7 @@ class $ja extends S {
@override @override
String get exchange => "交換する"; String get exchange => "交換する";
@override @override
String get sync_status_failed_connect => "ノードへの接続に失敗しました"; String get sync_status_failed_connect => "切断されました";
@override @override
String get send_estimated_fee => "見積手数料:"; String get send_estimated_fee => "見積手数料:";
@override @override
@ -5418,7 +5418,7 @@ class $pl extends S {
@override @override
String get choose_wallet_currency => "Wybierz walutę portfela:"; String get choose_wallet_currency => "Wybierz walutę portfela:";
@override @override
String get pre_seed_description => "Na następnej stronie zobaczysz serię 25 słów. To jest Twoje unikalne i prywatne ziarno i jest to JEDYNY sposób na odzyskanie portfela w przypadku utraty lub awarii. Twoim obowiązkiem jest zapisanie go i przechowywanie w bezpiecznym miejscu poza aplikacją Cake Wallet."; String pre_seed_description(int words) => "Na następnej stronie zobaczysz serię ${words} słów. To jest Twoje unikalne i prywatne ziarno i jest to JEDYNY sposób na odzyskanie portfela w przypadku utraty lub awarii. Twoim obowiązkiem jest zapisanie go i przechowywanie w bezpiecznym miejscu poza aplikacją Cake Wallet.";
@override @override
String get node_connection_successful => "Połączenie powiodło się"; String get node_connection_successful => "Połączenie powiodło się";
@override @override
@ -5504,7 +5504,7 @@ class $pl extends S {
@override @override
String get exchange => "Wymieniać się"; String get exchange => "Wymieniać się";
@override @override
String get sync_status_failed_connect => "NIE MOŻNA PODŁĄCZYĆ DO WĘZŁA"; String get sync_status_failed_connect => "NIEPOWIĄZANY";
@override @override
String get send_estimated_fee => "Szacowana opłata:"; String get send_estimated_fee => "Szacowana opłata:";
@override @override
@ -6118,7 +6118,7 @@ class $es extends S {
@override @override
String get choose_wallet_currency => "Por favor, elija la moneda de la billetera:"; String get choose_wallet_currency => "Por favor, elija la moneda de la billetera:";
@override @override
String get pre_seed_description => "En la página siguiente verá una serie de 25 palabras. Esta es su semilla única y privada y es la ÚNICA forma de recuperar su billetera en caso de pérdida o mal funcionamiento. Es SU responsabilidad escribirlo y guardarlo en un lugar seguro fuera de la aplicación Cake Wallet."; String pre_seed_description(int words) => "En la página siguiente verá una serie de ${words} palabras. Esta es su semilla única y privada y es la ÚNICA forma de recuperar su billetera en caso de pérdida o mal funcionamiento. Es SU responsabilidad escribirlo y guardarlo en un lugar seguro fuera de la aplicación Cake Wallet.";
@override @override
String get node_connection_successful => "La conexión fue exitosa"; String get node_connection_successful => "La conexión fue exitosa";
@override @override
@ -6204,7 +6204,7 @@ class $es extends S {
@override @override
String get exchange => "Intercambiar"; String get exchange => "Intercambiar";
@override @override
String get sync_status_failed_connect => "CONEXIÓN FALLIDA AL NODO"; String get sync_status_failed_connect => "DESCONECTADO";
@override @override
String get send_estimated_fee => "Tarifa estimada:"; String get send_estimated_fee => "Tarifa estimada:";
@override @override
@ -6818,7 +6818,7 @@ class $nl extends S {
@override @override
String get choose_wallet_currency => "Kies een portemonnee-valuta:"; String get choose_wallet_currency => "Kies een portemonnee-valuta:";
@override @override
String get pre_seed_description => "Op de volgende pagina ziet u een reeks van 25 woorden. Dit is uw unieke en persoonlijke zaadje en het is de ENIGE manier om uw portemonnee te herstellen in geval van verlies of storing. Het is JOUW verantwoordelijkheid om het op te schrijven en op een veilige plaats op te slaan buiten de Cake Wallet app."; String pre_seed_description(int words) => "Op de volgende pagina ziet u een reeks van ${words} woorden. Dit is uw unieke en persoonlijke zaadje en het is de ENIGE manier om uw portemonnee te herstellen in geval van verlies of storing. Het is JOUW verantwoordelijkheid om het op te schrijven en op een veilige plaats op te slaan buiten de Cake Wallet app.";
@override @override
String get node_connection_successful => "Verbinding is gelukt"; String get node_connection_successful => "Verbinding is gelukt";
@override @override
@ -6904,7 +6904,7 @@ class $nl extends S {
@override @override
String get exchange => "Uitwisseling"; String get exchange => "Uitwisseling";
@override @override
String get sync_status_failed_connect => "MISLUKT VERBINDING MET DE NODE"; String get sync_status_failed_connect => "LOSGEKOPPELD";
@override @override
String get send_estimated_fee => "Geschatte vergoeding:"; String get send_estimated_fee => "Geschatte vergoeding:";
@override @override
@ -7518,7 +7518,7 @@ class $zh extends S {
@override @override
String get choose_wallet_currency => "請選擇錢包貨幣："; String get choose_wallet_currency => "請選擇錢包貨幣：";
@override @override
String get pre_seed_description => "在下一頁上，您將看到一系列25個單詞。 這是您獨特的私人種子，是丟失或出現故障時恢復錢包的唯一方法。 您有責任將其寫下並存儲在Cake Wallet應用程序外部的安全地方。"; String pre_seed_description(int words) => "在下一頁上，您將看到一系列${words}個單詞。 這是您獨特的私人種子，是丟失或出現故障時恢復錢包的唯一方法。 您有責任將其寫下並存儲在Cake Wallet應用程序外部的安全地方。";
@override @override
String get node_connection_successful => "連接成功"; String get node_connection_successful => "連接成功";
@override @override
@ -7604,7 +7604,7 @@ class $zh extends S {
@override @override
String get exchange => "交换"; String get exchange => "交换";
@override @override
String get sync_status_failed_connect => "无法连接到节点"; String get sync_status_failed_connect => "斷線";
@override @override
String get send_estimated_fee => "预估费用:"; String get send_estimated_fee => "预估费用:";
@override @override

17
lib/router.dart
View file

@ -71,8 +71,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.newWalletType: case Routes.newWalletType:
return CupertinoPageRoute<void>( return CupertinoPageRoute<void>(
builder: (_) => getIt.get<NewWalletTypePage>( builder: (_) => getIt.get<NewWalletTypePage>(
param1: (BuildContext context, WalletType _) => param1: (BuildContext context, WalletType type) =>
Navigator.of(context).pushNamed(Routes.preSeed, arguments: true), Navigator.of(context)
.pushNamed(Routes.preSeed, arguments: type),
param2: true)); param2: true));
case Routes.newWallet: case Routes.newWallet:
@ -137,7 +138,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
return CupertinoPageRoute<void>( return CupertinoPageRoute<void>(
builder: (_) => getIt.get<SetupPinCodePage>( builder: (_) => getIt.get<SetupPinCodePage>(
param1: (PinCodeState<PinCodeWidget> context, dynamic _) => param1: (PinCodeState<PinCodeWidget> context, dynamic _) =>
Navigator.pushNamed(context.context, Routes.restoreWalletType)), Navigator.pushNamed(
context.context, Routes.restoreWalletType)),
fullscreenDialog: true); fullscreenDialog: true);
case Routes.seed: case Routes.seed:
@ -147,8 +149,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.restoreWallet: case Routes.restoreWallet:
return MaterialPageRoute<void>( return MaterialPageRoute<void>(
builder: (_) => builder: (_) => getIt.get<WalletRestorePage>(
getIt.get<WalletRestorePage>(param1: settings.arguments as WalletType)); param1: settings.arguments as WalletType));
case Routes.restoreWalletFromSeed: case Routes.restoreWalletFromSeed:
final type = settings.arguments as WalletType; final type = settings.arguments as WalletType;
@ -248,7 +250,7 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.accountCreation: case Routes.accountCreation:
return CupertinoPageRoute<String>( return CupertinoPageRoute<String>(
builder: (_) => getIt.get<MoneroAccountEditOrCreatePage>( builder: (_) => getIt.get<MoneroAccountEditOrCreatePage>(
param1: settings.arguments as AccountListItem)); param1: settings.arguments as AccountListItem));
case Routes.addressBook: case Routes.addressBook:
return MaterialPageRoute<void>( return MaterialPageRoute<void>(
@ -312,7 +314,8 @@ Route<dynamic> createRoute(RouteSettings settings) {
case Routes.preSeed: case Routes.preSeed:
return MaterialPageRoute<void>( return MaterialPageRoute<void>(
builder: (_) => getIt.get<PreSeedPage>()); builder: (_) =>
getIt.get<PreSeedPage>(param1: settings.arguments as WalletType));
default: default:
return MaterialPageRoute<void>( return MaterialPageRoute<void>(

5
lib/src/screens/dashboard/widgets/balance_page.dart
View file

@ -59,14 +59,15 @@ class BalancePage extends StatelessWidget {
return AutoSizeText( return AutoSizeText(
dashboardViewModel.balanceViewModel.cryptoBalance, dashboardViewModel.balanceViewModel.cryptoBalance,
style: TextStyle( style: TextStyle(
fontSize: 40, fontSize: 54,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Theme.of(context) color: Theme.of(context)
.accentTextTheme .accentTextTheme
.display3 .display3
.backgroundColor, .backgroundColor,
height: 1), height: 1),
); maxLines: 1,
textAlign: TextAlign.center);
}), }),
SizedBox(height: 10), SizedBox(height: 10),
Observer(builder: (_) { Observer(builder: (_) {

89
lib/src/screens/dashboard/widgets/trade_row.dart
View file

@ -25,56 +25,53 @@ class TradeRow extends StatelessWidget {
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
height: 52, padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
color: Colors.transparent, color: Colors.transparent,
padding: EdgeInsets.only(left: 24, right: 24),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.max,
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.center,
_getPoweredImage(provider), children: [
Expanded( _getPoweredImage(provider),
child: Padding( SizedBox(width: 12),
padding: const EdgeInsets.only(left: 12), Expanded(
child: Container( child: Column(
height: 46, mainAxisSize: MainAxisSize.min,
child: Column( children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: <Widget>[ children: <Widget>[
Row( Text('${from.toString()} → ${to.toString()}',
mainAxisAlignment: MainAxisAlignment.spaceBetween, style: TextStyle(
children: <Widget>[ fontSize: 16,
Text('${from.toString()} → ${to.toString()}', fontWeight: FontWeight.w500,
style: TextStyle( color: Theme.of(context).accentTextTheme.
fontSize: 16, display3.backgroundColor
fontWeight: FontWeight.w500, )),
color: Theme.of(context).accentTextTheme. formattedAmount != null
display3.backgroundColor ? Text(formattedAmount + ' ' + amountCrypto,
)), style: TextStyle(
formattedAmount != null fontSize: 16,
? Text(formattedAmount + ' ' + amountCrypto, fontWeight: FontWeight.w500,
style: TextStyle( color: Theme.of(context).accentTextTheme.
fontSize: 16, display3.backgroundColor
fontWeight: FontWeight.w500, ))
color: Theme.of(context).accentTextTheme. : Container()
display3.backgroundColor ]),
)) SizedBox(height: 5),
: Container() Row(
]), mainAxisAlignment: MainAxisAlignment.spaceBetween,
Row( children: <Widget>[
mainAxisAlignment: MainAxisAlignment.spaceBetween, Text(createdAtFormattedDate,
children: <Widget>[ style: TextStyle(
Text(createdAtFormattedDate, fontSize: 14,
style: TextStyle( color: Theme.of(context).textTheme
fontSize: 14, .overline.backgroundColor))
color: Theme.of(context).textTheme ])
.overline.backgroundColor)) ],
]), )
], )
), ],
), ),
))
]),
)); ));
} }

130
lib/src/screens/dashboard/widgets/transaction_raw.dart
View file

@ -23,75 +23,73 @@ class TransactionRow extends StatelessWidget {
return InkWell( return InkWell(
onTap: onTap, onTap: onTap,
child: Container( child: Container(
height: 62, padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
color: Colors.transparent, color: Colors.transparent,
padding: EdgeInsets.only(left: 24, right: 24),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.max,
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.center,
Container( children: [
height: 36, Container(
width: 36, height: 36,
decoration: BoxDecoration( width: 36,
shape: BoxShape.circle, decoration: BoxDecoration(
color: Theme.of(context).textTheme.overline.decorationColor shape: BoxShape.circle,
), color: Theme.of(context).textTheme.overline.decorationColor
child: Image.asset(
direction == TransactionDirection.incoming
? 'assets/images/down_arrow.png'
: 'assets/images/up_arrow.png'),
), ),
Expanded( child: Image.asset(
child: Container( direction == TransactionDirection.incoming
padding: const EdgeInsets.only(left: 12), ? 'assets/images/down_arrow.png'
height: 56, : 'assets/images/up_arrow.png'),
child: Column( ),
mainAxisAlignment: MainAxisAlignment.spaceBetween, SizedBox(width: 12),
mainAxisSize: MainAxisSize.max, Expanded(
children: <Widget>[ child: Column(
Row( mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: <Widget>[ Row(
Text( mainAxisAlignment: MainAxisAlignment.spaceBetween,
(direction == TransactionDirection.incoming children: <Widget>[
? S.of(context).received Text(
: S.of(context).sent) + (direction == TransactionDirection.incoming
(isPending ? S.of(context).pending : ''), ? S.of(context).received
style: TextStyle( : S.of(context).sent) +
fontSize: 16, (isPending ? S.of(context).pending : ''),
fontWeight: FontWeight.w500, style: TextStyle(
color: Theme.of(context).accentTextTheme. fontSize: 16,
display3.backgroundColor)), fontWeight: FontWeight.w500,
Text(formattedAmount, color: Theme.of(context).accentTextTheme.
style: TextStyle( display3.backgroundColor)),
fontSize: 16, Text(formattedAmount,
fontWeight: FontWeight.w500, style: TextStyle(
color: Theme.of(context).accentTextTheme. fontSize: 16,
display3.backgroundColor)) fontWeight: FontWeight.w500,
]), color: Theme.of(context).accentTextTheme.
Row( display3.backgroundColor))
mainAxisAlignment: MainAxisAlignment.spaceBetween, ]),
children: <Widget>[ SizedBox(height: 5),
Text(formattedDate, Row(
style: TextStyle( mainAxisAlignment: MainAxisAlignment.spaceBetween,
fontSize: 14, children: <Widget>[
color: Theme.of(context) Text(formattedDate,
.textTheme style: TextStyle(
.overline fontSize: 14,
.backgroundColor)), color: Theme.of(context)
Text(formattedFiatAmount, .textTheme
style: TextStyle( .overline
fontSize: 14, .backgroundColor)),
color: Theme.of(context) Text(formattedFiatAmount,
.textTheme style: TextStyle(
.overline fontSize: 14,
.backgroundColor)) color: Theme.of(context)
]), .textTheme
], .overline
), .backgroundColor))
), ])
) ],
]), )
)
],
),
)); ));
} }
} }

16
lib/src/screens/seed/pre_seed_page.dart
View file

@ -1,3 +1,4 @@
import 'package:cake_wallet/entities/wallet_type.dart';
import 'package:cake_wallet/routes.dart'; import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/themes/theme_base.dart'; import 'package:cake_wallet/themes/theme_base.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -7,8 +8,17 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/base_page.dart';
class PreSeedPage extends BasePage { class PreSeedPage extends BasePage {
final imageLight = Image.asset('assets/images/pre_seed_light.png'); PreSeedPage(this.type)
final imageDark = Image.asset('assets/images/pre_seed_dark.png'); : imageLight = Image.asset('assets/images/pre_seed_light.png'),
imageDark = Image.asset('assets/images/pre_seed_dark.png'),
wordsCount = type == WalletType.monero
? 25
: 12; // FIXME: Stupid fast implementation
final Image imageDark;
final Image imageLight;
final WalletType type;
final int wordsCount;
@override @override
Widget leading(BuildContext context) => null; Widget leading(BuildContext context) => null;
@ -39,7 +49,7 @@ class PreSeedPage extends BasePage {
Padding( Padding(
padding: EdgeInsets.only(top: 70, left: 16, right: 16), padding: EdgeInsets.only(top: 70, left: 16, right: 16),
child: Text( child: Text(
S.of(context).pre_seed_description, S.of(context).pre_seed_description(wordsCount),
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,

12
lib/store/settings_store.dart
View file

@ -66,8 +66,8 @@ abstract class SettingsStoreBase with Store {
reaction( reaction(
(_) => currentTheme, (_) => currentTheme,
(ThemeBase theme) => sharedPreferences.setInt( (ThemeBase theme) =>
PreferencesKey.currentTheme, theme.raw)); sharedPreferences.setInt(PreferencesKey.currentTheme, theme.raw));
reaction( reaction(
(_) => allowBiometricalAuthentication, (_) => allowBiometricalAuthentication,
@ -152,8 +152,14 @@ abstract class SettingsStoreBase with Store {
final allowBiometricalAuthentication = sharedPreferences final allowBiometricalAuthentication = sharedPreferences
.getBool(PreferencesKey.allowBiometricalAuthenticationKey) ?? .getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
false; false;
final legacyTheme =
sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy)
? ThemeType.dark.index
: ThemeType.bright.index;
final savedTheme = ThemeList.deserialize( final savedTheme = ThemeList.deserialize(
raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ?? 0); raw: sharedPreferences.getInt(PreferencesKey.currentTheme) ??
legacyTheme ??
0);
final actionListDisplayMode = ObservableList<ActionListDisplayMode>(); final actionListDisplayMode = ObservableList<ActionListDisplayMode>();
actionListDisplayMode.addAll(deserializeActionlistDisplayModes( actionListDisplayMode.addAll(deserializeActionlistDisplayModes(
sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ?? sharedPreferences.getInt(PreferencesKey.displayActionListModeKey) ??

2
res/values/strings_de.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SYNCHRONISIERT", "sync_status_syncronized" : "SYNCHRONISIERT",
"sync_status_not_connected" : "NICHT VERBUNDEN", "sync_status_not_connected" : "NICHT VERBUNDEN",
"sync_status_starting_sync" : "STARTEN DER SYNCHRONISIERUNG", "sync_status_starting_sync" : "STARTEN DER SYNCHRONISIERUNG",
"sync_status_failed_connect" : "Verbindung zum Knoten fehlgeschlagen", "sync_status_failed_connect" : "GETRENNT",
"sync_status_connecting" : "ANSCHLUSS", "sync_status_connecting" : "ANSCHLUSS",
"sync_status_connected" : "IN VERBINDUNG GEBRACHT", "sync_status_connected" : "IN VERBINDUNG GEBRACHT",

2
res/values/strings_en.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SYNCHRONIZED", "sync_status_syncronized" : "SYNCHRONIZED",
"sync_status_not_connected" : "NOT CONNECTED", "sync_status_not_connected" : "NOT CONNECTED",
"sync_status_starting_sync" : "STARTING SYNC", "sync_status_starting_sync" : "STARTING SYNC",
"sync_status_failed_connect" : "FAILED CONNECT TO THE NODE", "sync_status_failed_connect" : "DISCONNECTED",
"sync_status_connecting" : "CONNECTING", "sync_status_connecting" : "CONNECTING",
"sync_status_connected" : "CONNECTED", "sync_status_connected" : "CONNECTED",

2
res/values/strings_es.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SINCRONIZADO", "sync_status_syncronized" : "SINCRONIZADO",
"sync_status_not_connected" : "NO CONECTADO", "sync_status_not_connected" : "NO CONECTADO",
"sync_status_starting_sync" : "EMPEZANDO A SINCRONIZAR", "sync_status_starting_sync" : "EMPEZANDO A SINCRONIZAR",
"sync_status_failed_connect" : "CONEXIÓN FALLIDA AL NODO", "sync_status_failed_connect" : "DESCONECTADO",
"sync_status_connecting" : "CONECTANDO", "sync_status_connecting" : "CONECTANDO",
"sync_status_connected" : "CONECTADO", "sync_status_connected" : "CONECTADO",

2
res/values/strings_hi.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "सिंक्रनाइज़", "sync_status_syncronized" : "सिंक्रनाइज़",
"sync_status_not_connected" : "जुड़े नहीं हैं", "sync_status_not_connected" : "जुड़े नहीं हैं",
"sync_status_starting_sync" : "सिताज़ा करना", "sync_status_starting_sync" : "सिताज़ा करना",
"sync_status_failed_connect" : "फेल हुआ कनेक्ट नोड", "sync_status_failed_connect" : "डिस्कनेक्ट किया गया",
"sync_status_connecting" : "कनेक्ट", "sync_status_connecting" : "कनेक्ट",
"sync_status_connected" : "जुड़े हुए", "sync_status_connected" : "जुड़े हुए",

2
res/values/strings_ja.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "同期された", "sync_status_syncronized" : "同期された",
"sync_status_not_connected" : "接続されていません", "sync_status_not_connected" : "接続されていません",
"sync_status_starting_sync" : "同期の開始", "sync_status_starting_sync" : "同期の開始",
"sync_status_failed_connect" : "ノードへの接続に失敗しました", "sync_status_failed_connect" : "切断されました",
"sync_status_connecting" : "接続中", "sync_status_connecting" : "接続中",
"sync_status_connected" : "接続済み", "sync_status_connected" : "接続済み",

2
res/values/strings_ko.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "동기화", "sync_status_syncronized" : "동기화",
"sync_status_not_connected" : "연결되지 않은", "sync_status_not_connected" : "연결되지 않은",
"sync_status_starting_sync" : "동기화 시작", "sync_status_starting_sync" : "동기화 시작",
"sync_status_failed_connect" : "노드에 연결하지 못했습니다", "sync_status_failed_connect" : "연결 해제",
"sync_status_connecting" : "연결 중", "sync_status_connecting" : "연결 중",
"sync_status_connected" : "연결됨", "sync_status_connected" : "연결됨",

2
res/values/strings_nl.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SYNCHRONIZED", "sync_status_syncronized" : "SYNCHRONIZED",
"sync_status_not_connected" : "NIET VERBONDEN", "sync_status_not_connected" : "NIET VERBONDEN",
"sync_status_starting_sync" : "BEGINNEN MET SYNCHRONISEREN", "sync_status_starting_sync" : "BEGINNEN MET SYNCHRONISEREN",
"sync_status_failed_connect" : "MISLUKT VERBINDING MET DE NODE", "sync_status_failed_connect" : "LOSGEKOPPELD",
"sync_status_connecting" : "AANSLUITING", "sync_status_connecting" : "AANSLUITING",
"sync_status_connected" : "VERBONDEN", "sync_status_connected" : "VERBONDEN",

2
res/values/strings_pl.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SYNCHRONIZOWANY", "sync_status_syncronized" : "SYNCHRONIZOWANY",
"sync_status_not_connected" : "NIE POŁĄCZONY", "sync_status_not_connected" : "NIE POŁĄCZONY",
"sync_status_starting_sync" : "ROZPOCZĘCIE SYNCHRONIZACJI", "sync_status_starting_sync" : "ROZPOCZĘCIE SYNCHRONIZACJI",
"sync_status_failed_connect" : "NIE MOŻNA PODŁĄCZYĆ DO WĘZŁA", "sync_status_failed_connect" : "NIEPOWIĄZANY",
"sync_status_connecting" : "ZŁĄCZONY", "sync_status_connecting" : "ZŁĄCZONY",
"sync_status_connected" : "POŁĄCZONY", "sync_status_connected" : "POŁĄCZONY",

2
res/values/strings_pt.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "SINCRONIZADO", "sync_status_syncronized" : "SINCRONIZADO",
"sync_status_not_connected" : "DESCONECTADO", "sync_status_not_connected" : "DESCONECTADO",
"sync_status_starting_sync" : "INICIANDO SINCRONIZAÇÃO", "sync_status_starting_sync" : "INICIANDO SINCRONIZAÇÃO",
"sync_status_failed_connect" : "Erro ao conectar com o nó", "sync_status_failed_connect" : "DESCONECTADO",
"sync_status_connecting" : "CONECTANDO", "sync_status_connecting" : "CONECTANDO",
"sync_status_connected" : "CONECTADO", "sync_status_connected" : "CONECTADO",

2
res/values/strings_ru.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "СИНХРОНИЗИРОВАН", "sync_status_syncronized" : "СИНХРОНИЗИРОВАН",
"sync_status_not_connected" : "НЕ ПОДКЛЮЧЁН", "sync_status_not_connected" : "НЕ ПОДКЛЮЧЁН",
"sync_status_starting_sync" : "НАЧАЛО СИНХРОНИЗАЦИИ", "sync_status_starting_sync" : "НАЧАЛО СИНХРОНИЗАЦИИ",
"sync_status_failed_connect" : "ОШИБКА ПОДКЛЮЧЕНИЯ К НОДЕ", "sync_status_failed_connect" : "ОТКЛЮЧЕНО",
"sync_status_connecting" : "ПОДКЛЮЧЕНИЕ", "sync_status_connecting" : "ПОДКЛЮЧЕНИЕ",
"sync_status_connected" : "ПОДКЛЮЧЕНО", "sync_status_connected" : "ПОДКЛЮЧЕНО",

2
res/values/strings_uk.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "СИНХРОНІЗОВАНИЙ", "sync_status_syncronized" : "СИНХРОНІЗОВАНИЙ",
"sync_status_not_connected" : "НЕ ПІДКЛЮЧЕННИЙ", "sync_status_not_connected" : "НЕ ПІДКЛЮЧЕННИЙ",
"sync_status_starting_sync" : "ПОЧАТОК СИНХРОНІЗАЦІЇ", "sync_status_starting_sync" : "ПОЧАТОК СИНХРОНІЗАЦІЇ",
"sync_status_failed_connect" : "ПОМИЛКА ПІДКЛЮЧЕННЯ ДО ВУЗЛУ", "sync_status_failed_connect" : "ВІДКЛЮЧЕНО",
"sync_status_connecting" : "ПІДКЛЮЧЕННЯ", "sync_status_connecting" : "ПІДКЛЮЧЕННЯ",
"sync_status_connected" : "ПІДКЛЮЧЕНО", "sync_status_connected" : "ПІДКЛЮЧЕНО",

2
res/values/strings_zh.arb
View file

@ -342,7 +342,7 @@
"sync_status_syncronized" : "已同步", "sync_status_syncronized" : "已同步",
"sync_status_not_connected" : "未连接", "sync_status_not_connected" : "未连接",
"sync_status_starting_sync" : "开始同步", "sync_status_starting_sync" : "开始同步",
"sync_status_failed_connect" : "无法连接到节点", "sync_status_failed_connect" : "斷線",
"sync_status_connecting" : "连接中", "sync_status_connecting" : "连接中",
"sync_status_connected" : "连接的", "sync_status_connected" : "连接的",