Improvements

maelchiotti · Feb 6, 2024 · 0b14e29 · 0b14e29
1 parent 25e9260
commit 0b14e29
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 90 deletions.
diff --git a/lib/app.dart b/lib/app.dart
@@ -7,7 +7,6 @@ import 'package:localmaterialnotes/common/routing/router.dart';
 import 'package:localmaterialnotes/l10n/app_localizations.g.dart';
 import 'package:localmaterialnotes/utils/constants/constants.dart';
 import 'package:localmaterialnotes/utils/locale_manager.dart';
-import 'package:localmaterialnotes/utils/platform_manager.dart';
 import 'package:localmaterialnotes/utils/share_manager.dart';
 import 'package:localmaterialnotes/utils/theme_manager.dart';
 
@@ -23,17 +22,13 @@ class _AppState extends ConsumerState<App> {
   void initState() {
     super.initState();
 
-    if (kIsAndroidApp) {
-      readSharedData(ref);
-      _stream = listenSharedData(ref);
-    }
+    readSharedData(ref);
+    _stream = listenSharedData(ref);
   }
 
   @override
   void dispose() {
-    if (kIsAndroidApp) {
-      _stream.cancel();
-    }
+    _stream.cancel();
 
     super.dispose();
   }

diff --git a/lib/pages/bin/bin_page.dart b/lib/pages/bin/bin_page.dart
@@ -5,7 +5,7 @@ import 'package:localmaterialnotes/common/placeholders/error_placeholder.dart';
 import 'package:localmaterialnotes/common/placeholders/loading_placeholder.dart';
 import 'package:localmaterialnotes/common/widgets/note_tile.dart';
 import 'package:localmaterialnotes/providers/bin/bin_provider.dart';
-import 'package:localmaterialnotes/utils/constants/constants.dart';
+import 'package:localmaterialnotes/utils/constants/paddings.dart';
 
 class BinPage extends ConsumerStatefulWidget {
   const BinPage();
@@ -15,37 +15,26 @@ class BinPage extends ConsumerStatefulWidget {
 }
 
 class _BinPageState extends ConsumerState<BinPage> {
-  Future<void> _refresh() async {
-    await ref.read(binProvider.notifier).get();
-  }
-
   @override
   Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: _refresh,
-      child: ScrollConfiguration(
-        behavior: scrollBehavior,
-        child: ref.watch(binProvider).when(
-          data: (notes) {
-            if (notes.isEmpty) {
-              return EmptyPlaceholder.bin();
-            }
+    return ref.watch(binProvider).when(
+      data: (notes) {
+        if (notes.isEmpty) return EmptyPlaceholder.bin();
 
-            return ListView.builder(
-              itemCount: notes.length,
-              itemBuilder: (context, index) {
-                return NoteTile(notes[index]);
-              },
-            );
-          },
-          error: (error, stackTrace) {
-            return const ErrorPlaceholder();
-          },
-          loading: () {
-            return const LoadingPlaceholder();
+        return ListView.builder(
+          padding: Paddings.custom.fab,
+          itemCount: notes.length,
+          itemBuilder: (context, index) {
+            return NoteTile(notes[index]);
           },
-        ),
-      ),
+        );
+      },
+      error: (error, stackTrace) {
+        return const ErrorPlaceholder();
+      },
+      loading: () {
+        return const LoadingPlaceholder();
+      },
     );
   }
 }
diff --git a/lib/pages/notes/notes_page.dart b/lib/pages/notes/notes_page.dart
@@ -1,14 +1,11 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:localmaterialnotes/common/placeholders/empty_placeholder.dart';
 import 'package:localmaterialnotes/common/placeholders/error_placeholder.dart';
 import 'package:localmaterialnotes/common/placeholders/loading_placeholder.dart';
 import 'package:localmaterialnotes/common/widgets/note_tile.dart';
 import 'package:localmaterialnotes/providers/notes/notes_provider.dart';
-import 'package:localmaterialnotes/utils/constants/constants.dart';
-import 'package:localmaterialnotes/utils/platform_manager.dart';
+import 'package:localmaterialnotes/utils/constants/paddings.dart';
 import 'package:localmaterialnotes/utils/quick_actions_manager.dart';
 
 class NotesPage extends ConsumerStatefulWidget {
@@ -19,41 +16,28 @@ class NotesPage extends ConsumerStatefulWidget {
 }
 
 class _NotesPageState extends ConsumerState<NotesPage> {
-  Future<void> _refresh() async {
-    await ref.read(notesProvider.notifier).get();
-  }
-
   @override
   Widget build(BuildContext context) {
-    if (kIsAndroidApp) {
-      QuickActionsManager().init(context, ref);
-    }
+    QuickActionsManager().init(context, ref);
 
-    return RefreshIndicator(
-      onRefresh: _refresh,
-      child: ScrollConfiguration(
-        behavior: scrollBehavior,
-        child: ref.watch(notesProvider).when(
-          data: (notes) {
-            if (notes.isEmpty) {
-              return EmptyPlaceholder.notes();
-            }
+    return ref.watch(notesProvider).when(
+      data: (notes) {
+        if (notes.isEmpty) return EmptyPlaceholder.notes();
 
-            return ListView.builder(
-              itemCount: notes.length,
-              itemBuilder: (context, index) {
-                return NoteTile(notes[index]);
-              },
-            );
-          },
-          error: (error, stackTrace) {
-            return const ErrorPlaceholder();
-          },
-          loading: () {
-            return const LoadingPlaceholder();
+        return ListView.builder(
+          padding: Paddings.custom.fab,
+          itemCount: notes.length,
+          itemBuilder: (context, index) {
+            return NoteTile(notes[index]);
           },
-        ),
-      ),
+        );
+      },
+      error: (error, stackTrace) {
+        return const ErrorPlaceholder();
+      },
+      loading: () {
+        return const LoadingPlaceholder();
+      },
     );
   }
 }
diff --git a/lib/utils/constants/constants.dart b/lib/utils/constants/constants.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:localmaterialnotes/l10n/app_localizations.g.dart';
 import 'package:localmaterialnotes/utils/theme_manager.dart';
@@ -12,10 +10,3 @@ final navigatorKey = GlobalKey<NavigatorState>(debugLabel: 'Root navigator key')
 final drawerKey = GlobalKey<ScaffoldState>(debugLabel: 'Drawer key');
 
 final localizations = AppLocalizations.of(navigatorKey.currentContext!)!;
-
-final scrollBehavior = ScrollConfiguration.of(navigatorKey.currentContext!).copyWith(
-  dragDevices: {
-    PointerDeviceKind.touch,
-    PointerDeviceKind.mouse,
-  },
-);
diff --git a/lib/utils/platform_manager.dart b/lib/utils/platform_manager.dart