Fix Conflict with main Rename classes to advanced privacy settings to avoid confusion between settings/privacy-settings
Fix Conflict with main Rename classes to advanced privacy settings to avoid confusion between settings/privacy-settings
OmarHatem committed
Dec 4, 2022 at 05:08 UTC
9d64789983dac6b90f3a5a1aa228ebf181fbc0a7
21 files changed
+96
-82
lib/di.dart
+3
-3
@@ -35,7 +35,7 @@ import 'package:cake_wallet/view_model/settings/display_settings_view_model.dart
35
import 'package:cake_wallet/view_model/settings/other_settings_view_model.dart';
36
import 'package:cake_wallet/view_model/settings/privacy_settings_view_model.dart';
37
import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
38
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart'
38
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
39
import 'package:cw_core/unspent_coins_info.dart';
40
import 'package:cake_wallet/core/backup_service.dart';
41
import 'package:cw_core/wallet_service.dart';
@@ -816,8 +816,8 @@ Future setup(
816
(IoniaAnyPayPaymentInfo paymentInfo, AnyPayPaymentCommittedInfo committedInfo)
817
=> IoniaPaymentStatusPage(getIt.get<IoniaPaymentStatusViewModel>(param1: paymentInfo, param2: committedInfo)));
818
819
- getIt.registerFactoryParam<PrivacySettingsViewModel, WalletType, void>((type, _) =>
820
- PrivacySettingsViewModel(type))
819
+ getIt.registerFactoryParam<AdvancedPrivacySettingsViewModel, WalletType, void>((type, _) =>
820
+ AdvancedPrivacySettingsViewModel(type, getIt.get<SettingsStore>()));
821
822
_isSetupFinished = true;
823
}
lib/router.dart
+6
-5
@@ -27,7 +27,7 @@ import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page
27
import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
28
import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
29
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
30
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
30
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
31
import 'package:flutter/cupertino.dart';
32
import 'package:flutter/material.dart';
33
import 'package:cake_wallet/routes.dart';
@@ -494,13 +494,14 @@ Route<dynamic> createRoute(RouteSettings settings) {
494
case Routes.onramperPage:
495
return CupertinoPageRoute<void>(builder: (_) => getIt.get<OnRamperPage>());
496
497
- case Routes.privacySettings:
497
+ case Routes.advancedPrivacySettings:
498
final type = settings.arguments as WalletType;
499
- final privacySettingsViewModel = getIt.get<PrivacySettingsViewModel>(param1: type);
500
- final nodeCreateViewModel = getIt.get<NodeCreateOrEditViewModel>(param1: type);
499
500
return CupertinoPageRoute<void>(
503
- builder: (_) => AdvancedPrivacySettingsPage(privacySettingsViewModel, nodeCreateViewModel));
501
+ builder: (_) => AdvancedPrivacySettingsPage(
502
+ getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
503
+ getIt.get<NodeCreateOrEditViewModel>(param1: type),
504
+ ));
505
506
default:
507
return MaterialPageRoute<void>(
lib/src/screens/new_wallet/advanced_privacy_settings_page.dart
+5
-4
@@ -1,7 +1,7 @@
1
import 'package:cake_wallet/src/screens/nodes/widgets/node_form.dart';
2
import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
3
import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
4
-import 'package:cake_wallet/view_model/privacy_settings_view_model.dart';
4
+import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
5
import 'package:flutter_mobx/flutter_mobx.dart';
6
import 'package:flutter/material.dart';
7
import 'package:cake_wallet/generated/i18n.dart';
@@ -12,7 +12,7 @@ import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
12
class AdvancedPrivacySettingsPage extends BasePage {
13
AdvancedPrivacySettingsPage(this.privacySettingsViewModel, this.nodeViewModel);
14
15
- final PrivacySettingsViewModel privacySettingsViewModel;
15
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
16
final NodeCreateOrEditViewModel nodeViewModel;
17
18
@override
@@ -27,7 +27,7 @@ class AdvancedPrivacySettingsBody extends StatefulWidget {
27
const AdvancedPrivacySettingsBody(this.privacySettingsViewModel, this.nodeViewModel, {Key? key})
28
: super(key: key);
29
30
- final PrivacySettingsViewModel privacySettingsViewModel;
30
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
31
final NodeCreateOrEditViewModel nodeViewModel;
32
33
@override
@@ -39,7 +39,7 @@ class _AdvancedPrivacySettingsBodyState
39
extends State<AdvancedPrivacySettingsBody> {
40
_AdvancedPrivacySettingsBodyState(this.privacySettingsViewModel, this.nodeViewModel);
41
42
- final PrivacySettingsViewModel privacySettingsViewModel;
42
+ final AdvancedPrivacySettingsViewModel privacySettingsViewModel;
43
final NodeCreateOrEditViewModel nodeViewModel;
44
45
final _formKey = GlobalKey<FormState>();
@@ -84,6 +84,7 @@ class _AdvancedPrivacySettingsBodyState
84
LoadingPrimaryButton(
85
onPressed: () {
86
nodeViewModel.save();
87
+ Navigator.pop(context);
88
},
89
text: S.of(context).continue_text,
90
color: Theme.of(context).accentTextTheme.bodyText1!.color!,
lib/src/screens/new_wallet/new_wallet_page.dart
+1
-1
@@ -219,7 +219,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
219
GestureDetector(
220
onTap: () {
221
Navigator.of(context)
222
- .pushNamed(Routes.privacySettings, arguments: _walletNewVM.type);
222
+ .pushNamed(Routes.advancedPrivacySettings, arguments: _walletNewVM.type);
223
},
224
child: Text(S.of(context).advanced_privacy_settings),
225
),
lib/view_model/advanced_privacy_settings_view_model.dart
new
+51
@@ -0,0 +1,51 @@
1
+import 'package:cake_wallet/store/settings_store.dart';
2
+import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
3
+import 'package:cw_core/wallet_type.dart';
4
+import 'package:mobx/mobx.dart';
5
+import 'package:cake_wallet/generated/i18n.dart';
6
+
7
+part 'advanced_privacy_settings_view_model.g.dart';
8
+
9
+class AdvancedPrivacySettingsViewModel = AdvancedPrivacySettingsViewModelBase
10
+ with _$AdvancedPrivacySettingsViewModel;
11
+
12
+abstract class AdvancedPrivacySettingsViewModelBase with Store {
13
+ AdvancedPrivacySettingsViewModelBase(this.type, this._settingsStore)
14
+ : _disableFiat = false,
15
+ _addCustomNode = false {
16
+ settings = [
17
+ // TODO: uncomment when Disable Fiat PR is merged
18
+ // SwitcherListItem(
19
+ // title: S.current.disable_fiat,
20
+ // value: () => _disableFiat,
21
+ // onValueChange: (_, bool value) => _disableFiat = value,
22
+ // ),
23
+ SwitcherListItem(
24
+ title: S.current.disable_exchange,
25
+ value: () => _settingsStore.disableExchange,
26
+ onValueChange: (_, bool value) {
27
+ _settingsStore.disableExchange = value;
28
+ },
29
+ ),
30
+ SwitcherListItem(
31
+ title: S.current.add_custom_node,
32
+ value: () => _addCustomNode,
33
+ onValueChange: (_, bool value) => _addCustomNode = value,
34
+ ),
35
+ ];
36
+ }
37
+
38
+ late List<SwitcherListItem> settings;
39
+
40
+ @observable
41
+ bool _disableFiat = false;
42
+
43
+ @observable
44
+ bool _addCustomNode = false;
45
+
46
+ final WalletType type;
47
+ final SettingsStore _settingsStore;
48
+
49
+ @computed
50
+ bool get addCustomNode => _addCustomNode;
51
+}
lib/view_model/privacy_settings_view_model.dart
deleted
-54
@@ -1,54 +0,0 @@
1
-import 'package:cake_wallet/view_model/settings/switcher_list_item.dart';
2
-import 'package:cw_core/wallet_type.dart';
3
-import 'package:mobx/mobx.dart';
4
-import 'package:cake_wallet/generated/i18n.dart';
5
-
6
-part 'privacy_settings_view_model.g.dart';
7
-
8
-class PrivacySettingsViewModel = PrivacySettingsViewModelBase
9
- with _$PrivacySettingsViewModel;
10
-
11
-abstract class PrivacySettingsViewModelBase with Store {
12
- PrivacySettingsViewModelBase(this.type)
13
- : _disableFiat = false,
14
- _disableExchange = false,
15
- _addCustomNode = false {
16
- settings = [
17
- SwitcherListItem(
18
- // TODO: replace when Disable Fiat PR is merged
19
- title: "Disable Fiat API",
20
- // title: S.current.disable_fiat,
21
- value: () => _disableFiat,
22
- onValueChange: (_, bool value) => _disableFiat = value,
23
- ),
24
- SwitcherListItem(
25
- title: "Disable Exchange",
26
- // title: S.current.disable_exchange,
27
- value: () => _disableExchange,
28
- onValueChange: (_, bool value) => _disableExchange = value,
29
- ),
30
- SwitcherListItem(
31
- title: "Add New Custom Node",
32
- // title: S.current.add_custom_node,
33
- value: () => _addCustomNode,
34
- onValueChange: (_, bool value) => _addCustomNode = value,
35
- ),
36
- ];
37
- }
38
-
39
- late List<SwitcherListItem> settings;
40
-
41
- @observable
42
- bool _disableFiat = false;
43
-
44
- @observable
45
- bool _disableExchange = false;
46
-
47
- @observable
48
- bool _addCustomNode = false;
49
-
50
- final WalletType type;
51
-
52
- @computed
53
- bool get addCustomNode => _addCustomNode;
54
-}
res/values/strings_de.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Andere Einstellungen",
664
"disable_exchange": "Exchange deaktivieren",
665
"advanced_privacy_settings": "Erweiterte Datenschutzeinstellungen",
666
- "settings_can_be_changed_later": "Diese Einstellungen können später in den App-Einstellungen geändert werden"
666
+ "settings_can_be_changed_later": "Diese Einstellungen können später in den App-Einstellungen geändert werden",
667
+ "add_custom_node": "Neuen benutzerdefinierten Knoten hinzufügen"
668
}
res/values/strings_en.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Other settings",
664
"disable_exchange": "Disable exchange",
665
"advanced_privacy_settings": "Advanced Privacy Settings",
666
- "settings_can_be_changed_later": "These settings can be changed later in the app settings"
666
+ "settings_can_be_changed_later": "These settings can be changed later in the app settings",
667
+ "add_custom_node": "Add New Custom Node"
668
}
res/values/strings_es.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Otras configuraciones",
664
"disable_exchange": "Deshabilitar intercambio",
665
"advanced_privacy_settings": "Configuración avanzada de privacidad",
666
- "settings_can_be_changed_later": "Estas configuraciones se pueden cambiar más tarde en la configuración de la aplicación"
666
+ "settings_can_be_changed_later": "Estas configuraciones se pueden cambiar más tarde en la configuración de la aplicación",
667
+ "add_custom_node": "Agregar nuevo nodo personalizado"
668
}
res/values/strings_fr.arb
+2
-1
@@ -661,5 +661,6 @@
661
"other_settings": "Autres paramètres",
662
"disable_exchange": "Désactiver l'échange",
663
"advanced_privacy_settings": "Paramètres de confidentialité avancés",
664
- "settings_can_be_changed_later": "Ces paramètres peuvent être modifiés ultérieurement dans les paramètres de l'application"
664
+ "settings_can_be_changed_later": "Ces paramètres peuvent être modifiés ultérieurement dans les paramètres de l'application",
665
+ "add_custom_node": "Ajouter un nouveau nœud personnalisé"
666
}
res/values/strings_hi.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "अन्य सेटिंग्स",
664
"disable_exchange": "एक्सचेंज अक्षम करें",
665
"advanced_privacy_settings": "उन्नत गोपनीयता सेटिंग्स",
666
- "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है"
666
+ "settings_can_be_changed_later": "इन सेटिंग्स को बाद में ऐप सेटिंग में बदला जा सकता है",
667
+ "add_custom_node": "नया कस्टम नोड जोड़ें"
668
}
res/values/strings_hr.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Ostale postavke",
664
"disable_exchange": "Onemogući exchange",
665
"advanced_privacy_settings": "Napredne postavke privatnosti",
666
- "settings_can_be_changed_later": "Te se postavke mogu promijeniti kasnije u postavkama aplikacije"
666
+ "settings_can_be_changed_later": "Te se postavke mogu promijeniti kasnije u postavkama aplikacije",
667
+ "add_custom_node": "Dodaj novi prilagođeni čvor"
668
}
res/values/strings_it.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Altre impostazioni",
664
"disable_exchange": "Disabilita scambio",
665
"advanced_privacy_settings": "Impostazioni avanzate sulla privacy",
666
- "settings_can_be_changed_later": "Queste impostazioni possono essere modificate in seguito nelle impostazioni dell'app"
666
+ "settings_can_be_changed_later": "Queste impostazioni possono essere modificate in seguito nelle impostazioni dell'app",
667
+ "add_custom_node": "Aggiungi nuovo nodo personalizzato"
668
}
res/values/strings_ja.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "その他の設定",
664
"disable_exchange": "交換を無効にする",
665
"advanced_privacy_settings": "高度なプライバシー設定",
666
- "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます"
666
+ "settings_can_be_changed_later": "これらの設定は、後でアプリの設定で変更できます",
667
+ "add_custom_node": "新しいカスタム ノードを追加"
668
}
res/values/strings_ko.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "기타 설정",
664
"disable_exchange": "교환 비활성화",
665
"advanced_privacy_settings": "고급 개인 정보 설정",
666
- "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다."
666
+ "settings_can_be_changed_later": "이 설정은 나중에 앱 설정에서 변경할 수 있습니다.",
667
+ "add_custom_node": "새 사용자 정의 노드 추가"
668
}
res/values/strings_nl.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Andere instellingen",
664
"disable_exchange": "Uitwisseling uitschakelen",
665
"advanced_privacy_settings": "Geavanceerde privacy-instellingen",
666
- "settings_can_be_changed_later": "Deze instellingen kunnen later worden gewijzigd in de app-instellingen"
666
+ "settings_can_be_changed_later": "Deze instellingen kunnen later worden gewijzigd in de app-instellingen",
667
+ "add_custom_node": "Voeg een nieuw aangepast knooppunt toe"
668
}
res/values/strings_pl.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Inne ustawienia",
664
"disable_exchange": "Wyłącz wymianę",
665
"advanced_privacy_settings": "Zaawansowane ustawienia prywatności",
666
- "settings_can_be_changed_later": "Te ustawienia można później zmienić w ustawieniach aplikacji"
666
+ "settings_can_be_changed_later": "Te ustawienia można później zmienić w ustawieniach aplikacji",
667
+ "add_custom_node": "Dodaj nowy węzeł niestandardowy"
668
}
res/values/strings_pt.arb
+2
-1
@@ -662,5 +662,6 @@
662
"other_settings": "Outras configurações",
663
"disable_exchange": "Desativar troca",
664
"advanced_privacy_settings": "Configurações de privacidade avançadas",
665
- "settings_can_be_changed_later": "Essas configurações podem ser alteradas posteriormente nas configurações do aplicativo"
665
+ "settings_can_be_changed_later": "Essas configurações podem ser alteradas posteriormente nas configurações do aplicativo",
666
+ "add_custom_node": "Adicionar novo nó personalizado"
667
}
res/values/strings_ru.arb
+2
-1
@@ -663,5 +663,6 @@
663
"other_settings": "Другие настройки",
664
"disable_exchange": "Отключить обмен",
665
"advanced_privacy_settings": "Расширенные настройки конфиденциальности",
666
- "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения."
666
+ "settings_can_be_changed_later": "Эти настройки можно изменить позже в настройках приложения.",
667
+ "add_custom_node": "Добавить новый пользовательский узел"
668
}
res/values/strings_uk.arb
+2
-1
@@ -662,5 +662,6 @@
662
"other_settings": "Інші налаштування",
663
"disable_exchange": "Вимкнути exchange",
664
"advanced_privacy_settings": "Розширені налаштування конфіденційності",
665
- "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми"
665
+ "settings_can_be_changed_later": "Ці параметри можна змінити пізніше в налаштуваннях програми",
666
+ "add_custom_node": "Додати новий спеціальний вузол"
667
}
res/values/strings_zh.arb
+2
-1
@@ -661,5 +661,6 @@
661
"other_settings": "其他设置",
662
"disable_exchange": "禁用交换",
663
"advanced_privacy_settings": "高级隐私设置",
664
- "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置"
664
+ "settings_can_be_changed_later": "稍后可以在应用设置中更改这些设置",
665
+ "add_custom_node": "添加新的自定义节点"
666
}