only save incognito setting on explicit button press

lib/pages/stack_privacy_calls.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:stackwallet/hive/db.dart';
 import 'package:stackwallet/pages/pinpad_views/create_pin_view.dart';
+import 'package:stackwallet/pages_desktop_specific/create_password/create_password_view.dart';
 import 'package:stackwallet/providers/global/prefs_provider.dart';
 import 'package:stackwallet/utilities/assets.dart';
 import 'package:stackwallet/utilities/constants.dart';
@@ -12,9 +12,6 @@ import 'package:stackwallet/utilities/util.dart';
 import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
 import 'package:stackwallet/widgets/rounded_white_container.dart';
 
-import 'package:stackwallet/providers/global/prefs_provider.dart';
-import 'package:stackwallet/utilities/prefs.dart';
-
 class StackPrivacyCalls extends ConsumerStatefulWidget {
   const StackPrivacyCalls({
     Key? key,
@@ -31,19 +28,19 @@ class StackPrivacyCalls extends ConsumerStatefulWidget {
 
 class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
   late final bool isDesktop;
-  bool isEasy = Prefs.instance.externalCalls;
+  late bool isEasy;
-  final PageController _pageController =
+  late bool infoToggle;
-      PageController(initialPage: 0, keepPage: true);
 
   @override
   void initState() {
     isDesktop = Util.isDesktop;
+    isEasy = ref.read(prefsChangeNotifierProvider).externalCalls;
+    infoToggle = isEasy;
     super.initState();
   }
 
   @override
   void dispose() {
-    _pageController.dispose();
     super.dispose();
   }
 
@@ -59,11 +56,7 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
         ),
       ),
       body: SafeArea(
-        child: PageView(
+        child: Padding(
-          controller: _pageController,
-          physics: const NeverScrollableScrollPhysics(),
-          children: [
-            Padding(
           padding: const EdgeInsets.fromLTRB(0, 40, 0, 0),
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
@@ -82,11 +75,19 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
               const SizedBox(
                 height: 36,
               ),
-                  const Padding(
+              Padding(
-                    padding: EdgeInsets.symmetric(
+                padding: const EdgeInsets.symmetric(
                   horizontal: 16,
                 ),
-                    child: PrivacyToggle(),
+                child: PrivacyToggle(
+                  externalCallsEnabled: isEasy,
+                  onChanged: (externalCalls) {
+                    isEasy = externalCalls;
+                    setState(() {
+                      infoToggle = isEasy;
+                    });
+                  },
+                ),
               ),
               const SizedBox(
                 height: 36,
@@ -98,13 +99,9 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
                     child: RichText(
                       textAlign: TextAlign.left,
                       text: TextSpan(
-                            style: STextStyles.label(context)
+                        style:
-                                .copyWith(fontSize: 12.0),
+                            STextStyles.label(context).copyWith(fontSize: 12.0),
-                            children: ref.watch(
+                        children: infoToggle
-                              prefsChangeNotifierProvider.select(
-                                (value) => value.externalCalls,
-                              ),
-                            )
                             ? [
                                 const TextSpan(
                                     text:
@@ -159,12 +156,24 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
                     Expanded(
                       child: ContinueButton(
                         isDesktop: isDesktop,
-                            isSettings: widget.isSettings,
+                        label: !widget.isSettings ? "Continue" : "Save changes",
-                            isEasy: ref.watch(
+                        onPressed: () {
-                              prefsChangeNotifierProvider.select(
+                          ref.read(prefsChangeNotifierProvider).externalCalls =
-                                (value) => value.externalCalls,
+                              isEasy;
-                              ),
+                          if (!widget.isSettings) {
-                            ),
+                            if (isDesktop) {
+                              Navigator.of(context).pushNamed(
+                                CreatePasswordView.routeName,
+                              );
+                            } else {
+                              Navigator.of(context).pushNamed(
+                                CreatePinView.routeName,
+                              );
+                            }
+                          } else {
+                            Navigator.pop(context);
+                          }
+                        },
                       ),
                     ),
                   ],
@@ -173,21 +182,35 @@ class _StackPrivacyCalls extends ConsumerState<StackPrivacyCalls> {
             ],
           ),
         ),
-          ],
-        ),
       ),
     );
   }
 }
 
-class PrivacyToggle extends ConsumerStatefulWidget {
+class PrivacyToggle extends StatefulWidget {
-  const PrivacyToggle({Key? key}) : super(key: key);
+  const PrivacyToggle({
+    Key? key,
+    required this.externalCallsEnabled,
+    this.onChanged,
+  }) : super(key: key);
+
+  final bool externalCallsEnabled;
+  final void Function(bool)? onChanged;
 
   @override
-  ConsumerState<PrivacyToggle> createState() => _PrivacyToggleState();
+  State<PrivacyToggle> createState() => _PrivacyToggleState();
 }
 
-class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
+class _PrivacyToggleState extends State<PrivacyToggle> {
+  late bool externalCallsEnabled;
+
+  @override
+  void initState() {
+    // initial toggle state
+    externalCallsEnabled = widget.externalCallsEnabled;
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     return Row(
@@ -196,11 +219,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
           child: RawMaterialButton(
             fillColor: Theme.of(context).extension<StackColors>()!.popupBG,
             shape: RoundedRectangleBorder(
-              side: !ref.watch(
+              side: !externalCallsEnabled
-                prefsChangeNotifierProvider.select(
-                  (value) => value.externalCalls,
-                ),
-              )
                   ? BorderSide.none
                   : BorderSide(
                       color: Theme.of(context)
@@ -213,7 +232,12 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
               ),
             ),
             onPressed: () {
-              ref.read(prefsChangeNotifierProvider).externalCalls = true;
+              setState(() {
+                // update toggle state
+                externalCallsEnabled = true;
+              });
+              // call callback with newly set value
+              widget.onChanged?.call(externalCallsEnabled);
             },
             child: Padding(
               padding: const EdgeInsets.all(
@@ -244,11 +268,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                       ),
                     ],
                   ),
-                  if (ref.watch(
+                  if (externalCallsEnabled)
-                    prefsChangeNotifierProvider.select(
-                      (value) => value.externalCalls,
-                    ),
-                  ))
                     Positioned(
                       top: 4,
                       right: 4,
@@ -261,11 +281,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                             .infoItemIcons,
                       ),
                     ),
-                  if (!ref.watch(
+                  if (!externalCallsEnabled)
-                    prefsChangeNotifierProvider.select(
-                      (value) => value.externalCalls,
-                    ),
-                  ))
                     Positioned(
                       top: 4,
                       right: 4,
@@ -293,11 +309,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
             elevation: 0,
             fillColor: Theme.of(context).extension<StackColors>()!.popupBG,
             shape: RoundedRectangleBorder(
-              side: ref.watch(
+              side: externalCallsEnabled
-                prefsChangeNotifierProvider.select(
-                  (value) => value.externalCalls,
-                ),
-              )
                   ? BorderSide.none
                   : BorderSide(
                       color: Theme.of(context)
@@ -310,7 +322,12 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
               ),
             ),
             onPressed: () {
-              ref.read(prefsChangeNotifierProvider).externalCalls = false;
+              setState(() {
+                // update toggle state
+                externalCallsEnabled = false;
+              });
+              // call callback with newly set value
+              widget.onChanged?.call(externalCallsEnabled);
             },
             child: Padding(
               padding: const EdgeInsets.all(
@@ -342,11 +359,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                       ),
                     ],
                   ),
-                  if (!ref.watch(
+                  if (!externalCallsEnabled)
-                    prefsChangeNotifierProvider.select(
-                      (value) => value.externalCalls,
-                    ),
-                  ))
                     Positioned(
                       top: 4,
                       right: 4,
@@ -359,11 +372,7 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
                             .infoItemIcons,
                       ),
                     ),
-                  if (ref.watch(
+                  if (externalCallsEnabled)
-                    prefsChangeNotifierProvider.select(
-                      (value) => value.externalCalls,
-                    ),
-                  ))
                     Positioned(
                       top: 4,
                       right: 4,
@@ -388,58 +397,47 @@ class _PrivacyToggleState extends ConsumerState<PrivacyToggle> {
   }
 }
 
-class ContinueButton extends StatelessWidget {
+class ContinueButton extends ConsumerWidget {
-  const ContinueButton(
+  const ContinueButton({
-      {Key? key,
+    Key? key,
     required this.isDesktop,
-      required this.isSettings,
+    required this.onPressed,
-      required this.isEasy})
+    required this.label,
-      : super(key: key);
+  }) : super(key: key);
 
+  final String label;
   final bool isDesktop;
-  final bool isSettings;
+  final VoidCallback onPressed;
-  final bool isEasy;
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
-    return !isDesktop
+    if (isDesktop) {
-        ? TextButton(
+      return SizedBox(
-            style: Theme.of(context)
-                .extension<StackColors>()!
-                .getPrimaryEnabledButtonColor(context),
-            onPressed: () {
-              Prefs.instance.externalCalls = isEasy;
-              if (!isSettings) {
-                Navigator.of(context).pushNamed(CreatePinView.routeName);
-              } else {
-                Navigator.pop(context);
-              }
-            },
-            child: Text(
-              !isSettings ? "Continue" : "Save changes",
-              style: STextStyles.button(context),
-            ),
-          )
-        : SizedBox(
         width: 328,
         height: 70,
         child: TextButton(
           style: Theme.of(context)
               .extension<StackColors>()!
               .getPrimaryEnabledButtonColor(context),
-              onPressed: () {
+          onPressed: onPressed,
-                Prefs.instance.externalCalls = isEasy;
-
-                if (!isSettings) {
-                  Navigator.of(context).pushNamed(CreatePinView.routeName);
-                }
-              },
           child: Text(
-                !isSettings ? "Continue" : "Save changes",
+            label,
             style: STextStyles.button(context).copyWith(fontSize: 20),
           ),
         ),
       );
+    } else {
+      return TextButton(
+        style: Theme.of(context)
+            .extension<StackColors>()!
+            .getPrimaryEnabledButtonColor(context),
+        onPressed: onPressed,
+        child: Text(
+          label,
+          style: STextStyles.button(context),
+        ),
+      );
+    }
   }
 }