From 5ba6dcedf3fd754145ba1d10a51b852d4f5c6c94 Mon Sep 17 00:00:00 2001 From: juan Date: Sat, 30 Aug 2025 01:10:11 -0400 Subject: [PATCH] small irrelevant updates --- lib/contact.dart | 2 -- lib/email.dart | 4 +++- lib/emailViewWeb.dart | 26 +++++++++++++------------- lib/home_page.dart | 26 ++++++++++++++++++-------- lib/main.dart | 16 ++-------------- lib/structs.dart | 2 +- 6 files changed, 37 insertions(+), 39 deletions(-) diff --git a/lib/contact.dart b/lib/contact.dart index 32b4dae..3829055 100644 --- a/lib/contact.dart +++ b/lib/contact.dart @@ -1,6 +1,4 @@ import 'package:flutter/material.dart'; -// import 'package:http/http.dart' as http; -// import 'package:flutter_html/flutter_html.dart'; class ContactsPage extends StatefulWidget { const ContactsPage({super.key}); diff --git a/lib/email.dart b/lib/email.dart index 05a1378..bae89c4 100644 --- a/lib/email.dart +++ b/lib/email.dart @@ -78,6 +78,8 @@ class _EmailListScreenState extends State selectedEmails[email].seen = read; ApiService() .markAsSeen(selectedEmails[email].id); //the remote or .json + print(selectedEmails[email].id); + } } else { //unread @@ -85,7 +87,7 @@ class _EmailListScreenState extends State selectedEmails[email].seen = read; ApiService() .markAsUnseen(selectedEmails[email].id); //the remote or .json - print(selectedEmails[email].subject); + print(selectedEmails[email].id); } } }); diff --git a/lib/emailViewWeb.dart b/lib/emailViewWeb.dart index a73c040..385af48 100644 --- a/lib/emailViewWeb.dart +++ b/lib/emailViewWeb.dart @@ -44,19 +44,18 @@ class _EmailViewState extends State { subject: widget.subject, rootAugment: localCollapsable.getAugmentRoot(), ); - - late CollapsableEmails localCollapsable = CollapsableEmails( - //change here - thread: widget.messages, //this wont work in serializable - // threadHTML: widget.emailContent, // old html - threadMarkdown: widget.emailContent, - threadIDs: widget.id, - targetJumpNumbering: _targetJumpNumbering, - targetViewspecs: _targetViewspecs, - targetFiltering: _queryFiltering, - nameOfDocument: widget.subject, - ); + late CollapsableEmails localCollapsable = CollapsableEmails( + //change here + thread: widget.messages, //this wont work in serializable + // threadHTML: widget.emailContent, // old html + threadMarkdown: widget.emailContent, + threadIDs: widget.id, + targetJumpNumbering: _targetJumpNumbering, + targetViewspecs: _targetViewspecs, + targetFiltering: _queryFiltering, + nameOfDocument: widget.subject, + ); final hardcodedMarkers = [ {'id': 'marker1', 'x': 50, 'y': 100}, @@ -75,6 +74,8 @@ class _EmailViewState extends State { .emailContent; //html of the email/ actually entire thread, gives me little space to play in between // i wonder if the other attributes change? because if so i have to add like some zooms in and out of the emails, as in collapse // _registerViewFactory(currentContent); + print("email content in Collapsable ${widget.emailContent}"); + } void _scrollToNumber(String spanId) { @@ -99,7 +100,6 @@ class _EmailViewState extends State { }); } - @override Widget build(BuildContext context) { ApiService.currThreadID = widget.id; diff --git a/lib/home_page.dart b/lib/home_page.dart index 5be194e..d4fe108 100644 --- a/lib/home_page.dart +++ b/lib/home_page.dart @@ -1,4 +1,5 @@ import 'package:crab_ui/sonicEmailView.dart'; +import 'package:go_router/go_router.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'folder_drawer.dart'; @@ -223,14 +224,22 @@ class _HomeScreenState extends State with TickerProviderStateMixin { leading: Icon(Icons.home), onTap: () { // Navigate to Home + context.go("/home"); }, ), - ListTile( - leading: Icon(Icons.settings), - onTap: () { - // Navigate to Settings - }, - ), + // ListTile( + // leading: Icon(Icons.settings), + // onTap: () { + // // Navigate to Settings + // }, + // ), + // ListTile( + // leading: Icon(Icons.contact_mail), + // onTap: () { + // // Navigate to Contacts + // }, + // ), + ListTile( leading: Icon(Icons.email), onTap: () { @@ -534,8 +543,9 @@ class _HomeScreenState extends State with TickerProviderStateMixin { "Selected folder: $selectedFolder"); // Store the selected folder or perform any action // ApiService.currFolder = selectedFolder!; - _emailPageKey.currentState! //the one selected - .moveSelectedOfFolder(selectedFolder!); + _emailPageKey + .currentState! //the one selected + .moveSelectedOfFolder(selectedFolder!); _overlayEntry ?.remove(); } else { diff --git a/lib/main.dart b/lib/main.dart index f5997de..935ce87 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -22,7 +22,6 @@ class HyM extends StatelessWidget { @override Widget build(BuildContext context) { final GoRouter _router = GoRouter( - // refreshListenable: , initialLocation: '/', routes: [ GoRoute( @@ -48,7 +47,8 @@ class HyM extends StatelessWidget { final target = state.pathParameters['target']!; final viewspecs = state.pathParameters['viewspecs']!; final emailId = state.pathParameters['emailID']!; - return Routinghandler.fromParameters("main anchor", subject, target, viewspecs, emailId); + return Routinghandler.fromParameters( + "main anchor", subject, target, viewspecs, emailId); }), ]); return MaterialApp.router( @@ -59,18 +59,6 @@ class HyM extends StatelessWidget { ), title: 'HyM', routerConfig: _router, - // home: HomeScreen(), - - // routes: { - // "/": (context) => SplashScreen(), - // "/login": (context) => const LoginPage(), - // "/home": (context) => HomeScreen(), - // "/contacts": (context) => ContactsPage(), - // GoRoute( - // path: - // ) - // "/email": (context) => EmailListScreen(), - // }, ); } } diff --git a/lib/structs.dart b/lib/structs.dart index 4b0a9ba..2499c57 100644 --- a/lib/structs.dart +++ b/lib/structs.dart @@ -81,7 +81,7 @@ class SerializableMessage { required this.subject, required this.date, required this.uid, - required this.list, //email list??? + required this.list, //folder required this.id, required this.in_reply_to, });