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

Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0

Browse source
This commit is contained in:
M 2020-12-18 21:30:55 +02:00
commit 782de5d1d8
15 changed files with 131 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/generated/i18n.dart
View file

@ -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";
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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

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))
), ])
) ],
]), )
)
],
),
)); ));
} }
} }

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" : "连接的",