mvaneerde
/
cwtch-ui
forked from cwtch.im/cwtch-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Block Unknown Connections Indicator' (#154) from blockunknown into trunk 

Reviewed-on: cwtch.im/cwtch-ui#154
Reviewed-by: erinn <erinn@openprivacy.ca>
This commit is contained in:
erinn 2021-08-26 21:58:49 +00:00
parent a06815fa08 6210a64315
commit 397971a181
2 changed files with 64 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/views/contactsview.dart
View File

@ -87,18 +87,7 @@ class _ContactsViewState extends State<ContactsView> {
child: Text("%1 » %2".replaceAll("%1", Provider.of<ProfileInfoState>(context).nickname).replaceAll("%2", AppLocalizations.of(context)!.titleManageContacts), child: Text("%1 » %2".replaceAll("%1", Provider.of<ProfileInfoState>(context).nickname).replaceAll("%2", AppLocalizations.of(context)!.titleManageContacts),
overflow: TextOverflow.ellipsis, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor()))), overflow: TextOverflow.ellipsis, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor()))),
])), ])),
actions: [ actions: getActions(context),
IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
IconButton(
// need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
onPressed: () {
Provider.of<ContactListState>(context, listen: false).filter = "";
setState(() {
showSearchBar = !showSearchBar;
});
})
],
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
onPressed: _pushAddContact, onPressed: _pushAddContact,
@ -108,6 +97,26 @@ class _ContactsViewState extends State<ContactsView> {
body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList()); body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList());
} }
List<Widget> getActions(context) {
var actions = List<Widget>.empty(growable: true);
if (Provider.of<Settings>(context).blockUnknownConnections) {
actions.add(Tooltip(message: AppLocalizations.of(context)!.blockUnknownConnectionsEnabledDescription, child: Icon(CwtchIcons.block_unknown)));
}
actions.add(
IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
);
actions.add(IconButton(
// need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
onPressed: () {
Provider.of<ContactListState>(context, listen: false).filter = "";
setState(() {
showSearchBar = !showSearchBar;
});
}));
return actions;
}
Widget _buildFilterable() { Widget _buildFilterable() {
Widget txtfield = CwtchTextField( Widget txtfield = CwtchTextField(
controller: ctrlrFilter, controller: ctrlrFilter,

79
lib/views/messageview.dart
View File

@ -78,9 +78,13 @@ class _MessageViewState extends State<MessageView> {
return WillPopScope( return WillPopScope(
onWillPop: _onWillPop, onWillPop: _onWillPop,
child: Scaffold( child: Scaffold(
floatingActionButton: appState.unreadMessagesBelow ? FloatingActionButton(child: Icon(Icons.arrow_downward), onPressed: (){ floatingActionButton: appState.unreadMessagesBelow
scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600)); ? FloatingActionButton(
}) : null, child: Icon(Icons.arrow_downward),
onPressed: () {
scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
})
: null,
appBar: AppBar( appBar: AppBar(
// setting leading to null makes it do the default behaviour; container() hides it // setting leading to null makes it do the default behaviour; container() hides it
leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null, leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null,
@ -106,9 +110,11 @@ class _MessageViewState extends State<MessageView> {
//IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings), //IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
//IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings), //IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings),
IconButton( IconButton(
icon: Icon(CwtchIcons.send_invite, size: 24), icon: Icon(CwtchIcons.send_invite, size: 24),
tooltip: AppLocalizations.of(context)!.sendInvite, tooltip: AppLocalizations.of(context)!.sendInvite,
onPressed: (){_modalSendInvitation(context);}), onPressed: () {
_modalSendInvitation(context);
}),
IconButton( IconButton(
icon: Provider.of<ContactInfoState>(context, listen: false).isGroup == true ? Icon(CwtchIcons.group_settings_24px) : Icon(CwtchIcons.peer_settings_24px), icon: Provider.of<ContactInfoState>(context, listen: false).isGroup == true ? Icon(CwtchIcons.group_settings_24px) : Icon(CwtchIcons.peer_settings_24px),
tooltip: AppLocalizations.of(context)!.conversationSettings, tooltip: AppLocalizations.of(context)!.conversationSettings,
@ -204,36 +210,37 @@ class _MessageViewState extends State<MessageView> {
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Container( child: Container(
decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))), decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
child: RawKeyboardListener( child: RawKeyboardListener(
focusNode: FocusNode(), focusNode: FocusNode(),
onKey: handleKeyPress, onKey: handleKeyPress,
child: Padding( child: Padding(
padding: EdgeInsets.all(8), child:TextFormField( padding: EdgeInsets.all(8),
key: Key('txtCompose'), child: TextFormField(
controller: ctrlrCompose, key: Key('txtCompose'),
focusNode: focusNode, controller: ctrlrCompose,
autofocus: !Platform.isAndroid, focusNode: focusNode,
textInputAction: TextInputAction.newline, autofocus: !Platform.isAndroid,
keyboardType: TextInputType.multiline, textInputAction: TextInputAction.newline,
enableIMEPersonalizedLearning: false, keyboardType: TextInputType.multiline,
minLines: 1, enableIMEPersonalizedLearning: false,
maxLines: null, minLines: 1,
onFieldSubmitted: _sendMessage, maxLines: null,
enabled: !isOffline, onFieldSubmitted: _sendMessage,
decoration: InputDecoration( enabled: !isOffline,
hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage, decoration: InputDecoration(
hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()), hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
enabledBorder: InputBorder.none, hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
focusedBorder: InputBorder.none, enabledBorder: InputBorder.none,
enabled: true, focusedBorder: InputBorder.none,
suffixIcon: ElevatedButton( enabled: true,
style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()), suffixIcon: ElevatedButton(
child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()), style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()),
onPressed: isOffline ? null : _sendMessage, child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
))), onPressed: isOffline ? null : _sendMessage,
)))), ))),
)))),
], ],
), ),
); );