From 799f691610f1dd081a5157ba850ccf5f8439d3df Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Fri, 18 Dec 2020 15:48:04 +0200 Subject: [PATCH 1/4] CAKE-218 | changed sync status text --- lib/generated/i18n.dart | 2 +- res/values/strings_en.arb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index fd0c0f70e..4d58f6eb1 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -255,7 +255,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 => "FAILED TO CONNECT TO THE NODE"; String get sync_status_not_connected => "NOT CONNECTED"; String get sync_status_starting_sync => "STARTING SYNC"; String get sync_status_syncronized => "SYNCHRONIZED"; diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 8a1267236..919d8f811 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SYNCHRONIZED", "sync_status_not_connected" : "NOT CONNECTED", "sync_status_starting_sync" : "STARTING SYNC", - "sync_status_failed_connect" : "FAILED CONNECT TO THE NODE", + "sync_status_failed_connect" : "FAILED TO CONNECT TO THE NODE", "sync_status_connecting" : "CONNECTING", "sync_status_connected" : "CONNECTED", From b2a2c16feb298c993a85187f358cbb6f6358a783 Mon Sep 17 00:00:00 2001 From: Oleksandr Sobol Date: Fri, 18 Dec 2020 17:51:57 +0200 Subject: [PATCH 2/4] CAKE-218 | changed sync status text --- lib/generated/i18n.dart | 24 ++++++++++++------------ res/values/strings_de.arb | 2 +- res/values/strings_en.arb | 2 +- res/values/strings_es.arb | 2 +- res/values/strings_hi.arb | 2 +- res/values/strings_ja.arb | 2 +- res/values/strings_ko.arb | 2 +- res/values/strings_nl.arb | 2 +- res/values/strings_pl.arb | 2 +- res/values/strings_pt.arb | 2 +- res/values/strings_ru.arb | 2 +- res/values/strings_uk.arb | 2 +- res/values/strings_zh.arb | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 4d58f6eb1..704b16bbe 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -255,7 +255,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 TO 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"; @@ -594,7 +594,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 @@ -1286,7 +1286,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 @@ -1978,7 +1978,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 @@ -2670,7 +2670,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 @@ -3362,7 +3362,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 @@ -4054,7 +4054,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 @@ -4746,7 +4746,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 @@ -5442,7 +5442,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 @@ -6134,7 +6134,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 @@ -6826,7 +6826,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 @@ -7518,7 +7518,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 diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index eb0a6080b..794324927 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SYNCHRONISIERT", "sync_status_not_connected" : "NICHT VERBUNDEN", "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_connected" : "IN VERBINDUNG GEBRACHT", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 919d8f811..04f0011b5 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SYNCHRONIZED", "sync_status_not_connected" : "NOT CONNECTED", "sync_status_starting_sync" : "STARTING SYNC", - "sync_status_failed_connect" : "FAILED TO CONNECT TO THE NODE", + "sync_status_failed_connect" : "DISCONNECTED", "sync_status_connecting" : "CONNECTING", "sync_status_connected" : "CONNECTED", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 00acdcb0c..e93e0c839 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SINCRONIZADO", "sync_status_not_connected" : "NO CONECTADO", "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_connected" : "CONECTADO", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 9a9545c5d..6607db7f6 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "सिंक्रनाइज़", "sync_status_not_connected" : "जुड़े नहीं हैं", "sync_status_starting_sync" : "सिताज़ा करना", - "sync_status_failed_connect" : "फेल हुआ कनेक्ट नोड", + "sync_status_failed_connect" : "डिस्कनेक्ट किया गया", "sync_status_connecting" : "कनेक्ट", "sync_status_connected" : "जुड़े हुए", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index cb4b63414..30f0a8c1b 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "同期された", "sync_status_not_connected" : "接続されていません", "sync_status_starting_sync" : "同期の開始", - "sync_status_failed_connect" : "ノードへの接続に失敗しました", + "sync_status_failed_connect" : "切断されました", "sync_status_connecting" : "接続中", "sync_status_connected" : "接続済み", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index c14898fd9..844e737d9 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "동기화", "sync_status_not_connected" : "연결되지 않은", "sync_status_starting_sync" : "동기화 시작", - "sync_status_failed_connect" : "노드에 연결하지 못했습니다", + "sync_status_failed_connect" : "연결 해제", "sync_status_connecting" : "연결 중", "sync_status_connected" : "연결됨", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index e5093a406..6bfa5847f 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SYNCHRONIZED", "sync_status_not_connected" : "NIET VERBONDEN", "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_connected" : "VERBONDEN", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index e6b098360..e44089cba 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SYNCHRONIZOWANY", "sync_status_not_connected" : "NIE POŁĄCZONY", "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_connected" : "POŁĄCZONY", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index e82032d7b..dbe341b62 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "SINCRONIZADO", "sync_status_not_connected" : "DESCONECTADO", "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_connected" : "CONECTADO", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index b78b86ff1..e9d04941b 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "СИНХРОНИЗИРОВАН", "sync_status_not_connected" : "НЕ ПОДКЛЮЧЁН", "sync_status_starting_sync" : "НАЧАЛО СИНХРОНИЗАЦИИ", - "sync_status_failed_connect" : "ОШИБКА ПОДКЛЮЧЕНИЯ К НОДЕ", + "sync_status_failed_connect" : "ОТКЛЮЧЕНО", "sync_status_connecting" : "ПОДКЛЮЧЕНИЕ", "sync_status_connected" : "ПОДКЛЮЧЕНО", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index be77cd293..0305d0336 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "СИНХРОНІЗОВАНИЙ", "sync_status_not_connected" : "НЕ ПІДКЛЮЧЕННИЙ", "sync_status_starting_sync" : "ПОЧАТОК СИНХРОНІЗАЦІЇ", - "sync_status_failed_connect" : "ПОМИЛКА ПІДКЛЮЧЕННЯ ДО ВУЗЛУ", + "sync_status_failed_connect" : "ВІДКЛЮЧЕНО", "sync_status_connecting" : "ПІДКЛЮЧЕННЯ", "sync_status_connected" : "ПІДКЛЮЧЕНО", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index ee633aae8..d53701faa 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -342,7 +342,7 @@ "sync_status_syncronized" : "已同步", "sync_status_not_connected" : "未连接", "sync_status_starting_sync" : "开始同步", - "sync_status_failed_connect" : "无法连接到节点", + "sync_status_failed_connect" : "斷線", "sync_status_connecting" : "连接中", "sync_status_connected" : "连接的", From b59d6336657689b7d4b7be6c531fc5416ce024b0 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 18 Dec 2020 20:02:08 +0200 Subject: [PATCH 3/4] CAKE-217 | reduced space between rows in the trade_row.dart and transaction_raw.dart --- .../screens/dashboard/widgets/trade_row.dart | 85 ++++++------ .../dashboard/widgets/transaction_raw.dart | 126 +++++++++--------- 2 files changed, 103 insertions(+), 108 deletions(-) diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart index 82bf2fc3e..3860b5010 100644 --- a/lib/src/screens/dashboard/widgets/trade_row.dart +++ b/lib/src/screens/dashboard/widgets/trade_row.dart @@ -25,54 +25,51 @@ 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: [ - _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: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text('${from.toString()} → ${to.toString()}', - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - color: Colors.white - )), - formattedAmount != null - ? Text(formattedAmount + ' ' + amountCrypto, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - color: Colors.white - )) - : Container() - ]), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - 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: Colors.white + )), + formattedAmount != null + ? Text(formattedAmount + ' ' + amountCrypto, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + color: Colors.white + )) + : Container() + ]), + SizedBox(height: 5), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(createdAtFormattedDate, + style: TextStyle( + fontSize: 14, + color: Theme.of(context).textTheme + .overline.backgroundColor)) + ]) + ], + ) + ) + ], + ), )); } diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart index 67e13ce43..914579897 100644 --- a/lib/src/screens/dashboard/widgets/transaction_raw.dart +++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart @@ -23,73 +23,71 @@ 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: [ - 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: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - 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: Colors.white)), - Text(formattedAmount, - style: TextStyle( - fontSize: 16, - fontWeight: FontWeight.w500, - color: Colors.white)) - ]), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - 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: [ + 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: Colors.white)), + Text(formattedAmount, + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w500, + color: Colors.white)) + ]), + SizedBox(height: 5), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + 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)) + ]) + ], + ) + ) + ], + ), )); } } From dcb892b24c89311b9a73f4eea092ba1e6799c55a Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Fri, 18 Dec 2020 21:24:05 +0200 Subject: [PATCH 4/4] CAKE-217 | merged 4.1.0 branch into current and resolved problems --- lib/src/screens/dashboard/widgets/trade_row.dart | 6 ++++-- lib/src/screens/dashboard/widgets/transaction_raw.dart | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/src/screens/dashboard/widgets/trade_row.dart b/lib/src/screens/dashboard/widgets/trade_row.dart index 3860b5010..449c4d016 100644 --- a/lib/src/screens/dashboard/widgets/trade_row.dart +++ b/lib/src/screens/dashboard/widgets/trade_row.dart @@ -44,14 +44,16 @@ class TradeRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Colors.white + color: Theme.of(context).accentTextTheme. + display3.backgroundColor )), formattedAmount != null ? Text(formattedAmount + ' ' + amountCrypto, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Colors.white + color: Theme.of(context).accentTextTheme. + display3.backgroundColor )) : Container() ]), diff --git a/lib/src/screens/dashboard/widgets/transaction_raw.dart b/lib/src/screens/dashboard/widgets/transaction_raw.dart index 914579897..23a3eccec 100644 --- a/lib/src/screens/dashboard/widgets/transaction_raw.dart +++ b/lib/src/screens/dashboard/widgets/transaction_raw.dart @@ -57,12 +57,14 @@ class TransactionRow extends StatelessWidget { style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Colors.white)), + color: Theme.of(context).accentTextTheme. + display3.backgroundColor)), Text(formattedAmount, style: TextStyle( fontSize: 16, fontWeight: FontWeight.w500, - color: Colors.white)) + color: Theme.of(context).accentTextTheme. + display3.backgroundColor)) ]), SizedBox(height: 5), Row(