CAKE-284 | moved support from settings to main menu; added support_page.dart and support_view_model.dart to the app
OleksandrSobol committed
Feb 25, 2021 at 20:25 UTC
b2b17e66c594e23512adc79a4ce67807bf792639
7 files changed
+108
-24
lib/di.dart
+6
@@ -33,6 +33,7 @@ import 'package:cake_wallet/src/screens/send/send_template_page.dart';
33
import 'package:cake_wallet/src/screens/settings/change_language.dart';
34
import 'package:cake_wallet/src/screens/settings/settings.dart';
35
import 'package:cake_wallet/src/screens/setup_pin_code/setup_pin_code.dart';
36
+import 'package:cake_wallet/src/screens/support/support_page.dart';
37
import 'package:cake_wallet/src/screens/trade_details/trade_details_page.dart';
38
import 'package:cake_wallet/src/screens/transaction_details/transaction_details_page.dart';
39
import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
@@ -65,6 +66,7 @@ import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.
66
import 'package:cake_wallet/view_model/rescan_view_model.dart';
67
import 'package:cake_wallet/view_model/restore_from_backup_view_model.dart';
68
import 'package:cake_wallet/view_model/setup_pin_code_view_model.dart';
69
+import 'package:cake_wallet/view_model/support_view_model.dart';
70
import 'package:cake_wallet/view_model/transaction_details_view_model.dart';
71
import 'package:cake_wallet/view_model/trade_details_view_model.dart';
72
import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart';
@@ -509,5 +511,9 @@ Future setup(
511
getIt.registerFactoryParam<TradeDetailsPage, Trade, void>((Trade trade, _) =>
512
TradeDetailsPage(getIt.get<TradeDetailsViewModel>(param1: trade)));
513
514
+ getIt.registerFactory(() => SupportViewModel());
515
+
516
+ getIt.registerFactory(() => SupportPage(getIt.get<SupportViewModel>()));
517
+
518
_isSetupFinished = true;
519
}
lib/router.dart
+5
@@ -6,6 +6,7 @@ import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
6
import 'package:cake_wallet/src/screens/restore/restore_from_backup_page.dart';
7
import 'package:cake_wallet/src/screens/restore/wallet_restore_page.dart';
8
import 'package:cake_wallet/src/screens/seed/pre_seed_page.dart';
9
+import 'package:cake_wallet/src/screens/support/support_page.dart';
10
import 'package:cake_wallet/store/settings_store.dart';
11
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
12
import 'package:flutter/cupertino.dart';
@@ -331,6 +332,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
332
return CupertinoPageRoute<void>(
333
builder: (_) => getIt.get<RestoreFromBackupPage>());
334
335
+ case Routes.support:
336
+ return CupertinoPageRoute<void>(
337
+ builder: (_) => getIt.get<SupportPage>());
338
+
339
default:
340
return MaterialPageRoute<void>(
341
builder: (_) => Scaffold(
lib/routes.dart
+1
@@ -51,4 +51,5 @@ class Routes {
51
static const backup = '/backup';
52
static const editBackupPassword = '/edit_backup_passowrd';
53
static const restoreFromBackup = '/restore_from_backup';
54
+ static const support = '/support';
55
}
\ No newline at end of file
lib/src/screens/dashboard/wallet_menu.dart
+7
@@ -47,6 +47,10 @@ class WalletMenu {
47
title: S.current.settings_title,
48
image: Image.asset('assets/images/settings_menu.png',
49
height: 16, width: 16)),
50
+ WalletMenuItem(
51
+ title: S.current.settings_support,
52
+ image: Image.asset('assets/images/question_mark.png',
53
+ height: 16, width: 16)),
54
]);
55
}
56
@@ -99,6 +103,9 @@ class WalletMenu {
103
case 7:
104
Navigator.of(context).pushNamed(Routes.settings);
105
break;
106
+ case 8:
107
+ Navigator.of(context).pushNamed(Routes.support);
108
+ break;
109
default:
110
break;
111
}
lib/src/screens/support/support_page.dart
new
+45
@@ -0,0 +1,45 @@
1
+import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
2
+import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';
3
+import 'package:cake_wallet/src/widgets/standard_list.dart';
4
+import 'package:cake_wallet/view_model/settings/link_list_item.dart';
5
+import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
6
+import 'package:cake_wallet/view_model/support_view_model.dart';
7
+import 'package:flutter/material.dart';
8
+import 'package:flutter/cupertino.dart';
9
+import 'package:cake_wallet/src/screens/base_page.dart';
10
+import 'package:cake_wallet/generated/i18n.dart';
11
+
12
+class SupportPage extends BasePage {
13
+ SupportPage(this.supportViewModel);
14
+
15
+ final SupportViewModel supportViewModel;
16
+
17
+ @override
18
+ String get title => S.current.settings_support;
19
+
20
+ @override
21
+ Widget body(BuildContext context) {
22
+ return SectionStandardList(
23
+ sectionCount: 1,
24
+ itemCounter: (int _) => supportViewModel.items.length,
25
+ itemBuilder: (_, __, index) {
26
+ final item = supportViewModel.items[index];
27
+
28
+ if (item is RegularListItem) {
29
+ return SettingsCellWithArrow(
30
+ title: item.title, handler: item.handler);
31
+ }
32
+
33
+ if (item is LinkListItem) {
34
+ return SettingsLinkProviderCell(
35
+ title: item.title,
36
+ icon: item.icon,
37
+ link: item.link,
38
+ linkTitle: item.linkTitle);
39
+ }
40
+
41
+ return Container();
42
+ });
43
+ }
44
+
45
+}
\ No newline at end of file
lib/view_model/settings/settings_view_model.dart
-24
@@ -147,34 +147,10 @@ abstract class SettingsViewModelBase with Store {
147
_settingsStore.currentTheme = theme)
148
],
149
[
150
- LinkListItem(
151
- title: 'Email',
152
- linkTitle: 'support@cakewallet.com',
153
- link: 'mailto:support@cakewallet.com'),
154
- LinkListItem(
155
- title: 'Telegram',
156
- icon: 'assets/images/Telegram.png',
157
- linkTitle: '@cakewallet_bot',
158
- link: 'https:t.me/cakewallet_bot'),
159
- LinkListItem(
160
- title: 'Twitter',
161
- icon: 'assets/images/Twitter.png',
162
- linkTitle: '@cakewallet',
163
- link: 'https://twitter.com/cakewallet'),
164
- LinkListItem(
165
- title: 'ChangeNow',
166
- icon: 'assets/images/change_now.png',
167
- linkTitle: 'support@changenow.io',
168
- link: 'mailto:support@changenow.io'),
150
RegularListItem(
151
title: S.current.settings_terms_and_conditions,
152
handler: (BuildContext context) =>
153
Navigator.of(context).pushNamed(Routes.readDisclaimer),
173
- ),
174
- RegularListItem(
175
- title: S.current.faq,
176
- handler: (BuildContext context) =>
177
- Navigator.pushNamed(context, Routes.faq),
154
)
155
],
156
[VersionListItem(title: currentVersion)]
lib/view_model/support_view_model.dart
new
+44
@@ -0,0 +1,44 @@
1
+import 'package:cake_wallet/generated/i18n.dart';
2
+import 'package:cake_wallet/routes.dart';
3
+import 'package:cake_wallet/view_model/settings/link_list_item.dart';
4
+import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
5
+import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
6
+import 'package:flutter/cupertino.dart';
7
+import 'package:flutter/material.dart';
8
+import 'package:mobx/mobx.dart';
9
+
10
+part 'support_view_model.g.dart';
11
+
12
+class SupportViewModel = SupportViewModelBase with _$SupportViewModel;
13
+
14
+abstract class SupportViewModelBase with Store {
15
+ SupportViewModelBase() {
16
+ items = [
17
+ RegularListItem(
18
+ title: S.current.faq,
19
+ handler: (BuildContext context) =>
20
+ Navigator.pushNamed(context, Routes.faq),
21
+ ),
22
+ LinkListItem(
23
+ title: 'Email',
24
+ linkTitle: 'support@cakewallet.com',
25
+ link: 'mailto:support@cakewallet.com'),
26
+ LinkListItem(
27
+ title: 'Telegram',
28
+ icon: 'assets/images/Telegram.png',
29
+ linkTitle: '@cakewallet_bot',
30
+ link: 'https:t.me/cakewallet_bot'),
31
+ LinkListItem(
32
+ title: 'Twitter',
33
+ icon: 'assets/images/Twitter.png',
34
+ linkTitle: '@cakewallet',
35
+ link: 'https://twitter.com/cakewallet'),
36
+ LinkListItem(
37
+ title: 'ChangeNow',
38
+ icon: 'assets/images/change_now.png',
39
+ linkTitle: 'support@changenow.io',
40
+ link: 'mailto:support@changenow.io')
41
+ ];
42
+ }
43
+ List<SettingsListItem> items;
44
+}
\ No newline at end of file