GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-30 16:29:30 +01:00
Code Issues Projects Releases Wiki Activity

design: Use outlined icons

Browse Source
This commit is contained in:
Christian Pauly 2020-12-06 10:31:35 +01:00
parent 0244d0b179
commit adb445f668
27 changed files with 112 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/components/content_banner.dart
View File

@ -64,7 +64,7 @@ class ContentBanner extends StatelessWidget {
child: FloatingActionButton( child: FloatingActionButton(
mini: true, mini: true,
backgroundColor: Theme.of(context).primaryColor, backgroundColor: Theme.of(context).primaryColor,
child: Icon(Icons.camera_alt), child: Icon(Icons.camera_alt_outlined),
onPressed: onEdit, onPressed: onEdit,
), ),
), ),

2
lib/components/dialogs/key_verification_dialog.dart
View File

@ -236,7 +236,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
case KeyVerificationState.done: case KeyVerificationState.done:
body = Column( body = Column(
children: <Widget>[ children: <Widget>[
Icon(Icons.check_circle, color: Colors.green, size: 200.0), Icon(Icons.check_circle_outlined, color: Colors.green, size: 200.0),
SizedBox(height: 10), SizedBox(height: 10),
Text( Text(
L10n.of(context).verifySuccess, L10n.of(context).verifySuccess,

2
lib/components/dialogs/recording_dialog.dart
View File

@ -90,7 +90,7 @@ class _RecordingDialogState extends State<RecordingDialog> {
children: <Widget>[ children: <Widget>[
Text(L10n.of(context).send.toUpperCase()), Text(L10n.of(context).send.toUpperCase()),
SizedBox(width: 4), SizedBox(width: 4),
Icon(Icons.send, size: 15), Icon(Icons.send_outlined, size: 15),
], ],
), ),
onPressed: () async { onPressed: () async {

8
lib/components/encryption_button.dart
View File

@ -94,8 +94,12 @@ class _EncryptionButtonState extends State<EncryptionButton> {
color = null; color = null;
} }
return IconButton( return IconButton(
icon: Icon(widget.room.encrypted ? Icons.lock : Icons.lock_open, icon: Icon(
size: 20, color: color), widget.room.encrypted
? Icons.lock_outlined
: Icons.lock_open_outlined,
size: 20,
color: color),
onPressed: _enableEncryptionAction, onPressed: _enableEncryptionAction,
); );
}); });

2
lib/components/list_items/chat_list_item.dart
View File

@ -197,7 +197,7 @@ class ChatListItem extends StatelessWidget {
}, },
if (typingText.isNotEmpty) ...{ if (typingText.isNotEmpty) ...{
Icon( Icon(
Icons.edit, Icons.edit_outlined,
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
size: 14, size: 14,
), ),

2
lib/components/list_items/message.dart
View File

@ -261,7 +261,7 @@ class _MetaRow extends StatelessWidget {
Padding( Padding(
padding: const EdgeInsets.only(left: 2.0), padding: const EdgeInsets.only(left: 2.0),
child: Icon( child: Icon(
Icons.edit, Icons.edit_outlined,
size: 12, size: 12,
color: color, color: color,
), ),

4
lib/components/matrix.dart
View File

@ -191,13 +191,13 @@ class MatrixState extends State<Matrix> {
Spacer(), Spacer(),
FloatingActionButton( FloatingActionButton(
backgroundColor: Colors.red, backgroundColor: Colors.red,
child: Icon(Icons.phone_missed), child: Icon(Icons.phone_missed_outlined),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
Spacer(), Spacer(),
FloatingActionButton( FloatingActionButton(
backgroundColor: Colors.green, backgroundColor: Colors.green,
child: Icon(Icons.phone), child: Icon(Icons.phone_outlined),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
launch(event.body); launch(event.body);

2
lib/components/message_content.dart
View File

@ -146,7 +146,7 @@ class MessageContent extends StatelessWidget {
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Icon(Icons.phone), Icon(Icons.phone_outlined),
SizedBox(width: 8), SizedBox(width: 8),
Text(L10n.of(context).videoCall), Text(L10n.of(context).videoCall),
], ],

6
lib/components/user_bottom_sheet.dart
View File

@ -105,7 +105,7 @@ class UserBottomSheet extends StatelessWidget {
PopupMenuItem( PopupMenuItem(
child: _TextWithIcon( child: _TextWithIcon(
L10n.of(context).sendAMessage, L10n.of(context).sendAMessage,
Icons.send, Icons.send_outlined,
), ),
value: 'message'), value: 'message'),
); );
@ -171,7 +171,7 @@ class UserBottomSheet extends StatelessWidget {
if (verificationStatus != null) if (verificationStatus != null)
IconButton( IconButton(
icon: Icon( icon: Icon(
Icons.lock, Icons.lock_outlined,
color: { color: {
UserVerifiedStatus.unknownDevice: Colors.red, UserVerifiedStatus.unknownDevice: Colors.red,
UserVerifiedStatus.verified: Colors.green, UserVerifiedStatus.verified: Colors.green,
@ -202,7 +202,7 @@ class UserBottomSheet extends StatelessWidget {
ListTile( ListTile(
title: Text(L10n.of(context).username), title: Text(L10n.of(context).username),
subtitle: Text(user.id), subtitle: Text(user.id),
trailing: Icon(Icons.share), trailing: Icon(Icons.share_outlined),
onTap: () => FluffyShare.share(user.id, context), onTap: () => FluffyShare.share(user.id, context),
), ),
if (presence != null) if (presence != null)

8
lib/utils/event_extension.dart
View File

@ -30,13 +30,13 @@ extension LocalizedBody on Event {
case -1: case -1:
return Icons.error_outline; return Icons.error_outline;
case 0: case 0:
return Icons.timer; return Icons.timer_outlined;
case 1: case 1:
return Icons.done; return Icons.done_outlined;
case 2: case 2:
return Icons.done_all; return Icons.done_all_outlined;
default: default:
return Icons.done; return Icons.done_outlined;
} }
} }

2
lib/views/auth_web_view.dart
View File

@ -33,7 +33,7 @@ class AuthWebView extends StatelessWidget {
LinearProgressIndicator(), LinearProgressIndicator(),
Expanded( Expanded(
child: kIsWeb child: kIsWeb
? Center(child: Icon(Icons.link)) ? Center(child: Icon(Icons.link_outlined))
: WebView( : WebView(
initialUrl: url, initialUrl: url,
javascriptMode: JavascriptMode.unrestricted, javascriptMode: JavascriptMode.unrestricted,

36
lib/views/chat.dart
View File

@ -532,7 +532,7 @@ class _ChatState extends State<_Chat> {
) )
: Row( : Row(
children: <Widget>[ children: <Widget>[
Icon(Icons.edit, Icon(Icons.edit_outlined,
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
size: 13), size: 13),
SizedBox(width: 4), SizedBox(width: 4),
@ -557,7 +557,7 @@ class _ChatState extends State<_Chat> {
selectedEvents.first.status > 0 && selectedEvents.first.status > 0 &&
selectedEvents.first.senderId == client.userID) selectedEvents.first.senderId == client.userID)
IconButton( IconButton(
icon: Icon(Icons.edit), icon: Icon(Icons.edit_outlined),
onPressed: () { onPressed: () {
setState(() { setState(() {
pendingText = sendController.text; pendingText = sendController.text;
@ -572,12 +572,12 @@ class _ChatState extends State<_Chat> {
}, },
), ),
IconButton( IconButton(
icon: Icon(Icons.content_copy), icon: Icon(Icons.content_copy_outlined),
onPressed: () => copyEventsAction(context), onPressed: () => copyEventsAction(context),
), ),
if (canRedactSelectedEvents) if (canRedactSelectedEvents)
IconButton( IconButton(
icon: Icon(Icons.delete), icon: Icon(Icons.delete_outlined),
onPressed: () => redactEventsAction(context), onPressed: () => redactEventsAction(context),
), ),
] ]
@ -587,7 +587,7 @@ class _ChatState extends State<_Chat> {
? Padding( ? Padding(
padding: const EdgeInsets.only(bottom: 56.0), padding: const EdgeInsets.only(bottom: 56.0),
child: FloatingActionButton( child: FloatingActionButton(
child: Icon(Icons.arrow_downward, child: Icon(Icons.arrow_downward_outlined,
color: Theme.of(context).primaryColor), color: Theme.of(context).primaryColor),
onPressed: () => _scrollController.jumpTo(0), onPressed: () => _scrollController.jumpTo(0),
foregroundColor: Theme.of(context).textTheme.bodyText2.color, foregroundColor: Theme.of(context).textTheme.bodyText2.color,
@ -721,7 +721,7 @@ class _ChatState extends State<_Chat> {
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 12.0), horizontal: 12.0),
child: Center( child: Center(
child: Icon(Icons.reply), child: Icon(Icons.reply_outlined),
), ),
), ),
direction: SwipeDirection.endToStart, direction: SwipeDirection.endToStart,
@ -911,7 +911,8 @@ class _ChatState extends State<_Chat> {
forwardEventsAction(context), forwardEventsAction(context),
child: Row( child: Row(
children: <Widget>[ children: <Widget>[
Icon(Icons.keyboard_arrow_left), Icon(Icons
.keyboard_arrow_left_outlined),
Text(L10n.of(context).forward), Text(L10n.of(context).forward),
], ],
), ),
@ -946,7 +947,8 @@ class _ChatState extends State<_Chat> {
Text(L10n.of(context) Text(L10n.of(context)
.tryToSendAgain), .tryToSendAgain),
SizedBox(width: 4), SizedBox(width: 4),
Icon(Icons.send, size: 16), Icon(Icons.send_outlined,
size: 16),
], ],
), ),
), ),
@ -959,7 +961,7 @@ class _ChatState extends State<_Chat> {
height: 56, height: 56,
alignment: Alignment.center, alignment: Alignment.center,
child: PopupMenuButton<String>( child: PopupMenuButton<String>(
icon: Icon(Icons.add), icon: Icon(Icons.add_outlined),
onSelected: (String choice) async { onSelected: (String choice) async {
if (choice == 'file') { if (choice == 'file') {
sendFileAction(context); sendFileAction(context);
@ -981,7 +983,8 @@ class _ChatState extends State<_Chat> {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Colors.green, backgroundColor: Colors.green,
foregroundColor: Colors.white, foregroundColor: Colors.white,
child: Icon(Icons.attachment), child: Icon(
Icons.attachment_outlined),
), ),
title: Text( title: Text(
L10n.of(context).sendFile), L10n.of(context).sendFile),
@ -994,7 +997,8 @@ class _ChatState extends State<_Chat> {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Colors.blue, backgroundColor: Colors.blue,
foregroundColor: Colors.white, foregroundColor: Colors.white,
child: Icon(Icons.image), child:
Icon(Icons.image_outlined),
), ),
title: Text( title: Text(
L10n.of(context).sendImage), L10n.of(context).sendImage),
@ -1009,7 +1013,8 @@ class _ChatState extends State<_Chat> {
backgroundColor: backgroundColor:
Colors.purple, Colors.purple,
foregroundColor: Colors.white, foregroundColor: Colors.white,
child: Icon(Icons.camera_alt), child: Icon(Icons
.camera_alt_outlined),
), ),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.openCamera), .openCamera),
@ -1024,7 +1029,8 @@ class _ChatState extends State<_Chat> {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Colors.red, backgroundColor: Colors.red,
foregroundColor: Colors.white, foregroundColor: Colors.white,
child: Icon(Icons.mic), child: Icon(
Icons.mic_none_outlined),
), ),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.voiceMessage), .voiceMessage),
@ -1098,7 +1104,7 @@ class _ChatState extends State<_Chat> {
height: 56, height: 56,
alignment: Alignment.center, alignment: Alignment.center,
child: IconButton( child: IconButton(
icon: Icon(Icons.mic), icon: Icon(Icons.mic_none_outlined),
onPressed: () => onPressed: () =>
voiceMessageAction(context), voiceMessageAction(context),
), ),
@ -1109,7 +1115,7 @@ class _ChatState extends State<_Chat> {
height: 56, height: 56,
alignment: Alignment.center, alignment: Alignment.center,
child: IconButton( child: IconButton(
icon: Icon(Icons.send), icon: Icon(Icons.send_outlined),
onPressed: () => send(), onPressed: () => send(),
), ),
), ),

16
lib/views/chat_details.dart
View File

@ -200,7 +200,7 @@ class _ChatDetailsState extends State<ChatDetails> {
actions: <Widget>[ actions: <Widget>[
if (widget.room.canonicalAlias?.isNotEmpty ?? false) if (widget.room.canonicalAlias?.isNotEmpty ?? false)
IconButton( IconButton(
icon: Icon(Icons.share), icon: Icon(Icons.share_outlined),
onPressed: () => FluffyShare.share( onPressed: () => FluffyShare.share(
AppConfig.matrixToLinkPrefix + AppConfig.matrixToLinkPrefix +
widget.room.canonicalAlias, widget.room.canonicalAlias,
@ -239,7 +239,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.edit), child: Icon(Icons.edit_outlined),
) )
: null, : null,
title: Text( title: Text(
@ -282,7 +282,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.people), child: Icon(Icons.people_outlined),
), ),
title: Text( title: Text(
L10n.of(context).changeTheNameOfTheGroup), L10n.of(context).changeTheNameOfTheGroup),
@ -299,7 +299,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.link), child: Icon(Icons.link_outlined),
), ),
onTap: () => setCanonicalAliasAction(context), onTap: () => setCanonicalAliasAction(context),
title: Text(L10n.of(context).setInvitationLink), title: Text(L10n.of(context).setInvitationLink),
@ -314,7 +314,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.insert_emoticon), child: Icon(Icons.insert_emoticon_outlined),
), ),
title: Text(L10n.of(context).emoteSettings), title: Text(L10n.of(context).emoteSettings),
subtitle: Text(L10n.of(context).setCustomEmotes), subtitle: Text(L10n.of(context).setCustomEmotes),
@ -350,7 +350,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.public)), child: Icon(Icons.public_outlined)),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.whoIsAllowedToJoinThisGroup), .whoIsAllowedToJoinThisGroup),
subtitle: Text( subtitle: Text(
@ -387,7 +387,7 @@ class _ChatDetailsState extends State<ChatDetails> {
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: Colors.grey,
child: Icon(Icons.visibility), child: Icon(Icons.visibility_outlined),
), ),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.visibilityOfTheChatHistory), .visibilityOfTheChatHistory),
@ -513,7 +513,7 @@ class _ChatDetailsState extends State<ChatDetails> {
? ListTile( ? ListTile(
title: Text(L10n.of(context).inviteContact), title: Text(L10n.of(context).inviteContact),
leading: CircleAvatar( leading: CircleAvatar(
child: Icon(Icons.add), child: Icon(Icons.add_outlined),
backgroundColor: backgroundColor:
Theme.of(context).primaryColor, Theme.of(context).primaryColor,
foregroundColor: Colors.white, foregroundColor: Colors.white,

21
lib/views/chat_list.dart
View File

@ -300,7 +300,7 @@ class _ChatListState extends State<ChatList> {
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
leading: Icon(Icons.edit), leading: Icon(Icons.edit_outlined),
title: Text(L10n.of(context).setStatus), title: Text(L10n.of(context).setStatus),
onTap: () => _setStatus(context), onTap: () => _setStatus(context),
), ),
@ -311,21 +311,21 @@ class _ChatListState extends State<ChatList> {
onTap: () => _drawerTapAction(NewGroupView()), onTap: () => _drawerTapAction(NewGroupView()),
), ),
ListTile( ListTile(
leading: Icon(Icons.person_add), leading: Icon(Icons.person_add_outlined),
title: Text(L10n.of(context).newPrivateChat), title: Text(L10n.of(context).newPrivateChat),
onTap: () => onTap: () =>
_drawerTapAction(NewPrivateChatView()), _drawerTapAction(NewPrivateChatView()),
), ),
Divider(height: 1), Divider(height: 1),
ListTile( ListTile(
leading: Icon(Icons.archive), leading: Icon(Icons.archive_outlined),
title: Text(L10n.of(context).archive), title: Text(L10n.of(context).archive),
onTap: () => _drawerTapAction( onTap: () => _drawerTapAction(
Archive(), Archive(),
), ),
), ),
ListTile( ListTile(
leading: Icon(Icons.settings), leading: Icon(Icons.settings_outlined),
title: Text(L10n.of(context).settings), title: Text(L10n.of(context).settings),
onTap: () => _drawerTapAction( onTap: () => _drawerTapAction(
SettingsView(), SettingsView(),
@ -333,7 +333,7 @@ class _ChatListState extends State<ChatList> {
), ),
Divider(height: 1), Divider(height: 1),
ListTile( ListTile(
leading: Icon(Icons.share), leading: Icon(Icons.share_outlined),
title: Text(L10n.of(context).inviteContact), title: Text(L10n.of(context).inviteContact),
onTap: () { onTap: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
@ -375,11 +375,11 @@ class _ChatListState extends State<ChatList> {
), ),
if (_selectedRoomIds.length == 1) if (_selectedRoomIds.length == 1)
IconButton( IconButton(
icon: Icon(Icons.notifications_none), icon: Icon(Icons.notifications_none_outlined),
onPressed: () => _toggleMuted(context), onPressed: () => _toggleMuted(context),
), ),
IconButton( IconButton(
icon: Icon(Icons.archive), icon: Icon(Icons.archive_outlined),
onPressed: () => _archiveAction(context), onPressed: () => _archiveAction(context),
), ),
], ],
@ -409,7 +409,8 @@ class _ChatListState extends State<ChatList> {
hintText: L10n.of(context).searchForAChat, hintText: L10n.of(context).searchForAChat,
suffixIcon: searchMode suffixIcon: searchMode
? IconButton( ? IconButton(
icon: Icon(Icons.backspace), icon: Icon(
Icons.backspace_outlined),
onPressed: () => setState(() { onPressed: () => setState(() {
searchController.clear(); searchController.clear();
_searchFocusNode.unfocus(); _searchFocusNode.unfocus();
@ -424,7 +425,7 @@ class _ChatListState extends State<ChatList> {
floatingActionButton: AdaptivePageLayout.columnMode(context) floatingActionButton: AdaptivePageLayout.columnMode(context)
? null ? null
: FloatingActionButton( : FloatingActionButton(
child: Icon(Icons.add), child: Icon(Icons.add_outlined),
backgroundColor: Theme.of(context).primaryColor, backgroundColor: Theme.of(context).primaryColor,
onPressed: () => Navigator.of(context) onPressed: () => Navigator.of(context)
.pushAndRemoveUntil( .pushAndRemoveUntil(
@ -471,7 +472,7 @@ class _ChatListState extends State<ChatList> {
children: <Widget>[ children: <Widget>[
Icon( Icon(
searchMode searchMode
? Icons.search ? Icons.search_outlined
: Icons.chat_bubble_outline, : Icons.chat_bubble_outline,
size: 80, size: 80,
color: Colors.grey, color: Colors.grey,

4
lib/views/image_view.dart
View File

@ -31,12 +31,12 @@ class ImageView extends StatelessWidget {
backgroundColor: Color(0x44000000), backgroundColor: Color(0x44000000),
actions: [ actions: [
IconButton( IconButton(
icon: Icon(Icons.reply), icon: Icon(Icons.reply_outlined),
onPressed: () => _forwardAction(context), onPressed: () => _forwardAction(context),
color: Colors.white, color: Colors.white,
), ),
IconButton( IconButton(
icon: Icon(Icons.file_download), icon: Icon(Icons.download_outlined),
onPressed: () => event.openFile(context, downloadOnly: true), onPressed: () => event.openFile(context, downloadOnly: true),
color: Colors.white, color: Colors.white,
), ),

2
lib/views/invitation_selection.dart
View File

@ -145,7 +145,7 @@ class _InvitationSelectionState extends State<InvitationSelection> {
height: 12, height: 12,
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
) )
: Icon(Icons.search), : Icon(Icons.search_outlined),
), ),
), ),
), ),

9
lib/views/login.dart
View File

@ -176,7 +176,7 @@ class _LoginState extends State<Login> {
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
leading: CircleAvatar( leading: CircleAvatar(
child: Icon(Icons.account_box, child: Icon(Icons.account_box_outlined,
color: Theme.of(context).primaryColor), color: Theme.of(context).primaryColor),
), ),
title: TextField( title: TextField(
@ -197,7 +197,8 @@ class _LoginState extends State<Login> {
backgroundColor: Theme.of(context).brightness == Brightness.dark backgroundColor: Theme.of(context).brightness == Brightness.dark
? Color(0xff121212) ? Color(0xff121212)
: Colors.white, : Colors.white,
child: Icon(Icons.lock, color: Theme.of(context).primaryColor), child: Icon(Icons.lock_outlined,
color: Theme.of(context).primaryColor),
), ),
title: TextField( title: TextField(
readOnly: loading, readOnly: loading,
@ -210,8 +211,8 @@ class _LoginState extends State<Login> {
errorText: passwordError, errorText: passwordError,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: Icon(showPassword icon: Icon(showPassword
? Icons.visibility_off ? Icons.visibility_off_outlined
: Icons.visibility), : Icons.visibility_outlined),
onPressed: () => onPressed: () =>
setState(() => showPassword = !showPassword), setState(() => showPassword = !showPassword),
), ),

4
lib/views/new_group.dart
View File

@ -87,7 +87,7 @@ class _NewGroupState extends State<_NewGroup> {
decoration: InputDecoration( decoration: InputDecoration(
border: OutlineInputBorder(), border: OutlineInputBorder(),
labelText: L10n.of(context).optionalGroupName, labelText: L10n.of(context).optionalGroupName,
prefixIcon: Icon(Icons.people), prefixIcon: Icon(Icons.people_outlined),
hintText: L10n.of(context).enterAGroupName), hintText: L10n.of(context).enterAGroupName),
), ),
), ),
@ -105,7 +105,7 @@ class _NewGroupState extends State<_NewGroup> {
foregroundColor: Colors.white, foregroundColor: Colors.white,
backgroundColor: Theme.of(context).primaryColor, backgroundColor: Theme.of(context).primaryColor,
onPressed: () => submitAction(context), onPressed: () => submitAction(context),
child: Icon(Icons.arrow_forward), child: Icon(Icons.arrow_forward_outlined),
), ),
); );
} }

9
lib/views/new_private_chat.dart
View File

@ -156,7 +156,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
size: 12, size: 12,
), ),
) )
: Icon(Icons.account_circle), : Icon(Icons.account_circle_outlined),
prefixText: '@', prefixText: '@',
hintText: '${L10n.of(context).username.toLowerCase()}', hintText: '${L10n.of(context).username.toLowerCase()}',
), ),
@ -200,10 +200,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
), ),
if (foundProfiles.isEmpty || correctMxId) if (foundProfiles.isEmpty || correctMxId)
ListTile( ListTile(
trailing: Icon( trailing: Icon(Icons.share_outlined),
Icons.share,
size: 16,
),
onTap: () => FluffyShare.share( onTap: () => FluffyShare.share(
L10n.of(context).inviteText(Matrix.of(context).client.userID, L10n.of(context).inviteText(Matrix.of(context).client.userID,
'https://matrix.to/#/${Matrix.of(context).client.userID}'), 'https://matrix.to/#/${Matrix.of(context).client.userID}'),
@ -231,7 +228,7 @@ class _NewPrivateChatState extends State<_NewPrivateChat> {
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
onPressed: () => submitAction(context), onPressed: () => submitAction(context),
child: Icon(Icons.arrow_forward), child: Icon(Icons.arrow_forward_outlined),
foregroundColor: Colors.white, foregroundColor: Colors.white,
backgroundColor: Theme.of(context).primaryColor, backgroundColor: Theme.of(context).primaryColor,
), ),

40
lib/views/settings.dart
View File

@ -295,7 +295,7 @@ class _SettingsState extends State<Settings> {
background: ContentBanner( background: ContentBanner(
profile?.avatarUrl, profile?.avatarUrl,
height: 300, height: 300,
defaultIcon: Icons.account_circle, defaultIcon: Icons.account_circle_outlined,
loading: profile == null, loading: profile == null,
onEdit: () => setAvatarAction(context), onEdit: () => setAvatarAction(context),
), ),
@ -314,7 +314,7 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.notifications), trailing: Icon(Icons.notifications_outlined),
title: Text(L10n.of(context).notifications), title: Text(L10n.of(context).notifications),
onTap: () async => await Navigator.of(context).push( onTap: () async => await Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
@ -340,7 +340,7 @@ class _SettingsState extends State<Settings> {
SettingsStyleView(), SettingsStyleView(),
), ),
), ),
trailing: Icon(Icons.wallpaper), trailing: Icon(Icons.style_outlined),
), ),
SwitchListTile( SwitchListTile(
title: Text(L10n.of(context).renderRichContent), title: Text(L10n.of(context).renderRichContent),
@ -381,7 +381,7 @@ class _SettingsState extends State<Settings> {
EmotesSettingsView(), EmotesSettingsView(),
), ),
), ),
trailing: Icon(Icons.insert_emoticon), trailing: Icon(Icons.insert_emoticon_outlined),
), ),
Divider(thickness: 1), Divider(thickness: 1),
ListTile( ListTile(
@ -394,19 +394,19 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.edit), trailing: Icon(Icons.edit_outlined),
title: Text(L10n.of(context).editDisplayname), title: Text(L10n.of(context).editDisplayname),
subtitle: Text(profile?.displayname ?? client.userID.localpart), subtitle: Text(profile?.displayname ?? client.userID.localpart),
onTap: () => setDisplaynameAction(context), onTap: () => setDisplaynameAction(context),
), ),
ListTile( ListTile(
trailing: Icon(Icons.phone), trailing: Icon(Icons.phone_outlined),
title: Text(L10n.of(context).editJitsiInstance), title: Text(L10n.of(context).editJitsiInstance),
subtitle: Text(Matrix.of(context).jitsiInstance), subtitle: Text(Matrix.of(context).jitsiInstance),
onTap: () => setJitsiInstanceAction(context), onTap: () => setJitsiInstanceAction(context),
), ),
ListTile( ListTile(
trailing: Icon(Icons.devices_other), trailing: Icon(Icons.devices_other_outlined),
title: Text(L10n.of(context).devices), title: Text(L10n.of(context).devices),
onTap: () async => await Navigator.of(context).push( onTap: () async => await Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
@ -416,7 +416,7 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.block), trailing: Icon(Icons.block_outlined),
title: Text(L10n.of(context).ignoredUsers), title: Text(L10n.of(context).ignoredUsers),
onTap: () async => await Navigator.of(context).push( onTap: () async => await Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
@ -426,7 +426,7 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.account_circle), trailing: Icon(Icons.account_circle_outlined),
title: Text(L10n.of(context).accountInformation), title: Text(L10n.of(context).accountInformation),
onTap: () => Navigator.of(context).push( onTap: () => Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
@ -436,20 +436,20 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.bug_report), trailing: Icon(Icons.bug_report_outlined),
title: Text(L10n.of(context).sendBugReports), title: Text(L10n.of(context).sendBugReports),
onTap: () => SentryController.toggleSentryAction(context), onTap: () => SentryController.toggleSentryAction(context),
), ),
Divider(thickness: 1), Divider(thickness: 1),
ListTile( ListTile(
trailing: Icon(Icons.vpn_key), trailing: Icon(Icons.vpn_key_outlined),
title: Text( title: Text(
L10n.of(context).changePassword, L10n.of(context).changePassword,
), ),
onTap: () => _changePasswordAccountAction(context), onTap: () => _changePasswordAccountAction(context),
), ),
ListTile( ListTile(
trailing: Icon(Icons.email), trailing: Icon(Icons.email_outlined),
title: Text(L10n.of(context).passwordRecovery), title: Text(L10n.of(context).passwordRecovery),
onTap: () => Navigator.of(context).push( onTap: () => Navigator.of(context).push(
AppRoute.defaultRoute( AppRoute.defaultRoute(
@ -459,12 +459,12 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.exit_to_app), trailing: Icon(Icons.exit_to_app_outlined),
title: Text(L10n.of(context).logout), title: Text(L10n.of(context).logout),
onTap: () => logoutAction(context), onTap: () => logoutAction(context),
), ),
ListTile( ListTile(
trailing: Icon(Icons.delete_forever), trailing: Icon(Icons.delete_forever_outlined),
title: Text( title: Text(
L10n.of(context).deleteAccount, L10n.of(context).deleteAccount,
style: TextStyle(color: Colors.red), style: TextStyle(color: Colors.red),
@ -482,7 +482,7 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.compare_arrows), trailing: Icon(Icons.compare_arrows_outlined),
title: Text(client.encryption.crossSigning.enabled title: Text(client.encryption.crossSigning.enabled
? L10n.of(context).crossSigningEnabled ? L10n.of(context).crossSigningEnabled
: L10n.of(context).crossSigningDisabled), : L10n.of(context).crossSigningDisabled),
@ -562,7 +562,7 @@ class _SettingsState extends State<Settings> {
}, },
), ),
ListTile( ListTile(
trailing: Icon(Icons.wb_cloudy), trailing: Icon(Icons.wb_cloudy_outlined),
title: Text(client.encryption.keyManager.enabled title: Text(client.encryption.keyManager.enabled
? L10n.of(context).onlineKeyBackupEnabled ? L10n.of(context).onlineKeyBackupEnabled
: L10n.of(context).onlineKeyBackupDisabled), : L10n.of(context).onlineKeyBackupDisabled),
@ -597,17 +597,17 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.help), trailing: Icon(Icons.help_outlined),
title: Text(L10n.of(context).help), title: Text(L10n.of(context).help),
onTap: () => launch(AppConfig.supportUrl), onTap: () => launch(AppConfig.supportUrl),
), ),
ListTile( ListTile(
trailing: Icon(Icons.privacy_tip_rounded), trailing: Icon(Icons.privacy_tip_outlined),
title: Text(L10n.of(context).privacy), title: Text(L10n.of(context).privacy),
onTap: () => launch(AppConfig.privacyUrl), onTap: () => launch(AppConfig.privacyUrl),
), ),
ListTile( ListTile(
trailing: Icon(Icons.link), trailing: Icon(Icons.link_outlined),
title: Text(L10n.of(context).license), title: Text(L10n.of(context).license),
onTap: () => showLicensePage( onTap: () => showLicensePage(
context: context, context: context,
@ -617,7 +617,7 @@ class _SettingsState extends State<Settings> {
), ),
), ),
ListTile( ListTile(
trailing: Icon(Icons.code), trailing: Icon(Icons.code_outlined),
title: Text(L10n.of(context).sourceCode), title: Text(L10n.of(context).sourceCode),
onTap: () => launch(AppConfig.sourceCodeUrl), onTap: () => launch(AppConfig.sourceCodeUrl),
), ),

8
lib/views/settings_3pid.dart
View File

@ -126,7 +126,7 @@ class _Settings3PidState extends State<Settings3Pid> {
title: Text(L10n.of(context).passwordRecovery), title: Text(L10n.of(context).passwordRecovery),
actions: [ actions: [
IconButton( IconButton(
icon: Icon(Icons.add), icon: Icon(Icons.add_outlined),
onPressed: () => _add3PidAction(context), onPressed: () => _add3PidAction(context),
) )
], ],
@ -155,7 +155,9 @@ class _Settings3PidState extends State<Settings3Pid> {
foregroundColor: foregroundColor:
identifier.isEmpty ? Colors.orange : Colors.grey, identifier.isEmpty ? Colors.orange : Colors.grey,
child: Icon( child: Icon(
identifier.isEmpty ? Icons.warning : Icons.info, identifier.isEmpty
? Icons.warning_outlined
: Icons.info_outlined,
), ),
), ),
title: Text( title: Text(
@ -176,7 +178,7 @@ class _Settings3PidState extends State<Settings3Pid> {
child: Icon(identifier[i].iconData)), child: Icon(identifier[i].iconData)),
title: Text(identifier[i].address), title: Text(identifier[i].address),
trailing: IconButton( trailing: IconButton(
icon: Icon(Icons.delete_forever), icon: Icon(Icons.delete_forever_outlined),
color: Colors.red, color: Colors.red,
onPressed: () => _delete3Pid(context, identifier[i]), onPressed: () => _delete3Pid(context, identifier[i]),
), ),

2
lib/views/settings_devices.dart
View File

@ -99,7 +99,7 @@ class DevicesSettingsState extends State<DevicesSettings> {
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Icon(Icons.error), Icon(Icons.error_outlined),
Text(snapshot.error.toString()), Text(snapshot.error.toString()),
], ],
), ),

6
lib/views/settings_emotes.dart
View File

@ -189,7 +189,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
), ),
floatingActionButton: showSave floatingActionButton: showSave
? FloatingActionButton( ? FloatingActionButton(
child: Icon(Icons.save, color: Colors.white), child: Icon(Icons.save_outlined, color: Colors.white),
onPressed: () async { onPressed: () async {
await _save(context); await _save(context);
setState(() { setState(() {
@ -239,7 +239,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
title: _EmoteImagePicker(newMxcController), title: _EmoteImagePicker(newMxcController),
trailing: InkWell( trailing: InkWell(
child: Icon( child: Icon(
Icons.add, Icons.add_outlined,
color: Colors.green, color: Colors.green,
size: 32.0, size: 32.0,
), ),
@ -387,7 +387,7 @@ class _EmotesSettingsState extends State<EmotesSettings> {
? null ? null
: InkWell( : InkWell(
child: Icon( child: Icon(
Icons.delete_forever, Icons.delete_forever_outlined,
color: Colors.red, color: Colors.red,
size: 32.0, size: 32.0,
), ),

4
lib/views/settings_ignore_list.dart
View File

@ -53,7 +53,7 @@ class SettingsIgnoreList extends StatelessWidget {
prefixText: '@', prefixText: '@',
labelText: L10n.of(context).ignoreUsername, labelText: L10n.of(context).ignoreUsername,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: Icon(Icons.done), icon: Icon(Icons.done_outlined),
onPressed: () => _ignoreUser(context), onPressed: () => _ignoreUser(context),
), ),
), ),
@ -85,7 +85,7 @@ class SettingsIgnoreList extends StatelessWidget {
title: title:
Text(s.data?.displayname ?? client.ignoredUsers[i]), Text(s.data?.displayname ?? client.ignoredUsers[i]),
trailing: IconButton( trailing: IconButton(
icon: Icon(Icons.delete_forever), icon: Icon(Icons.delete_forever_outlined),
onPressed: () => SimpleDialogs(context) onPressed: () => SimpleDialogs(context)
.tryRequestWithLoadingDialog( .tryRequestWithLoadingDialog(
client.unignoreUser(client.ignoredUsers[i]), client.unignoreUser(client.ignoredUsers[i]),

4
lib/views/settings_style.dart
View File

@ -70,7 +70,7 @@ class _SettingsStyleState extends State<SettingsStyle> {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
trailing: Icon( trailing: Icon(
Icons.delete_forever, Icons.delete_forever_outlined,
color: Colors.red, color: Colors.red,
), ),
onTap: () => deleteWallpaperAction(context), onTap: () => deleteWallpaperAction(context),
@ -78,7 +78,7 @@ class _SettingsStyleState extends State<SettingsStyle> {
Builder(builder: (context) { Builder(builder: (context) {
return ListTile( return ListTile(
title: Text(L10n.of(context).changeWallpaper), title: Text(L10n.of(context).changeWallpaper),
trailing: Icon(Icons.wallpaper), trailing: Icon(Icons.wallpaper_outlined),
onTap: () => setWallpaperAction(context), onTap: () => setWallpaperAction(context),
); );
}), }),

4
lib/views/sign_up.dart
View File

@ -102,7 +102,7 @@ class _SignUpState extends State<SignUp> {
: Colors.white : Colors.white
: Theme.of(context).secondaryHeaderColor, : Theme.of(context).secondaryHeaderColor,
child: avatar == null child: avatar == null
? Icon(Icons.camera_alt, ? Icon(Icons.camera_alt_outlined,
color: Theme.of(context).primaryColor) color: Theme.of(context).primaryColor)
: null, : null,
), ),
@ -125,7 +125,7 @@ class _SignUpState extends State<SignUp> {
? Color(0xff121212) ? Color(0xff121212)
: Colors.white, : Colors.white,
child: Icon( child: Icon(
Icons.account_circle, Icons.account_circle_outlined,
color: Theme.of(context).primaryColor, color: Theme.of(context).primaryColor,
), ),
), ),

4
lib/views/sign_up_password.dart
View File

@ -130,7 +130,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
ListTile( ListTile(
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Colors.white, backgroundColor: Colors.white,
child: Icon(Icons.lock, color: Theme.of(context).primaryColor), child: Icon(Icons.lock_outlined, color: Theme.of(context).primaryColor),
), ),
title: TextField( title: TextField(
controller: passwordController, controller: passwordController,
@ -143,7 +143,7 @@ class _SignUpPasswordState extends State<SignUpPassword> {
errorText: passwordError, errorText: passwordError,
suffixIcon: IconButton( suffixIcon: IconButton(
icon: Icon( icon: Icon(
showPassword ? Icons.visibility_off : Icons.visibility), showPassword ? Icons.visibility_off_outlined : Icons.visibility_outlined),
onPressed: () => onPressed: () =>
setState(() => showPassword = !showPassword), setState(() => showPassword = !showPassword),
), ),