flutter
/
flutter_app
6
1
Fork 0
Code Issues 14 Pull Requests Releases 1 Wiki Activity

format

This commit is contained in:
erinn 2021-05-12 16:45:22 -07:00
parent 4cf3b4f6d5
commit 760458931a
6 changed files with 111 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/views/messageview.dart
View File

@ -81,18 +81,16 @@ class _MessageViewState extends State<MessageView> {
void _sendMessage([String ignoredParam]) {
ChatMessage cm = new ChatMessage(o: 1, d: ctrlrCompose.value.text);
Provider.of<FlwtchState>(context, listen: false).cwtch.SendMessage(
Provider.of<ContactInfoState>(context, listen: false).profileOnion,
Provider.of<ContactInfoState>(context, listen: false).onion,
jsonEncode(cm));
Provider.of<FlwtchState>(context, listen: false)
.cwtch
.SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, jsonEncode(cm));
_sendMessageHelper();
}
void _sendInvitation([String ignoredParam]) {
Provider.of<FlwtchState>(context, listen: false).cwtch.SendInvitation(
Provider.of<ContactInfoState>(context, listen: false).profileOnion,
Provider.of<ContactInfoState>(context, listen: false).onion,
this.selectedContact);
Provider.of<FlwtchState>(context, listen: false)
.cwtch
.SendInvitation(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, this.selectedContact);
_sendMessageHelper();
}
@ -121,7 +119,8 @@ class _MessageViewState extends State<MessageView> {
textInputAction: TextInputAction.send,
onSubmitted: _sendMessage,
)),
Column(children:[SizedBox(
Column(children: [
SizedBox(
width: 100,
height: 50,
child: Padding(
@ -135,9 +134,10 @@ class _MessageViewState extends State<MessageView> {
onPressed: _sendMessage,
))),
SizedBox(
width: 86, height: 40,
child: IconButton(icon: Icon(Icons.insert_invitation, size: 12, color: Provider.of<Settings>(context).theme.mainTextColor()), onPressed: () => _modalSendInvitation(context))
),])
width: 86,
height: 40,
child: IconButton(icon: Icon(Icons.insert_invitation, size: 12, color: Provider.of<Settings>(context).theme.mainTextColor()), onPressed: () => _modalSendInvitation(context))),
])
],
),
);
@ -165,10 +165,16 @@ class _MessageViewState extends State<MessageView> {
SizedBox(
height: 20,
),
ChangeNotifierProvider.value(value: Provider.of<ProfileInfoState>(ctx, listen: false), child: DropdownContacts(onChanged: (newVal) {
setState((){ this.selectedContact = newVal; });
ChangeNotifierProvider.value(
value: Provider.of<ProfileInfoState>(ctx, listen: false),
child: DropdownContacts(onChanged: (newVal) {
setState(() {
this.selectedContact = newVal;
});
})),
SizedBox(height: 20,),
SizedBox(
height: 20,
),
ElevatedButton(
child: Text(AppLocalizations.of(bcontext).inviteBtn, semanticsLabel: AppLocalizations.of(bcontext).inviteBtn),
onPressed: () {

11
lib/widgets/DropdownContacts.dart
View File

@ -8,7 +8,9 @@ import '../model.dart';
// Displays nicknames to UI but uses handles as values
// Pass an onChanged handler to access value
class DropdownContacts extends StatefulWidget {
DropdownContacts({this.onChanged,});
DropdownContacts({
this.onChanged,
});
final Function(dynamic) onChanged;
@override
@ -20,9 +22,12 @@ class _DropdownContactsState extends State<DropdownContacts> {
@override
Widget build(BuildContext context) {
return DropdownButton(value: this.selected, items: Provider.of<ProfileInfoState>(context, listen: false).contactList.contacts.map<DropdownMenuItem<String>>((ContactInfoState contact) {
return DropdownButton(
value: this.selected,
items: Provider.of<ProfileInfoState>(context, listen: false).contactList.contacts.map<DropdownMenuItem<String>>((ContactInfoState contact) {
return DropdownMenuItem<String>(value: contact.onion, child: Text(contact.nickname ?? contact.onion));
}).toList(), onChanged: (newVal) {
}).toList(),
onChanged: (newVal) {
setState(() {
this.selected = newVal;
});

34
lib/widgets/invitationbubble.dart
View File

@ -43,7 +43,9 @@ class InvitationBubbleState extends State<InvitationBubble> {
senderDisplayStr = contact.nickname ?? contact.onion;
}
}
var wdgSender = Center(widthFactor:1, child: SelectableText(senderDisplayStr + '\u202F',
var wdgSender = Center(
widthFactor: 1,
child: SelectableText(senderDisplayStr + '\u202F',
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor())));
// todo: translations
@ -52,9 +54,13 @@ class InvitationBubbleState extends State<InvitationBubble> {
//todo: get group name?
messageStr = "You sent an invitation for " + (isGroup ? "a group" : Provider.of<MessageState>(context).message ?? "");
} else {
messageStr = (isGroup ? "You have been invited to join "+(Provider.of<MessageState>(context).inviteNick??"") : "This is a contact suggestion for:") + "\n" + (Provider.of<MessageState>(context).inviteTarget ?? "");
messageStr = (isGroup ? "You have been invited to join " + (Provider.of<MessageState>(context).inviteNick ?? "") : "This is a contact suggestion for:") +
"\n" +
(Provider.of<MessageState>(context).inviteTarget ?? "");
}
var wdgMessage = Center(widthFactor:1, child: SelectableText(
var wdgMessage = Center(
widthFactor: 1,
child: SelectableText(
messageStr + '\u202F',
key: Key(myKey),
focusNode: _focus,
@ -72,10 +78,9 @@ class InvitationBubbleState extends State<InvitationBubble> {
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(prettyDate, style: TextStyle(
fontSize: 9.0,
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()
), textAlign: fromMe ? TextAlign.right : TextAlign.left),
Text(prettyDate,
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()),
textAlign: fromMe ? TextAlign.right : TextAlign.left),
!fromMe
? SizedBox(width: 1, height: 1)
: Provider.of<MessageState>(context).ackd
@ -88,7 +93,9 @@ class InvitationBubbleState extends State<InvitationBubble> {
} else if (this.rejected) {
wdgDecorations = Text("Rejected.");
} else {
wdgDecorations = Center(widthFactor:1,child:Row(children: [
wdgDecorations = Center(
widthFactor: 1,
child: Row(children: [
Padding(padding: EdgeInsets.all(5), child: TextButton(child: Text("Reject"), onPressed: _btnReject)),
Padding(padding: EdgeInsets.all(5), child: TextButton(child: Text("Accept"), onPressed: _btnAccept)),
]));
@ -110,10 +117,15 @@ class InvitationBubbleState extends State<InvitationBubble> {
bottomRight: fromMe ? Radius.zero : Radius.circular(borderRadiousEh),
),
),
child: Center(widthFactor: 1.0,child:Padding(
child: Center(
widthFactor: 1.0,
child: Padding(
padding: EdgeInsets.all(9.0),
child: Row(mainAxisSize: MainAxisSize.min, children: [Center(widthFactor: 1,child: Padding(padding:EdgeInsets.all(4), child:Icon(Icons.group_add, size: 32))),
Center(widthFactor: 1.0,child: Column(
child: Row(mainAxisSize: MainAxisSize.min, children: [
Center(widthFactor: 1, child: Padding(padding: EdgeInsets.all(4), child: Icon(Icons.group_add, size: 32))),
Center(
widthFactor: 1.0,
child: Column(
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,

9
lib/widgets/messagerow.dart
View File

@ -24,7 +24,8 @@ class _MessageRowState extends State<MessageRow> {
Widget build(BuildContext context) {
var fromMe = Provider.of<MessageState>(context).senderOnion == Provider.of<ProfileInfoState>(context).onion;
Widget wdgBubble = Flexible(flex: 3, fit: FlexFit.loose, child: Provider.of<MessageState>(context).loaded == true ? widgetForOverlay(Provider.of<MessageState>(context).overlay) : MessageLoadingBubble());
Widget wdgBubble =
Flexible(flex: 3, fit: FlexFit.loose, child: Provider.of<MessageState>(context).loaded == true ? widgetForOverlay(Provider.of<MessageState>(context).overlay) : MessageLoadingBubble());
Widget wdgIcons = Icon(Icons.delete_forever_outlined, color: Provider.of<Settings>(context).theme.dropShadowColor());
Widget wdgSpacer = Expanded(child: SizedBox(width: 60, height: 10));
var widgetRow = <Widget>[];
@ -58,9 +59,11 @@ class _MessageRowState extends State<MessageRow> {
Widget widgetForOverlay(int o) {
switch (o) {
case 1: return MessageBubble();
case 1:
return MessageBubble();
case 100:
case 101: return InvitationBubble();
case 101:
return InvitationBubble();
}
return null;
}