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

Merge pull request 'bugfixes: contact lexosort, unread badges' (#85) from erinnfixes into trunk
continuous-integration/drone/push Build is passing Details 

Reviewed-on: #85
This commit is contained in:
Sarah Jamie Lewis 2021-05-12 21:36:17 -07:00
parent 7969d7e6b1 35417a8b24
commit 0cbfc4d0ca
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model.dart
View File

@ -98,7 +98,7 @@ class ContactListState extends ChangeNotifier {
contact.lastMessageTime = newVal; contact.lastMessageTime = newVal;
_contacts.sort((ContactInfoState a, ContactInfoState b) { _contacts.sort((ContactInfoState a, ContactInfoState b) {
if (a.lastMessageTime == null && b.lastMessageTime == null) return b.onion.compareTo(b.onion); if (a.lastMessageTime == null && b.lastMessageTime == null) return b.onion.compareTo(a.onion);
if (a.lastMessageTime == null) return 1; if (a.lastMessageTime == null) return 1;
if (b.lastMessageTime == null) return -1; if (b.lastMessageTime == null) return -1;
return b.lastMessageTime.compareTo(a.lastMessageTime); return b.lastMessageTime.compareTo(a.lastMessageTime);

35
lib/views/messageview.dart
View File

@ -39,20 +39,27 @@ class _MessageViewState extends State<MessageView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return WillPopScope(
appBar: AppBar( onWillPop: _onWillPop,
title: Text(Provider.of<ContactInfoState>(context).nickname), child: Scaffold(
actions: [ appBar: AppBar(
IconButton(icon: Icon(Icons.chat), onPressed: _pushContactSettings), title: Text(Provider.of<ContactInfoState>(context).nickname),
IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings), actions: [
IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings), IconButton(icon: Icon(Icons.chat), onPressed: _pushContactSettings),
IconButton(icon: Icon(Icons.settings), onPressed: _pushContactSettings), IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
IconButton(icon: Icon(Icons.bug_report_outlined), onPressed: _debugResetContact), IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings),
], IconButton(icon: Icon(Icons.settings), onPressed: _pushContactSettings),
), IconButton(icon: Icon(Icons.bug_report_outlined), onPressed: _debugResetContact),
body: Padding(padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 108.0), child: MessageList()), ],
bottomSheet: _buildComposeBox(), ),
); body: Padding(padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 108.0), child: MessageList()),
bottomSheet: _buildComposeBox(),
));
}
Future<bool> _onWillPop() async {
Provider.of<ContactInfoState>(context, listen: false).unreadMessages = 0;
return true;
} }
void _debugResetContact() { void _debugResetContact() {

1
lib/widgets/contactrow.dart
View File

@ -87,6 +87,7 @@ class _ContactRowState extends State<ContactRow> {
} }
void _pushMessageView(String handle) { void _pushMessageView(String handle) {
Provider.of<ProfileInfoState>(context).contactList.getContact(handle).unreadMessages = 0;
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute<void>( MaterialPageRoute<void>(
builder: (BuildContext builderContext) { builder: (BuildContext builderContext) {