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

android/ios-adaption feature, markdown, and augment #6

Merged
Juan merged 64 commits from android-adaption into main 2025-08-31 23:05:21 -04:00
Conversation 1 Commits 64 Files changed 71 +31 -25
2 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 42c97a5f5d - Show all commits

22
lib/augment.dart
View file

@ -237,13 +237,13 @@ class _DynamicClassesAugment extends State<EmailToolbar> {
// SizedBox(width: 8), // SizedBox(width: 8),
ElevatedButton( ElevatedButton(
onPressed: () => AugmentClasses() onPressed: () => AugmentClasses()
.handleCreateLink(context, widget.emails, widget.subject), .handleCreateLink(context, widget.emails, widget.subject, widget.emails[0]), //need to add the email ids
child: Text('Create Link'), child: Text('Create Link'),
), ),
ElevatedButton( ElevatedButton(
// onPressed: () => localAugment!.handlePaste(context), // onPressed: () => localAugment!.handlePaste(context),
onPressed: () => onPressed: () =>
AugmentClasses().handlePaste(context, widget.emails[0]), AugmentClasses().handlePaste(context),
child: Text('Paste Link'), child: Text('Paste Link'),
), ),
], ],
@ -552,14 +552,14 @@ class AugmentClasses {
} }
_copyLink(String anchor, String target, String format, String viewspecs, _copyLink(String anchor, String target, String format, String viewspecs,
String nameOfDocument) { String nameOfDocument, emailID) {
String form = "$anchor < $nameOfDocument, $target :$viewspecs >"; String form = "$anchor < $nameOfDocument, $target :$viewspecs > $emailID";
final link = ClipboardData(text: form); final link = ClipboardData(text: form);
Clipboard.setData(link); Clipboard.setData(link);
} }
Future<void> handleCreateLink(BuildContext context, Future<void> handleCreateLink(BuildContext context,
List<String> emailsInThread, String nameOfDocument) async { List<String> emailsInThread, String nameOfDocument, String emailID) async {
print("create link button pressed"); print("create link button pressed");
final TextEditingController targetController = TextEditingController(); final TextEditingController targetController = TextEditingController();
final TextEditingController anchorController = TextEditingController(); final TextEditingController anchorController = TextEditingController();
@ -670,7 +670,9 @@ class AugmentClasses {
targetController.text, targetController.text,
format, format,
viewspecsController.text, viewspecsController.text,
nameOfDocument), nameOfDocument,
emailID,
),
Navigator.of(context).pop() Navigator.of(context).pop()
}, },
child: Text("OK")), child: Text("OK")),
@ -682,7 +684,7 @@ class AugmentClasses {
)); ));
} }
Future<void> handlePaste(BuildContext context, String emailID) async { Future<void> handlePaste(BuildContext context) async {
final TextEditingController gotoLink = TextEditingController(); final TextEditingController gotoLink = TextEditingController();
Routinghandler localRouting; Routinghandler localRouting;
@ -716,18 +718,16 @@ class AugmentClasses {
ElevatedButton( ElevatedButton(
onPressed: () { onPressed: () {
print('pressed'); print('pressed');
// i need this shit to be processed into args
print("email_id given $emailID");
Navigator.of(context).pop(); Navigator.of(context).pop();
final localRouting = final localRouting =
Routinghandler(gotoLink.text, emailID); Routinghandler(gotoLink.text);
final String subject = final String subject =
localRouting.docName; // This is your :subject localRouting.docName; // This is your :subject
final String target = final String target =
localRouting.target; // This is your :target localRouting.target; // This is your :target
final String viewspecs = final String viewspecs =
localRouting.viewspecs; // This is your :viewspecs localRouting.viewspecs; // This is your :viewspecs
final String finalEmailID = emailID; final String finalEmailID = localRouting.emailID;
final encodedSubject = Uri.encodeComponent(subject); final encodedSubject = Uri.encodeComponent(subject);
final encodedTarget = Uri.encodeComponent(target); final encodedTarget = Uri.encodeComponent(target);

34
lib/routingHandler.dart
View file

@ -7,7 +7,7 @@ import 'api_service.dart';
import 'structs.dart'; import 'structs.dart';
class Routinghandler extends StatefulWidget { class Routinghandler extends StatefulWidget {
Routinghandler(String link, emailID) { Routinghandler(String link) {
bool anchorDone = false; bool anchorDone = false;
bool docNameDone = false; bool docNameDone = false;
@ -16,6 +16,8 @@ class Routinghandler extends StatefulWidget {
bool targetDone = false; bool targetDone = false;
bool emailIdDone = false;
for (int letter = 0; letter < link.length; letter++) { for (int letter = 0; letter < link.length; letter++) {
if (!anchorDone) { if (!anchorDone) {
if (link[letter] != '<') { if (link[letter] != '<') {
@ -44,6 +46,8 @@ class Routinghandler extends StatefulWidget {
} else { } else {
viewspecsDone = true; viewspecsDone = true;
} }
} else if (!emailIdDone) {
emailID += link[letter];
} }
} }
anchor = anchor.trim(); anchor = anchor.trim();
@ -55,11 +59,11 @@ class Routinghandler extends StatefulWidget {
} }
Routinghandler.fromParameters(String anchor, String docName, String target, Routinghandler.fromParameters(String anchor, String docName, String target,
String viewspecs, String emailID) { String viewspecs, String emailID) {
this.anchor = anchor; this.anchor = anchor;
this.docName = docName; this.docName = docName;
this.viewspecs = viewspecs; this.viewspecs = viewspecs;
this.target = target; this.target = target;
this.emailID = emailID; this.emailID = emailID;
} }
Routinghandler.copyConstructor(Routinghandler other) { Routinghandler.copyConstructor(Routinghandler other) {
anchor = other.anchor; anchor = other.anchor;
@ -201,14 +205,16 @@ class _RoutingHandlerState extends State<Routinghandler> {
), ),
), ),
Expanded( Expanded(
child: Align( child: Align(
alignment: Alignment.topLeft, alignment: Alignment.topLeft,
child: Wrap(children: [ child: Wrap(
MarkdownBlock( children: [
data: aug!.children![0]!.children![i]!.data ?? ''), MarkdownBlock(
],) data: aug!.children![0]!.children![i]!
) .data ??
), ''),
],
))),
Padding( Padding(
padding: const EdgeInsets.fromLTRB(0, 10, 5, 0), padding: const EdgeInsets.fromLTRB(0, 10, 5, 0),
child: Text( child: Text(