pebble-dev#151 - Refactor existing SharedPreferences setup, too

DreadBoy · May 10, 2021 · e3ed2a8 · e3ed2a8
1 parent 5434cad
commit e3ed2a8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 9 deletions.
diff --git a/lib/infrastructure/datasources/preferences.dart b/lib/infrastructure/datasources/preferences.dart
@@ -103,6 +103,15 @@ class Preferences {
     await _sharedPrefs.setBool("firstRun", true);
     _preferencesUpdateStream.add(this);
   }
+
+  bool wasSetupSuccessful() {
+    return _sharedPrefs.getBool("bootSetup") ?? false;
+  }
+
+  Future<void> setWasSetupSuccessful(bool value) async {
+    await _sharedPrefs.setBool("bootSetup", value);
+    _preferencesUpdateStream.add(this);
+  }
 }
 
 final preferencesProvider = FutureProvider<Preferences>((ref) async {
@@ -145,6 +154,10 @@ final hasBeenConnectedProvider = _createPreferenceProvider(
   (preferences) => preferences.hasBeenConnected(),
 );
 
+final wasSetupSuccessfulProvider = _createPreferenceProvider(
+  (preferences) => preferences.wasSetupSuccessful(),
+);
+
 StreamProvider<T> _createPreferenceProvider<T>(
   T Function(Preferences preferences) mapper,
 ) {

diff --git a/lib/ui/setup/boot/rebble_setup_fail.dart b/lib/ui/setup/boot/rebble_setup_fail.dart
@@ -1,13 +1,16 @@
+import 'package:cobble/infrastructure/datasources/preferences.dart';
 import 'package:cobble/ui/home/home_page.dart';
 import 'package:cobble/ui/router/cobble_navigator.dart';
 import 'package:cobble/ui/router/cobble_scaffold.dart';
 import 'package:cobble/ui/router/cobble_screen.dart';
 import 'package:flutter/material.dart';
-import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 
-class RebbleSetupFail extends StatelessWidget implements CobbleScreen {
+class RebbleSetupFail extends HookWidget implements CobbleScreen {
   @override
   Widget build(BuildContext context) {
+    final preferences = useProvider(preferencesProvider);
     return CobbleScaffold.page(
       title: "Activate Rebble services",
       child: Column(
@@ -21,12 +24,9 @@ class RebbleSetupFail extends StatelessWidget implements CobbleScreen {
         ],
       ),
       floatingActionButton: FloatingActionButton.extended(
-          onPressed: () {
-            SharedPreferences.getInstance().then((prefs) {
-              prefs.setBool("bootSetup", false);
-            }).then((_) {
-              context.pushAndRemoveAllBelow(HomePage());
-            });
+          onPressed: () async {
+            await preferences.data?.value.setWasSetupSuccessful(false);
+            context.pushAndRemoveAllBelow(HomePage());
           },
           label: Text("OKAY")),
     );

diff --git a/lib/ui/setup/boot/rebble_setup_success.dart b/lib/ui/setup/boot/rebble_setup_success.dart
@@ -40,7 +40,7 @@ class RebbleSetupSuccess extends HookWidget implements CobbleScreen {
           onPressed: () {
             SharedPreferences.getInstance().then((prefs) async {
               await preferences.data?.value.setHasBeenConnected();
-              prefs.setBool("bootSetup", true);
+              await preferences.data?.value.setWasSetupSuccessful(true);
             }).then((_) {
               context.pushAndRemoveAllBelow(HomePage());
             });