- First steps of onboarding.

plotsklapps · Jul 21, 2023 · f60a4b2 · f60a4b2
1 parent 55c7ce3
commit f60a4b2
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 164 deletions.
diff --git a/lib/all_imports.dart b/lib/all_imports.dart
@@ -32,6 +32,7 @@ export 'package:cosanostr/providers/theme_providers.dart';
 export 'package:cosanostr/responsive_layout.dart';
 export 'package:cosanostr/screens/feed_screen.dart';
 export 'package:cosanostr/screens/more_screen.dart';
+export 'package:cosanostr/screens/onboarding_screen.dart';
 export 'package:cosanostr/screens/profile_screen.dart';
 export 'package:cosanostr/screens/scaffold_screen.dart';
 export 'package:cosanostr/theme.dart';

diff --git a/lib/main.dart b/lib/main.dart
@@ -27,7 +27,7 @@ class MainEntry extends ConsumerWidget {
       darkTheme: ref.watch(darkThemeProvider),
       themeMode: ref.watch(themeModeProvider),
       // This is a first draft for responsiveness. Will be improved later.
-      home: const ResponsiveLayout(),
+      home: const OnboardingScreen(),
     );
   }
 }
diff --git a/lib/modals/deletekeys_modal.dart b/lib/modals/deletekeys_modal.dart
@@ -26,35 +26,34 @@ class DeleteKeysModal extends ConsumerWidget {
           Row(
             mainAxisAlignment: MainAxisAlignment.spaceEvenly,
             children: <Widget>[
-              ElevatedButton(
+              TextButton(
                 onPressed: () async {
                   await FeedScreenLogic().deleteKeysFromStorage(ref).then((_) {
                     if (!ref.watch(keysExistProvider)) {
                       Navigator.pop(context);
                       ScaffoldMessenger.of(context).showSnackBar(
-                        ScaffoldSnackBar(
-                          context: context,
-                          content: const Text('Keys successfully deleted!'),
+                        SnackBar(
+                          content: const Text(
+                            'Keys successfully deleted!',
+                          ),
+                          action: SnackBarAction(
+                            label: 'OK',
+                            onPressed: () {
+                              ScaffoldMessenger.of(context)
+                                  .hideCurrentSnackBar();
+                            },
+                          ),
                         ),
                       );
                     }
                   });
                 },
-                child: const Row(
-                  children: <Widget>[
-                    Icon(
-                      FontAwesomeIcons.solidTrashCan,
-                      color: Colors.red,
-                    ),
-                    SizedBox(width: 8.0),
-                    Text(
-                      'DELETE',
-                      style: TextStyle(color: Colors.red),
-                    ),
-                  ],
+                child: const Text(
+                  'DELETE',
+                  style: TextStyle(color: Colors.red),
                 ),
               ),
-              ElevatedButton(
+              TextButton(
                 onPressed: () {
                   Navigator.pop(context);
                 },

diff --git a/lib/screens/feed_screen.dart b/lib/screens/feed_screen.dart
@@ -3,11 +3,6 @@ import 'dart:ui';
 
 import 'package:cosanostr/all_imports.dart';
 
-final StateProvider<bool> isUserScrollingProvider =
-    StateProvider<bool>((StateProviderRef<bool> ref) {
-  return false;
-});
-
 class FeedScreen extends ConsumerStatefulWidget {
   const FeedScreen({super.key});
 
@@ -26,7 +21,6 @@ class FeedScreenState extends ConsumerState<FeedScreen>
     with AutomaticKeepAliveClientMixin {
   late Stream<Event> stream;
   final StreamController<Event> streamController = StreamController<Event>();
-  // final ScrollController scrollController = ScrollController();
 
   // Override the wantKeepAlive getter to return true.
   @override
@@ -37,33 +31,12 @@ class FeedScreenState extends ConsumerState<FeedScreen>
   @override
   void initState() {
     super.initState();
-
     // Get the keys from storage, connect to the relay and start
     // listening to the stream.
     Future<void>.delayed(Duration.zero, () async {
       await FeedScreenLogic().getKeysFromStorage(ref);
       await initStream();
     });
-    // Add a listener to the scrollController to check if the user
-    // is scrolling or not. If the user is scrolling, set the
-    // isUserScrollingProvider to true which in turn will change the FAB to
-    // a smaller version. If the user is not scrolling, set the
-    // isUserScrollingProvider to false which in turn will change the FAB to
-    // the extended version.
-    // scrollController.addListener(() {
-    //   if (scrollController.position.userScrollDirection ==
-    //       ScrollDirection.forward) {
-    //     ref.read(isUserScrollingProvider.notifier).state = true;
-    //   } else if (scrollController.position.userScrollDirection ==
-    //       ScrollDirection.reverse) {
-    //     ref.read(isUserScrollingProvider.notifier).state = true;
-    //   } else if (scrollController.position.userScrollDirection ==
-    //       ScrollDirection.idle) {
-    //     ref.read(isUserScrollingProvider.notifier).state = false;
-    //   } else {
-    //     ref.read(isUserScrollingProvider.notifier).state = false;
-    //   }
-    // });
   }
 
   @override
@@ -79,7 +52,6 @@ class FeedScreenState extends ConsumerState<FeedScreen>
       await initStream();
       await resubscribeStream();
     });
-    // ref.read(isUserScrollingProvider);
   }
 
   @override
@@ -89,7 +61,6 @@ class FeedScreenState extends ConsumerState<FeedScreen>
       await streamController.close();
     });
     ref.read(relayPoolProvider).close();
-    // scrollController.dispose();
     super.dispose();
   }
 
@@ -171,7 +142,6 @@ class FeedScreenState extends ConsumerState<FeedScreen>
               if (snapshot.hasData) {
                 // If the snapshot has data, build the list of nosts.
                 return ListView.builder(
-                  // controller: scrollController,
                   itemCount: ref.watch(eventsProvider).length,
                   itemBuilder: (BuildContext context, int index) {
                     final Event event = ref.watch(eventsProvider)[index];