From 65a70cd8de6db0f6895eaecde0affc689f3c95db Mon Sep 17 00:00:00 2001 From: jantunesmessias Date: Mon, 17 Feb 2025 09:57:46 -0300 Subject: [PATCH] WIP --- .vscode/launch.json | 15 ++++++++++++--- .../documents/document_page_bloc.dart | 19 +++++-------------- .../documents/document_page_model.dart | 1 + ...reen.dart => document_screen_manager.dart} | 0 ...creen.dart => document_screen_viewer.dart} | 6 ++++-- lib/features/documents/index.dart | 4 ++-- .../widgets/{view => }/carousel_view.dart | 0 lib/shared/widgets/{view => }/list_view.dart | 0 .../{viewer/viewer.dart => read_view.dart} | 10 +++++----- lib/shared/widgets/widgets.dart | 8 +++----- 10 files changed, 32 insertions(+), 31 deletions(-) rename lib/features/documents/{document_manager_screen.dart => document_screen_manager.dart} (100%) rename lib/features/documents/{document_viewer_screen.dart => document_screen_viewer.dart} (90%) rename lib/shared/widgets/{view => }/carousel_view.dart (100%) rename lib/shared/widgets/{view => }/list_view.dart (100%) rename lib/shared/widgets/{viewer/viewer.dart => read_view.dart} (93%) diff --git a/.vscode/launch.json b/.vscode/launch.json index fb1433dc..6635646f 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,20 +9,29 @@ "request": "launch", "type": "dart", "args": [ - "--no-enable-impeller" + "--no-enable-impeller", + " --enable-experiment=macros" ] }, { "name": "flutter-freaccesss-hub (profile mode)", "request": "launch", "type": "dart", - "flutterMode": "profile" + "flutterMode": "profile", + "args": [ + "--no-enable-impeller", + " --enable-experiment=macros" + ] }, { "name": "flutter-freaccesss-hub (release mode)", "request": "launch", "type": "dart", - "flutterMode": "release" + "flutterMode": "release", + "args": [ + "--no-enable-impeller", + " --enable-experiment=macros" + ] } ] } \ No newline at end of file diff --git a/lib/features/documents/document_page_bloc.dart b/lib/features/documents/document_page_bloc.dart index 235718de..3a20209f 100644 --- a/lib/features/documents/document_page_bloc.dart +++ b/lib/features/documents/document_page_bloc.dart @@ -15,10 +15,7 @@ class DocumentPageBloc extends Bloc { } static DocumentPageBloc create(DocumentPageModel model) { - final initialState = DocumentPageState( - categories: [], - documents: [], - ); + final initialState = DocumentPageState(); return DocumentPageBloc._(model, initialState); } @@ -66,15 +63,15 @@ class DocumentPageBloc extends Bloc { Future _unselectDocument( UnselectDocumentEvent event, Emitter emit) async { - final docs = await model.generateDocuments(state.page, state.query); - final cats = await model.generateCategories(); + // final docs = await model.generateDocuments(state.page, state.query); + // final cats = await model.generateCategories(); emit( state.copyWith( currentDocument: null, isDocumentSelected: false, - documents: docs.$2, - categories: cats, + // documents: docs.$2, + // categories: cats, ), ); } @@ -113,18 +110,14 @@ class DocumentPageState { final int? count; final dynamic page; final Query? query; - final List documents; - final List categories; const DocumentPageState({ this.query, this.count, this.page, this.uri, - required this.documents, this.currentDocument, this.isCategorySelected = false, - required this.categories, this.currentCategory, this.isDocumentSelected = false, }); @@ -147,11 +140,9 @@ class DocumentPageState { count: count ?? this.count, page: page ?? this.page, // - documents: documents ?? this.documents, currentDocument: currentDocument ?? this.currentDocument, isDocumentSelected: isDocumentSelected ?? this.isDocumentSelected, // - categories: categories ?? this.categories, currentCategory: currentCategory ?? this.currentCategory, isCategorySelected: isCategorySelected ?? this.isCategorySelected, ); diff --git a/lib/features/documents/document_page_model.dart b/lib/features/documents/document_page_model.dart index f8e3d25b..482bfb3d 100644 --- a/lib/features/documents/document_page_model.dart +++ b/lib/features/documents/document_page_model.dart @@ -36,6 +36,7 @@ class DocumentPageModel extends FlutterFlowModel { /// [documentItemBuilder] DocumentItem documentItemBuilder( BuildContext context, T item, int index) { + print('ItemBuilder -> $index'); return DocumentItem( document: item, onPressed: onView, diff --git a/lib/features/documents/document_manager_screen.dart b/lib/features/documents/document_screen_manager.dart similarity index 100% rename from lib/features/documents/document_manager_screen.dart rename to lib/features/documents/document_screen_manager.dart diff --git a/lib/features/documents/document_viewer_screen.dart b/lib/features/documents/document_screen_viewer.dart similarity index 90% rename from lib/features/documents/document_viewer_screen.dart rename to lib/features/documents/document_screen_viewer.dart index da3ce95e..b54bfa55 100644 --- a/lib/features/documents/document_viewer_screen.dart +++ b/lib/features/documents/document_screen_viewer.dart @@ -17,7 +17,9 @@ class DocumentViewScreen extends StatefulScreen { class _DocumentViewScreenState extends ScreenState { @override Widget build(BuildContext context) { - action() => context.read().add(UnselectDocumentEvent()); + action() { + context.read().add(UnselectDocumentEvent()); + } final String title = widget.doc.description; final theme = FlutterFlowTheme.of(context); @@ -35,7 +37,7 @@ class _DocumentViewScreenState extends ScreenState { Widget buildBody(BuildContext context) { // final PDFViewerKey _viewerKey = PDFViewerKey(); - return PDFViewer( + return ReadView( // search: _viewerKey, title: widget.doc.description, url: widget.uri.toString(), diff --git a/lib/features/documents/index.dart b/lib/features/documents/index.dart index 49d30dfc..d3648a6d 100644 --- a/lib/features/documents/index.dart +++ b/lib/features/documents/index.dart @@ -14,9 +14,9 @@ import 'package:hub/shared/widgets/widgets.dart'; import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart'; import 'package:share_plus/share_plus.dart'; -part 'document_manager_screen.dart'; part 'document_page_widget.dart'; -part 'document_viewer_screen.dart'; +part 'document_screen_manager.dart'; +part 'document_screen_viewer.dart'; part 'document_page_model.dart'; part 'document_item_component.dart'; part 'document_page_bloc.dart'; diff --git a/lib/shared/widgets/view/carousel_view.dart b/lib/shared/widgets/carousel_view.dart similarity index 100% rename from lib/shared/widgets/view/carousel_view.dart rename to lib/shared/widgets/carousel_view.dart diff --git a/lib/shared/widgets/view/list_view.dart b/lib/shared/widgets/list_view.dart similarity index 100% rename from lib/shared/widgets/view/list_view.dart rename to lib/shared/widgets/list_view.dart diff --git a/lib/shared/widgets/viewer/viewer.dart b/lib/shared/widgets/read_view.dart similarity index 93% rename from lib/shared/widgets/viewer/viewer.dart rename to lib/shared/widgets/read_view.dart index 94861cd1..0688906c 100644 --- a/lib/shared/widgets/viewer/viewer.dart +++ b/lib/shared/widgets/read_view.dart @@ -1,4 +1,4 @@ -part of '../widgets.dart'; +part of 'widgets.dart'; // typedef PDFViewerKey = GlobalKey; @@ -18,21 +18,21 @@ abstract interface class Viewer extends StatelessComponent { Widget buildViewer(BuildContext context); } -class PDFViewer extends StatefulWidget { +class ReadView extends StatefulWidget { final String url; final String title; - const PDFViewer({ + const ReadView({ super.key, required this.url, required this.title, }); @override - State createState() => PDFViewerState(); + State createState() => ReadViewState(); } -class PDFViewerState extends State { +class ReadViewState extends State { late PdfController _pdfController; Future _initializePdf() async { diff --git a/lib/shared/widgets/widgets.dart b/lib/shared/widgets/widgets.dart index ba41d526..0edd1805 100644 --- a/lib/shared/widgets/widgets.dart +++ b/lib/shared/widgets/widgets.dart @@ -22,10 +22,8 @@ part 'model.dart'; part 'entity.dart'; /// [View]'s -part 'view/list_view.dart'; -part 'view/carousel_view.dart'; - -/// [Viewer] -part 'viewer/viewer.dart'; +part 'list_view.dart'; +part 'carousel_view.dart'; +part 'read_view.dart'; part 'text.dart';