mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-21 06:18:42 +02:00
Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0
This commit is contained in:
M
+12
-12
@@ -259,7 +259,7 @@ class S implements WidgetsLocalizations {
|
||||
String get subaddresses => "Subaddresses";
|
||||
String get sync_status_connected => "CONNECTED";
|
||||
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_starting_sync => "STARTING SYNC";
|
||||
String get sync_status_syncronized => "SYNCHRONIZED";
|
||||
@@ -600,7 +600,7 @@ class $de extends S {
|
||||
@override
|
||||
String get exchange => "Austausch";
|
||||
@override
|
||||
String get sync_status_failed_connect => "Verbindung zum Knoten fehlgeschlagen";
|
||||
String get sync_status_failed_connect => "GETRENNT";
|
||||
@override
|
||||
String get send_estimated_fee => "Geschätzte Gebühr:";
|
||||
@override
|
||||
@@ -1300,7 +1300,7 @@ class $hi extends S {
|
||||
@override
|
||||
String get exchange => "अदला बदली";
|
||||
@override
|
||||
String get sync_status_failed_connect => "फेल हुआ कनेक्ट नोड";
|
||||
String get sync_status_failed_connect => "डिस्कनेक्ट किया गया";
|
||||
@override
|
||||
String get send_estimated_fee => "अनुमानित शुल्क:";
|
||||
@override
|
||||
@@ -2000,7 +2000,7 @@ class $ru extends S {
|
||||
@override
|
||||
String get exchange => "Обмен";
|
||||
@override
|
||||
String get sync_status_failed_connect => "ОШИБКА ПОДКЛЮЧЕНИЯ К НОДЕ";
|
||||
String get sync_status_failed_connect => "ОТКЛЮЧЕНО";
|
||||
@override
|
||||
String get send_estimated_fee => "Предполагаемая комиссия:";
|
||||
@override
|
||||
@@ -2700,7 +2700,7 @@ class $ko extends S {
|
||||
@override
|
||||
String get exchange => "교환";
|
||||
@override
|
||||
String get sync_status_failed_connect => "노드에 연결하지 못했습니다";
|
||||
String get sync_status_failed_connect => "연결 해제";
|
||||
@override
|
||||
String get send_estimated_fee => "예상 수수료:";
|
||||
@override
|
||||
@@ -3400,7 +3400,7 @@ class $pt extends S {
|
||||
@override
|
||||
String get exchange => "Trocar";
|
||||
@override
|
||||
String get sync_status_failed_connect => "Erro ao conectar com o nó";
|
||||
String get sync_status_failed_connect => "DESCONECTADO";
|
||||
@override
|
||||
String get send_estimated_fee => "Taxa estimada:";
|
||||
@override
|
||||
@@ -4100,7 +4100,7 @@ class $uk extends S {
|
||||
@override
|
||||
String get exchange => "Обмін";
|
||||
@override
|
||||
String get sync_status_failed_connect => "ПОМИЛКА ПІДКЛЮЧЕННЯ ДО ВУЗЛУ";
|
||||
String get sync_status_failed_connect => "ВІДКЛЮЧЕНО";
|
||||
@override
|
||||
String get send_estimated_fee => "Ймовірна комісія:";
|
||||
@override
|
||||
@@ -4800,7 +4800,7 @@ class $ja extends S {
|
||||
@override
|
||||
String get exchange => "交換する";
|
||||
@override
|
||||
String get sync_status_failed_connect => "ノードへの接続に失敗しました";
|
||||
String get sync_status_failed_connect => "切断されました";
|
||||
@override
|
||||
String get send_estimated_fee => "見積手数料:";
|
||||
@override
|
||||
@@ -5504,7 +5504,7 @@ class $pl extends S {
|
||||
@override
|
||||
String get exchange => "Wymieniać się";
|
||||
@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
|
||||
String get send_estimated_fee => "Szacowana opłata:";
|
||||
@override
|
||||
@@ -6204,7 +6204,7 @@ class $es extends S {
|
||||
@override
|
||||
String get exchange => "Intercambiar";
|
||||
@override
|
||||
String get sync_status_failed_connect => "CONEXIÓN FALLIDA AL NODO";
|
||||
String get sync_status_failed_connect => "DESCONECTADO";
|
||||
@override
|
||||
String get send_estimated_fee => "Tarifa estimada:";
|
||||
@override
|
||||
@@ -6904,7 +6904,7 @@ class $nl extends S {
|
||||
@override
|
||||
String get exchange => "Uitwisseling";
|
||||
@override
|
||||
String get sync_status_failed_connect => "MISLUKT VERBINDING MET DE NODE";
|
||||
String get sync_status_failed_connect => "LOSGEKOPPELD";
|
||||
@override
|
||||
String get send_estimated_fee => "Geschatte vergoeding:";
|
||||
@override
|
||||
@@ -7604,7 +7604,7 @@ class $zh extends S {
|
||||
@override
|
||||
String get exchange => "交换";
|
||||
@override
|
||||
String get sync_status_failed_connect => "无法连接到节点";
|
||||
String get sync_status_failed_connect => "斷線";
|
||||
@override
|
||||
String get send_estimated_fee => "预估费用:";
|
||||
@override
|
||||
|
||||
@@ -25,56 +25,53 @@ class TradeRow extends StatelessWidget {
|
||||
return InkWell(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
height: 52,
|
||||
padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
|
||||
color: Colors.transparent,
|
||||
padding: EdgeInsets.only(left: 24, right: 24),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
_getPoweredImage(provider),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
child: Container(
|
||||
height: 46,
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
_getPoweredImage(provider),
|
||||
SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: <Widget>[
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text('${from.toString()} → ${to.toString()}',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor
|
||||
)),
|
||||
formattedAmount != null
|
||||
? Text(formattedAmount + ' ' + amountCrypto,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor
|
||||
))
|
||||
: Container()
|
||||
]),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(createdAtFormattedDate,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).textTheme
|
||||
.overline.backgroundColor))
|
||||
]),
|
||||
],
|
||||
),
|
||||
),
|
||||
))
|
||||
]),
|
||||
Text('${from.toString()} → ${to.toString()}',
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor
|
||||
)),
|
||||
formattedAmount != null
|
||||
? Text(formattedAmount + ' ' + amountCrypto,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor
|
||||
))
|
||||
: Container()
|
||||
]),
|
||||
SizedBox(height: 5),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(createdAtFormattedDate,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).textTheme
|
||||
.overline.backgroundColor))
|
||||
])
|
||||
],
|
||||
)
|
||||
)
|
||||
],
|
||||
),
|
||||
));
|
||||
}
|
||||
|
||||
|
||||
@@ -23,75 +23,73 @@ class TransactionRow extends StatelessWidget {
|
||||
return InkWell(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
height: 62,
|
||||
padding: EdgeInsets.fromLTRB(24, 8, 24, 8),
|
||||
color: Colors.transparent,
|
||||
padding: EdgeInsets.only(left: 24, right: 24),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: <Widget>[
|
||||
Container(
|
||||
height: 36,
|
||||
width: 36,
|
||||
decoration: BoxDecoration(
|
||||
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'),
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
children: [
|
||||
Container(
|
||||
height: 36,
|
||||
width: 36,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
color: Theme.of(context).textTheme.overline.decorationColor
|
||||
),
|
||||
Expanded(
|
||||
child: Container(
|
||||
padding: const EdgeInsets.only(left: 12),
|
||||
height: 56,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: <Widget>[
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
(direction == TransactionDirection.incoming
|
||||
? S.of(context).received
|
||||
: S.of(context).sent) +
|
||||
(isPending ? S.of(context).pending : ''),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor)),
|
||||
Text(formattedAmount,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor))
|
||||
]),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(formattedDate,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.overline
|
||||
.backgroundColor)),
|
||||
Text(formattedFiatAmount,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.overline
|
||||
.backgroundColor))
|
||||
]),
|
||||
],
|
||||
),
|
||||
),
|
||||
)
|
||||
]),
|
||||
child: Image.asset(
|
||||
direction == TransactionDirection.incoming
|
||||
? 'assets/images/down_arrow.png'
|
||||
: 'assets/images/up_arrow.png'),
|
||||
),
|
||||
SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(
|
||||
(direction == TransactionDirection.incoming
|
||||
? S.of(context).received
|
||||
: S.of(context).sent) +
|
||||
(isPending ? S.of(context).pending : ''),
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor)),
|
||||
Text(formattedAmount,
|
||||
style: TextStyle(
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).accentTextTheme.
|
||||
display3.backgroundColor))
|
||||
]),
|
||||
SizedBox(height: 5),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: <Widget>[
|
||||
Text(formattedDate,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.overline
|
||||
.backgroundColor)),
|
||||
Text(formattedFiatAmount,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context)
|
||||
.textTheme
|
||||
.overline
|
||||
.backgroundColor))
|
||||
])
|
||||
],
|
||||
)
|
||||
)
|
||||
],
|
||||
),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user