Comments.
M committed
Oct 22, 2020 at 18:11 UTC
cba4188665905b29463639136b91b0f8867b66d8
6 files changed
+23
-15
lib/generated/i18n.dart
+1
-1
@@ -285,7 +285,7 @@ class S implements WidgetsLocalizations {
285
String get transaction_sent => "Transaction sent!";
286
String get transactions => "Transactions";
287
String get transactions_by_date => "Transactions by date";
288
- String get use => "Use ";
288
+ String get use => "Switch to ";
289
String get view_key_private => "View key (private)";
290
String get view_key_public => "View key (public)";
291
String get wallet_keys => "Wallet keys";
lib/src/screens/dashboard/widgets/date_section_raw.dart
+1
-1
@@ -15,7 +15,7 @@ class DateSectionRaw extends StatelessWidget {
15
final isToday = nowDate.day == date.day &&
16
nowDate.month == date.month &&
17
nowDate.year == date.year;
18
- final dateSectionDateFormat = DateFormatter.withCurrentLocal();
18
+ final dateSectionDateFormat = DateFormatter.withCurrentLocal(hasTime: false);
19
var title = "";
20
21
if (isToday) {
lib/src/screens/wallet_list/wallet_list_page.dart
+1
-1
@@ -165,7 +165,7 @@ class WalletListBodyState extends State<WalletListBody> {
165
bottomSection: Column(children: <Widget>[
166
PrimaryImageButton(
167
onPressed: () =>
168
- Navigator.of(context).pushNamed(Routes.newWalletType),
168
+ Navigator.of(context).pushNamed(Routes.newWallet),
169
image: newWalletImage,
170
text: S.of(context).wallet_list_create_new_wallet,
171
color: Theme.of(context).accentTextTheme.subtitle.decorationColor,
lib/utils/date_formatter.dart
+12
-4
@@ -3,13 +3,21 @@ import 'package:cake_wallet/di.dart';
3
import 'package:cake_wallet/store/settings_store.dart';
4
5
class DateFormatter {
6
- static String get currentLocalFormat {
6
+ static String currentLocalFormat({bool hasTime = true}) {
7
final isUSA = getIt.get<SettingsStore>().languageCode.toLowerCase() == 'en';
8
- final format = isUSA ? 'yyyy.MM.dd, HH:mm' : 'dd.MM.yyyy, HH:mm';
8
+ final format =
9
+ isUSA ? usaStyleFormat(hasTime) : regularStyleFormat(hasTime);
10
11
return format;
12
}
13
13
- static DateFormat withCurrentLocal() =>
14
- DateFormat(currentLocalFormat, getIt.get<SettingsStore>().languageCode);
14
+ static DateFormat withCurrentLocal({bool hasTime = true}) => DateFormat(
15
+ currentLocalFormat(hasTime: hasTime),
16
+ getIt.get<SettingsStore>().languageCode);
17
+
18
+ static String usaStyleFormat(bool hasTime) =>
19
+ hasTime ? 'yyyy.MM.dd, HH:mm' : 'yyyy.MM.dd';
20
+
21
+ static String regularStyleFormat(bool hasTime) =>
22
+ hasTime ? 'dd.MM.yyyy, HH:mm' : 'dd.MM.yyyy';
23
}
pubspec.lock
+7
-7
@@ -133,7 +133,7 @@ packages:
133
name: build_resolvers
134
url: "https://pub.dartlang.org"
135
source: hosted
136
- version: "1.4.1"
136
+ version: "1.4.2"
137
build_runner:
138
dependency: "direct dev"
139
description:
@@ -273,7 +273,7 @@ packages:
273
name: dart_style
274
url: "https://pub.dartlang.org"
275
source: hosted
276
- version: "1.3.7"
276
+ version: "1.3.8"
277
dartx:
278
dependency: transitive
279
description:
@@ -930,14 +930,14 @@ packages:
930
name: url_launcher
931
url: "https://pub.dartlang.org"
932
source: hosted
933
- version: "5.7.5"
933
+ version: "5.7.6"
934
url_launcher_linux:
935
dependency: transitive
936
description:
937
name: url_launcher_linux
938
url: "https://pub.dartlang.org"
939
source: hosted
940
- version: "0.0.1+1"
940
+ version: "0.0.1+3"
941
url_launcher_macos:
942
dependency: transitive
943
description:
@@ -951,14 +951,14 @@ packages:
951
name: url_launcher_platform_interface
952
url: "https://pub.dartlang.org"
953
source: hosted
954
- version: "1.0.8"
954
+ version: "1.0.9"
955
url_launcher_web:
956
dependency: transitive
957
description:
958
name: url_launcher_web
959
url: "https://pub.dartlang.org"
960
source: hosted
961
- version: "0.1.4+1"
961
+ version: "0.1.5"
962
url_launcher_windows:
963
dependency: transitive
964
description:
@@ -1024,4 +1024,4 @@ packages:
1024
version: "2.2.1"
1025
sdks:
1026
dart: ">=2.10.0-110 <2.11.0"
1027
- flutter: ">=1.12.13+hotfix.5 <2.0.0"
1027
+ flutter: ">=1.22.0 <2.0.0"
res/values/strings_en.arb
+1
-1
@@ -131,7 +131,7 @@
131
"add_new_node" : "Add new node",
132
133
134
- "use" : "Use ",
134
+ "use" : "Switch to ",
135
"digit_pin" : "-digit PIN",
136
137