Juan/hym_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: Juan:29f18b6876c5f84c65288d0993d27a870cbfa711
Branches Tags
Juan:main
Juan:android-adaption
Juan:login
..
compare: Juan:95697efdab0b74fc113ddd789e47022adef51efc
Branches Tags
Juan:android-adaption
Juan:main
Juan:login

No commits in common. "29f18b6876c5f84c65288d0993d27a870cbfa711" and "95697efdab0b74fc113ddd789e47022adef51efc" have entirely different histories.
29f18b6876 ... 95697efdab

2 changed files with 79 additions and 79 deletions
Show Stats Expand all files Collapse all files

54
lib/api_service.dart
View File

@ -7,6 +7,7 @@ import 'dart:typed_data';
import 'package:pointer_interceptor/pointer_interceptor.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'collapsableEmails.dart'; import 'collapsableEmails.dart';
import 'structs.dart'; import 'structs.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
@ -155,7 +156,6 @@ class ApiService {
Future<List<SerializableMessage>> threadsInSerializable( Future<List<SerializableMessage>> threadsInSerializable(
String thread_id) async { String thread_id) async {
//actually a number
// grab all of the emails in thread anyways, for the future it'll come in handy // grab all of the emails in thread anyways, for the future it'll come in handy
var url = Uri.http('$ip:$port', 'get_thread_messages', {'id': thread_id}); var url = Uri.http('$ip:$port', 'get_thread_messages', {'id': thread_id});
try { try {
@ -462,40 +462,44 @@ class _EmailViewState extends State<EmailView> {
{'id': 'marker2', 'x': 150, 'y': 200}, {'id': 'marker2', 'x': 150, 'y': 200},
{'id': 'marker3', 'x': 250, 'y': 300}, {'id': 'marker3', 'x': 250, 'y': 300},
]; ];
ApiService _apiService = ApiService();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
print("thread id? ${widget.id}");
List<String> currentContent = widget List<String> currentContent = widget
.emailContent; //html of the email/ actually entire thread, gives me little space to play in between .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 // 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); // viewTypeId = "iframe-${DateTime.now().millisecondsSinceEpoch}";
_registerViewFactory(currentContent);
// _markerPositionsFuture = ApiService().getMarkerPosition();
} }
// void _registerViewFactory(List<String> currentContent) { // i think this doesnt work anymore void _registerViewFactory(List<String> currentContent) {
// setState(() { //update to do item per item setState(() { //update to do item per item
// // each item to have itsviewtype ID // each item to have itsviewtype ID
// // is this necessarey here?? // is this necessarey here??
// //could just move to collapsable //could just move to collapsable
// viewTypeId = 'iframe-${DateTime.now().millisecondsSinceEpoch}';
// final emailHTML = web.document.createElement('div') as web.HTMLDivElement
// ..id = viewTypeId
// ..innerHTML = currentContent[0].toJS; // temporarily index because it has to do all of them
// emailHTML.style
// ..width = '100%'
// ..height = '100%'
// ..overflow = 'auto'
// ..scrollBehavior = 'smooth';
// ui.platformViewRegistry.registerViewFactory(
// viewTypeId, viewTypeId = 'iframe-${DateTime.now().millisecondsSinceEpoch}';
// (int viewId) => emailHTML, final emailHTML = web.document.createElement('div') as web.HTMLDivElement
// ); ..id = viewTypeId
// }); ..innerHTML = currentContent[0].toJS; // temporarily index because it has to do all of them
// } emailHTML.style
..width = '100%'
..height = '100%'
..overflow = 'auto'
..scrollBehavior = 'smooth';
ui.platformViewRegistry.registerViewFactory(
viewTypeId,
(int viewId) => emailHTML,
);
});
}
void _scrollToNumber(String spanId) { void _scrollToNumber(String spanId) {
AugmentClasses.handleJump(spanId); AugmentClasses.handleJump(spanId);
@ -504,7 +508,7 @@ class _EmailViewState extends State<EmailView> {
// TODO: void _invisibility(String ) //to make purple numbers not visible // TODO: void _invisibility(String ) //to make purple numbers not visible
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
// print("thread id ${widget.id}"); // print("thread id ${widget.id}");
ApiService.currThreadID = widget.id; ApiService.currThreadID = widget.id;
return Scaffold( return Scaffold(
@ -576,10 +580,8 @@ class _EmailViewState extends State<EmailView> {
), ),
Expanded( Expanded(
child: CollapsableEmails( child: CollapsableEmails(
//change here
thread: widget.messages, thread: widget.messages,
threadHTML: widget.emailContent, threadHTML: widget.emailContent,
threadIDs: widget.id,
), ),
), ),
// Expanded( // Expanded(

104
lib/collapsableEmails.dart
View File

@ -8,12 +8,8 @@ import 'structs.dart';
class CollapsableEmails extends StatefulWidget { class CollapsableEmails extends StatefulWidget {
final List<String> thread; // email id's in the form xyz@gmail.com final List<String> thread; // email id's in the form xyz@gmail.com
final List<String> threadHTML; final List<String> threadHTML;
final String threadIDs;
CollapsableEmails( CollapsableEmails({required this.thread, required this.threadHTML});
{required this.thread,
required this.threadHTML,
required this.threadIDs});
@override @override
State<CollapsableEmails> createState() => _CollapsableEmailsState(); State<CollapsableEmails> createState() => _CollapsableEmailsState();
@ -25,15 +21,12 @@ class _CollapsableEmailsState extends State<CollapsableEmails> {
Set<int> _expandedEmails = {}; //open emails Set<int> _expandedEmails = {}; //open emails
List viewtypeIDs = []; //IDs of the viewtypes, order matters List viewtypeIDs = []; //IDs of the viewtypes, order matters
List heightOfViewTypes = []; //the height of each viewtype List heightOfViewTypes = []; //the height of each viewtype
List<SerializableMessage> emailsInThread = [];
bool _isLoaded = false;
@override @override
void initState() { void initState() {
// TODO: implement initState // TODO: implement initState
super.initState(); super.initState();
_registerViewFactory(widget.threadHTML); _registerViewFactory(widget.threadHTML);
_serializableData(widget.threadIDs);
} }
void _registerViewFactory(List<String> currentContent) async { void _registerViewFactory(List<String> currentContent) async {
@ -77,56 +70,61 @@ class _CollapsableEmailsState extends State<CollapsableEmails> {
viewtypeIDs.add(viewTypeId); viewtypeIDs.add(viewTypeId);
heightOfViewTypes.add(heightOfEmail); heightOfViewTypes.add(heightOfEmail);
} }
}
void _serializableData(String threadID) async { // viewTypeId = 'iframe-${DateTime.now().millisecondsSinceEpoch}';
emailsInThread = await ApiService().threadsInSerializable(threadID); // final emailHTML = web.document.createElement('div') as web.HTMLDivElement
print("done thread serializable"); // ..id = viewTypeId
if (!mounted) return; // ..innerHTML = currentContent[0].toJS; // temporarily index because it has to do all of them
setState(() { // emailHTML.style
_isLoaded = true; // ..width = '100%'
}); // ..height = '100%'
// ..overflow = 'auto'
// ..scrollBehavior = 'smooth';
// ui.platformViewRegistry.registerViewFactory(
// viewTypeId,
// (int viewId) => emailHTML,
// );
// });
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return _isLoaded return Column(children: [
?Column(children: [ Expanded(
Expanded( child: ListView.builder(
child: ListView.builder( itemCount: widget.thread.length,
itemCount: widget.thread.length, itemBuilder: (context, index) {
itemBuilder: (context, index) { final isExpanded =
final isExpanded = _expandedEmails.contains(index); //check if email is expanded
_expandedEmails.contains(index); //check if email is expanded return Column(
return Column( children: [
children: [ ListTile(
ListTile( title: Text("email $index"),
title: Text(emailsInThread[index].from), onTap: () {
trailing: Text(emailsInThread[index].date), setState(() {
onTap: () { if (isExpanded) {
setState(() { _expandedEmails.remove(index);
if (isExpanded) { } else {
_expandedEmails.remove(index); _expandedEmails.add(index);
} else { }
_expandedEmails.add(index); });
} },
}); ),
}, if (isExpanded)
// if(viewtypeIDs[index] == null || heightOfViewTypes[index] == null)
// const SizedBox(height: 100, child: Center(child: CircularProgressIndicator())),
SizedBox(
height:heightOfViewTypes[index].toDouble(),
child: HtmlElementView(
key: UniqueKey(), viewType: viewtypeIDs[index]),
), ),
if (isExpanded) Divider(),
// if(viewtypeIDs[index] == null || heightOfViewTypes[index] == null) ],
// const SizedBox(height: 100, child: Center(child: CircularProgressIndicator())), );
SizedBox( },
height: heightOfViewTypes[index].toDouble(), ),
child: HtmlElementView( )
key: UniqueKey(), viewType: viewtypeIDs[index]), ]);
),
Divider(),
],
);
},
),
)
]): const Center(child:CircularProgressIndicator());
} }
} }