Format
continuous-integration/drone/pr Build is pending
Details
continuous-integration/drone/pr Build is pending
Details
This commit is contained in:
parent
825fb23992
commit
6210a64315
|
@ -99,10 +99,12 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
|
|
||||||
List<Widget> getActions(context) {
|
List<Widget> getActions(context) {
|
||||||
var actions = List<Widget>.empty(growable: true);
|
var actions = List<Widget>.empty(growable: true);
|
||||||
if (Provider.of<Settings>(context).blockUnknownConnections ) {
|
if (Provider.of<Settings>(context).blockUnknownConnections) {
|
||||||
actions.add(Tooltip(message: AppLocalizations.of(context)!.blockUnknownConnectionsEnabledDescription, child: Icon(CwtchIcons.block_unknown)));
|
actions.add(Tooltip(message: AppLocalizations.of(context)!.blockUnknownConnectionsEnabledDescription, child: Icon(CwtchIcons.block_unknown)));
|
||||||
}
|
}
|
||||||
actions.add( IconButton(icon: TorIcon(), onPressed: _pushTorStatus),);
|
actions.add(
|
||||||
|
IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
|
||||||
|
);
|
||||||
actions.add(IconButton(
|
actions.add(IconButton(
|
||||||
// need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
|
// 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),
|
icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
|
||||||
|
|
|
@ -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
|
||||||
|
? FloatingActionButton(
|
||||||
|
child: Icon(Icons.arrow_downward),
|
||||||
|
onPressed: () {
|
||||||
scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
|
scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
|
||||||
}) : null,
|
})
|
||||||
|
: 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,
|
||||||
|
@ -108,7 +112,9 @@ class _MessageViewState extends State<MessageView> {
|
||||||
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,
|
||||||
|
@ -210,7 +216,8 @@ class _MessageViewState extends State<MessageView> {
|
||||||
focusNode: FocusNode(),
|
focusNode: FocusNode(),
|
||||||
onKey: handleKeyPress,
|
onKey: handleKeyPress,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: EdgeInsets.all(8), child:TextFormField(
|
padding: EdgeInsets.all(8),
|
||||||
|
child: TextFormField(
|
||||||
key: Key('txtCompose'),
|
key: Key('txtCompose'),
|
||||||
controller: ctrlrCompose,
|
controller: ctrlrCompose,
|
||||||
focusNode: focusNode,
|
focusNode: focusNode,
|
||||||
|
|
Loading…
Reference in New Issue