From 0b14e29c2d8295573569abbcd0ff9953c8b9de68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Chiotti?= <44336112+maelchiotti@users.noreply.github.com> Date: Tue, 6 Feb 2024 20:22:21 +0100 Subject: [PATCH] Improvements --- lib/app.dart | 11 ++----- lib/pages/bin/bin_page.dart | 45 ++++++++++---------------- lib/pages/notes/notes_page.dart | 52 +++++++++++------------------- lib/utils/constants/constants.dart | 9 ------ lib/utils/platform_manager.dart | 11 ------- 5 files changed, 38 insertions(+), 90 deletions(-) delete mode 100644 lib/utils/platform_manager.dart diff --git a/lib/app.dart b/lib/app.dart index 08c92d5a..1a5f6760 100644 --- 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 { 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 index 8736a9b3..ab565c55 100644 --- 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 { - Future _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 index 8e46f9c1..b563713e 100644 --- a/lib/pages/notes/notes_page.dart +++ b/lib/pages/notes/notes_page.dart @@ -1,5 +1,3 @@ -import 'dart:async'; - import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:localmaterialnotes/common/placeholders/empty_placeholder.dart'; @@ -7,8 +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/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 { - Future _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 index d21a98ab..944b2a74 100644 --- 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(debugLabel: 'Root navigator key') final drawerKey = GlobalKey(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 deleted file mode 100644 index a5b640a1..00000000 --- a/lib/utils/platform_manager.dart +++ /dev/null @@ -1,11 +0,0 @@ -import 'dart:io'; - -import 'package:flutter/foundation.dart'; - -final bool kIsMobile = kIsWeb - ? defaultTargetPlatform == TargetPlatform.android || defaultTargetPlatform == TargetPlatform.iOS - : Platform.isAndroid || Platform.isIOS; - -final bool kIsDesktop = !kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS); - -final bool kIsAndroidApp = !kIsWeb && Platform.isAndroid;