diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart index 7b29685f7..5a54eb204 100644 --- a/lib/src/screens/dashboard/dashboard_page.dart +++ b/lib/src/screens/dashboard/dashboard_page.dart @@ -1,5 +1,4 @@ import 'package:provider/provider.dart'; -import 'package:intl/intl.dart'; import 'package:date_range_picker/date_range_picker.dart' as date_rage_picker; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; @@ -125,9 +124,9 @@ class DashboardPageBodyState extends State { final actionListStore = Provider.of(context); final syncStore = Provider.of(context); final settingsStore = Provider.of(context); - final transactionDateFormat = settingsStore.currentLocale == 'en_US' - ? DateFormat("MMMM d, yyyy, HH:mm", settingsStore.languageCode) - : DateFormat("d MMMM yyyy, HH:mm", settingsStore.languageCode); + final transactionDateFormat = settingsStore.getCurrentDateFormat( + formatUSA: "MMMM d, yyyy, HH:mm", + formatDefault: "d MMMM yyyy, HH:mm"); return Observer( key: _listObserverKey, diff --git a/lib/src/screens/dashboard/date_section_raw.dart b/lib/src/screens/dashboard/date_section_raw.dart index f735278ba..86fc3ff06 100644 --- a/lib/src/screens/dashboard/date_section_raw.dart +++ b/lib/src/screens/dashboard/date_section_raw.dart @@ -19,9 +19,9 @@ class DateSectionRaw extends StatelessWidget { nowDate.year == date.year; final settingsStore = Provider.of(context); final currentLanguage = settingsStore.languageCode; - final dateSectionDateFormat = settingsStore.currentLocale == 'en_US' - ? DateFormat("MMM d", settingsStore.languageCode) - : DateFormat("d MMM", settingsStore.languageCode); + final dateSectionDateFormat = settingsStore.getCurrentDateFormat( + formatUSA: "MMM d", + formatDefault: "d MMM"); var title = ""; if (isToday) { diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart index 0d25254a0..508443e0d 100644 --- a/lib/src/screens/trade_details/trade_details_page.dart +++ b/lib/src/screens/trade_details/trade_details_page.dart @@ -9,7 +9,6 @@ import 'package:cake_wallet/src/stores/settings/settings_store.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart'; import 'package:cake_wallet/src/screens/transaction_details/standart_list_row.dart'; -import 'package:intl/intl.dart'; class TradeDetailsPage extends BasePage { @override @@ -22,9 +21,9 @@ class TradeDetailsPage extends BasePage { Widget body(BuildContext context) { final exchangeStore = Provider.of(context); final settingsStore = Provider.of(context); - final createdAtFormat = settingsStore.currentLocale == 'en_US' - ? DateFormat('yyyy.MM.dd, HH:mm') - : DateFormat('dd.MM.yyyy, HH:mm'); + final createdAtFormat = settingsStore.getCurrentDateFormat( + formatUSA: "yyyy.MM.dd, HH:mm", + formatDefault: "dd.MM.yyyy, HH:mm"); return Container( padding: EdgeInsets.only(top: 10.0, bottom: 10.0, left: 20, right: 15), diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart index ec2b9a9f1..c25dbaa1e 100644 --- a/lib/src/screens/transaction_details/transaction_details_page.dart +++ b/lib/src/screens/transaction_details/transaction_details_page.dart @@ -1,4 +1,3 @@ -import 'package:intl/intl.dart'; import 'package:provider/provider.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; @@ -46,9 +45,9 @@ class TransactionDetailsFormState extends State { @override void initState() { - final _dateFormat = widget.settingsStore.currentLocale == 'en_US' - ? DateFormat('yyyy.MM.dd, HH:mm') - : DateFormat('dd.MM.yyyy, HH:mm'); + final _dateFormat = widget.settingsStore.getCurrentDateFormat( + formatUSA: "yyyy.MM.dd, HH:mm", + formatDefault: "dd.MM.yyyy, HH:mm"); final items = [ StandartListItem( title: S.current.transaction_details_transaction_id, diff --git a/lib/src/stores/settings/settings_store.dart b/lib/src/stores/settings/settings_store.dart index 7fce06e84..b3fe22e5a 100644 --- a/lib/src/stores/settings/settings_store.dart +++ b/lib/src/stores/settings/settings_store.dart @@ -15,6 +15,7 @@ import 'package:cake_wallet/src/domain/common/default_settings_migration.dart'; import 'package:package_info/package_info.dart'; import 'package:cake_wallet/src/domain/common/language.dart'; import 'package:devicelocale/devicelocale.dart'; +import 'package:intl/intl.dart'; part 'settings_store.g.dart'; @@ -287,4 +288,10 @@ abstract class SettingsStoreBase with Store { await changeCurrentNodeToDefault(sharedPreferences: _sharedPreferences, nodes: _nodes); await loadSettings(); } + + DateFormat getCurrentDateFormat({ + @required String formatUSA, + @required String formatDefault}) => currentLocale == 'en_US' + ? DateFormat(formatUSA, languageCode) + : DateFormat(formatDefault, languageCode); }