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

design: Remove cupertino icons

Browse Source
This commit is contained in:
Krille Fear 2021-11-14 13:24:01 +01:00
parent dbc56c2cf2
commit 66a66cefa3
10 changed files with 255 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/pages/chat_details/chat_details_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -42,6 +41,7 @@ class ChatDetailsView extends StatelessWidget {
(room.summary?.mJoinedMemberCount ?? 0); (room.summary?.mJoinedMemberCount ?? 0);
final canRequestMoreMembers = final canRequestMoreMembers =
controller.members.length < actualMembersCount; controller.members.length < actualMembersCount;
final iconColor = Theme.of(context).textTheme.bodyText1.color;
return StreamBuilder( return StreamBuilder(
stream: room.onUpdate.stream, stream: room.onUpdate.stream,
builder: (context, snapshot) { builder: (context, snapshot) {
@ -105,9 +105,9 @@ class ChatDetailsView extends StatelessWidget {
? CircleAvatar( ? CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
radius: Avatar.defaultSize / 2, radius: Avatar.defaultSize / 2,
child: const Icon(CupertinoIcons.pen), child: const Icon(Icons.edit_outlined),
) )
: null, : null,
title: Text( title: Text(
@ -149,8 +149,8 @@ class ChatDetailsView extends StatelessWidget {
), ),
), ),
trailing: Icon(controller.displaySettings trailing: Icon(controller.displaySettings
? CupertinoIcons.chevron_down ? Icons.keyboard_arrow_down_outlined
: CupertinoIcons.right_chevron), : Icons.keyboard_arrow_right_outlined),
onTap: controller.toggleDisplaySettings, onTap: controller.toggleDisplaySettings,
), ),
if (controller.displaySettings) ...[ if (controller.displaySettings) ...[
@ -159,8 +159,9 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon(CupertinoIcons.group), child: const Icon(
Icons.people_outline_outlined),
), ),
title: Text( title: Text(
L10n.of(context).changeTheNameOfTheGroup), L10n.of(context).changeTheNameOfTheGroup),
@ -173,8 +174,8 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon(CupertinoIcons.link), child: const Icon(Icons.link_outlined),
), ),
onTap: controller.editAliases, onTap: controller.editAliases,
title: Text(L10n.of(context).editRoomAliases), title: Text(L10n.of(context).editRoomAliases),
@ -187,7 +188,7 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon( child: const Icon(
Icons.insert_emoticon_outlined), Icons.insert_emoticon_outlined),
), ),
@ -219,9 +220,8 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon( child: const Icon(Icons.shield_outlined)),
CupertinoIcons.checkmark_shield)),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.whoIsAllowedToJoinThisGroup), .whoIsAllowedToJoinThisGroup),
subtitle: Text( subtitle: Text(
@ -269,8 +269,9 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon(CupertinoIcons.eye), child:
const Icon(Icons.visibility_outlined),
), ),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.visibilityOfTheChatHistory), .visibilityOfTheChatHistory),
@ -309,9 +310,9 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: Theme.of(context) backgroundColor: Theme.of(context)
.scaffoldBackgroundColor, .scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: child: const Icon(
const Icon(CupertinoIcons.person_alt), Icons.person_add_alt_1_outlined),
), ),
title: Text(L10n.of(context) title: Text(L10n.of(context)
.areGuestsAllowedToJoin), .areGuestsAllowedToJoin),
@ -329,9 +330,9 @@ class ChatDetailsView extends StatelessWidget {
leading: CircleAvatar( leading: CircleAvatar(
backgroundColor: backgroundColor:
Theme.of(context).scaffoldBackgroundColor, Theme.of(context).scaffoldBackgroundColor,
foregroundColor: Colors.grey, foregroundColor: iconColor,
child: const Icon( child: const Icon(
CupertinoIcons.slider_horizontal_3), Icons.edit_attributes_outlined),
), ),
onTap: () => onTap: () =>
VRouter.of(context).to('permissions'), VRouter.of(context).to('permissions'),

2
lib/pages/chat_list/chat_list_view.dart
View File

@ -264,14 +264,12 @@ class ChatListView extends StatelessWidget {
floatingActionButton: selectMode == SelectMode.normal floatingActionButton: selectMode == SelectMode.normal
? controller.scrolledToTop ? controller.scrolledToTop
? FloatingActionButton.extended( ? FloatingActionButton.extended(
heroTag: 'main_fab',
onPressed: () => onPressed: () =>
VRouter.of(context).to('/newprivatechat'), VRouter.of(context).to('/newprivatechat'),
icon: const Icon(CupertinoIcons.chat_bubble), icon: const Icon(CupertinoIcons.chat_bubble),
label: Text(L10n.of(context).newChat), label: Text(L10n.of(context).newChat),
) )
: FloatingActionButton( : FloatingActionButton(
heroTag: 'main_fab',
onPressed: () => onPressed: () =>
VRouter.of(context).to('/newprivatechat'), VRouter.of(context).to('/newprivatechat'),
child: const Icon(CupertinoIcons.chat_bubble), child: const Icon(CupertinoIcons.chat_bubble),

6
lib/pages/settings/settings.dart
View File

@ -45,19 +45,19 @@ class SettingsController extends State<Settings> {
key: AvatarAction.camera, key: AvatarAction.camera,
label: L10n.of(context).openCamera, label: L10n.of(context).openCamera,
isDefaultAction: true, isDefaultAction: true,
icon: CupertinoIcons.camera, icon: Icons.camera_alt_outlined,
), ),
SheetAction( SheetAction(
key: AvatarAction.file, key: AvatarAction.file,
label: L10n.of(context).openGallery, label: L10n.of(context).openGallery,
icon: CupertinoIcons.photo, icon: Icons.photo_outlined,
), ),
if (profile?.avatarUrl != null) if (profile?.avatarUrl != null)
SheetAction( SheetAction(
key: AvatarAction.remove, key: AvatarAction.remove,
label: L10n.of(context).removeYourAvatar, label: L10n.of(context).removeYourAvatar,
isDestructiveAction: true, isDestructiveAction: true,
icon: CupertinoIcons.delete, icon: Icons.delete_outlined,
), ),
], ],
); );

27
lib/pages/settings/settings_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -32,62 +31,66 @@ class SettingsView extends StatelessWidget {
background: ContentBanner( background: ContentBanner(
controller.profile?.avatarUrl, controller.profile?.avatarUrl,
onEdit: controller.setAvatarAction, onEdit: controller.setAvatarAction,
defaultIcon: CupertinoIcons.person_circle, defaultIcon: Icons.person_outline_outlined,
), ),
), ),
), ),
], ],
body: ListView( body: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyText1.color,
child: ListView(
children: <Widget>[ children: <Widget>[
ListTile( ListTile(
leading: const Icon(Icons.format_paint_outlined),
title: Text(L10n.of(context).changeTheme), title: Text(L10n.of(context).changeTheme),
onTap: () => VRouter.of(context).to('/settings/style'), onTap: () => VRouter.of(context).to('/settings/style'),
leading: const Icon(CupertinoIcons.paintbrush),
), ),
const Divider(thickness: 1),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.bell), leading: const Icon(Icons.notifications_outlined),
title: Text(L10n.of(context).notifications), title: Text(L10n.of(context).notifications),
onTap: () => VRouter.of(context).to('/settings/notifications'), onTap: () => VRouter.of(context).to('/settings/notifications'),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.device_phone_portrait), leading: const Icon(Icons.devices_outlined),
title: Text(L10n.of(context).devices), title: Text(L10n.of(context).devices),
onTap: () => VRouter.of(context).to('/settings/devices'), onTap: () => VRouter.of(context).to('/settings/devices'),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.chat_bubble_2), leading: const Icon(Icons.chat_bubble_outline_outlined),
title: Text(L10n.of(context).chat), title: Text(L10n.of(context).chat),
onTap: () => VRouter.of(context).to('/settings/chat'), onTap: () => VRouter.of(context).to('/settings/chat'),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.person), leading: const Icon(Icons.account_circle_outlined),
title: Text(L10n.of(context).account), title: Text(L10n.of(context).account),
onTap: () => VRouter.of(context).to('/settings/account'), onTap: () => VRouter.of(context).to('/settings/account'),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.shield), leading: const Icon(Icons.shield_outlined),
title: Text(L10n.of(context).security), title: Text(L10n.of(context).security),
onTap: () => VRouter.of(context).to('/settings/security'), onTap: () => VRouter.of(context).to('/settings/security'),
), ),
const Divider(thickness: 1), const Divider(thickness: 1),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.question_circle), leading: const Icon(Icons.help_outline_outlined),
title: Text(L10n.of(context).help), title: Text(L10n.of(context).help),
onTap: () => launch(AppConfig.supportUrl), onTap: () => launch(AppConfig.supportUrl),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.checkmark_shield), leading: const Icon(Icons.shield_sharp),
title: Text(L10n.of(context).privacy), title: Text(L10n.of(context).privacy),
onTap: () => launch(AppConfig.privacyUrl), onTap: () => launch(AppConfig.privacyUrl),
), ),
ListTile( ListTile(
leading: const Icon(CupertinoIcons.info_circle), leading: const Icon(Icons.info_outline_rounded),
title: Text(L10n.of(context).about), title: Text(L10n.of(context).about),
onTap: () => PlatformInfos.showDialog(context), onTap: () => PlatformInfos.showDialog(context),
), ),
], ],
), ),
), ),
),
); );
} }
} }

13
lib/pages/settings_account/settings_account_view.dart
View File

@ -17,7 +17,9 @@ class SettingsAccountView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar(title: Text(L10n.of(context).account)), appBar: AppBar(title: Text(L10n.of(context).account)),
body: MaxWidthBody( body: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyText1.color,
child: MaxWidthBody(
withScrolling: true, withScrolling: true,
child: Column( child: Column(
children: [ children: [
@ -31,7 +33,7 @@ class SettingsAccountView extends StatelessWidget {
), ),
), ),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.pen), trailing: const Icon(Icons.edit_outlined),
title: Text(L10n.of(context).editDisplayname), title: Text(L10n.of(context).editDisplayname),
subtitle: Text(controller.profile?.displayName ?? subtitle: Text(controller.profile?.displayName ??
Matrix.of(context).client.userID.localpart), Matrix.of(context).client.userID.localpart),
@ -39,19 +41,19 @@ class SettingsAccountView extends StatelessWidget {
), ),
const Divider(height: 1), const Divider(height: 1),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.add_circled), trailing: const Icon(Icons.person_add_outlined),
title: Text(L10n.of(context).addAccount), title: Text(L10n.of(context).addAccount),
subtitle: Text(L10n.of(context).enableMultiAccounts), subtitle: Text(L10n.of(context).enableMultiAccounts),
onTap: controller.addAccountAction, onTap: controller.addAccountAction,
), ),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.arrow_right_square), trailing: const Icon(Icons.exit_to_app_outlined),
title: Text(L10n.of(context).logout), title: Text(L10n.of(context).logout),
onTap: controller.logoutAction, onTap: controller.logoutAction,
), ),
const Divider(height: 1), const Divider(height: 1),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.delete_solid), trailing: const Icon(Icons.delete_outlined),
title: Text( title: Text(
L10n.of(context).deleteAccount, L10n.of(context).deleteAccount,
style: const TextStyle(color: Colors.red), style: const TextStyle(color: Colors.red),
@ -61,6 +63,7 @@ class SettingsAccountView extends StatelessWidget {
], ],
), ),
), ),
),
); );
} }
} }

8
lib/pages/settings_chat/settings_chat_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -19,7 +18,9 @@ class SettingsChatView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar(title: Text(L10n.of(context).chat)), appBar: AppBar(title: Text(L10n.of(context).chat)),
body: MaxWidthBody( body: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyText1.color,
child: MaxWidthBody(
withScrolling: true, withScrolling: true,
child: Column( child: Column(
children: [ children: [
@ -66,7 +67,7 @@ class SettingsChatView extends StatelessWidget {
ListTile( ListTile(
trailing: const Padding( trailing: const Padding(
padding: EdgeInsets.all(16.0), padding: EdgeInsets.all(16.0),
child: Icon(CupertinoIcons.phone), child: Icon(Icons.phone_outlined),
), ),
title: Text(L10n.of(context).editJitsiInstance), title: Text(L10n.of(context).editJitsiInstance),
subtitle: Text(AppConfig.jitsiInstance), subtitle: Text(AppConfig.jitsiInstance),
@ -75,6 +76,7 @@ class SettingsChatView extends StatelessWidget {
], ],
), ),
), ),
),
); );
} }
} }

8
lib/pages/settings_emotes/settings_emotes_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -29,8 +28,7 @@ class EmotesSettingsView extends StatelessWidget {
floatingActionButton: controller.showSave floatingActionButton: controller.showSave
? FloatingActionButton( ? FloatingActionButton(
onPressed: controller.saveAction, onPressed: controller.saveAction,
child: child: const Icon(Icons.save_outlined, color: Colors.white),
const Icon(CupertinoIcons.floppy_disk, color: Colors.white),
) )
: null, : null,
body: MaxWidthBody( body: MaxWidthBody(
@ -78,7 +76,7 @@ class EmotesSettingsView extends StatelessWidget {
trailing: InkWell( trailing: InkWell(
onTap: controller.addImageAction, onTap: controller.addImageAction,
child: const Icon( child: const Icon(
CupertinoIcons.add, Icons.add_outlined,
color: Colors.green, color: Colors.green,
size: 32.0, size: 32.0,
), ),
@ -198,7 +196,7 @@ class EmotesSettingsView extends StatelessWidget {
onTap: () => onTap: () =>
controller.removeImageAction(imageCode), controller.removeImageAction(imageCode),
child: const Icon( child: const Icon(
CupertinoIcons.delete, Icons.delete_outlined,
color: Colors.red, color: Colors.red,
size: 32.0, size: 32.0,
), ),

22
lib/pages/settings_security/settings_security_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_dialog/adaptive_dialog.dart';
@ -19,24 +18,26 @@ class SettingsSecurityView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar(title: Text(L10n.of(context).security)), appBar: AppBar(title: Text(L10n.of(context).security)),
body: MaxWidthBody( body: ListTileTheme(
iconColor: Theme.of(context).textTheme.bodyText1.color,
child: MaxWidthBody(
withScrolling: true, withScrolling: true,
child: Column( child: Column(
children: [ children: [
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.xmark_shield), trailing: const Icon(Icons.close),
title: Text(L10n.of(context).ignoredUsers), title: Text(L10n.of(context).ignoredUsers),
onTap: () => VRouter.of(context).to('ignorelist'), onTap: () => VRouter.of(context).to('ignorelist'),
), ),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.padlock), trailing: const Icon(Icons.vpn_key_outlined),
title: Text( title: Text(
L10n.of(context).changePassword, L10n.of(context).changePassword,
), ),
onTap: controller.changePasswordAccountAction, onTap: controller.changePasswordAccountAction,
), ),
ListTile( ListTile(
trailing: const Icon(CupertinoIcons.mail), trailing: const Icon(Icons.mail_outlined),
title: Text(L10n.of(context).passwordRecovery), title: Text(L10n.of(context).passwordRecovery),
onTap: () => VRouter.of(context).to('3pid'), onTap: () => VRouter.of(context).to('3pid'),
), ),
@ -54,7 +55,8 @@ class SettingsSecurityView extends StatelessWidget {
useRootNavigator: false, useRootNavigator: false,
context: context, context: context,
title: L10n.of(context).yourPublicKey, title: L10n.of(context).yourPublicKey,
message: Matrix.of(context).client.fingerprintKey.beautified, message:
Matrix.of(context).client.fingerprintKey.beautified,
okLabel: L10n.of(context).ok, okLabel: L10n.of(context).ok,
), ),
trailing: const Icon(Icons.vpn_key_outlined), trailing: const Icon(Icons.vpn_key_outlined),
@ -80,8 +82,11 @@ class SettingsSecurityView extends StatelessWidget {
: const Icon(Icons.error, color: Colors.red), : const Icon(Icons.error, color: Colors.red),
), ),
FutureBuilder( FutureBuilder(
future: future: Matrix.of(context)
Matrix.of(context).client.encryption.keyManager.isCached(), .client
.encryption
.keyManager
.isCached(),
builder: (context, snapshot) => ListTile( builder: (context, snapshot) => ListTile(
title: Text(L10n.of(context).keysCached), title: Text(L10n.of(context).keysCached),
trailing: snapshot.data == true trailing: snapshot.data == true
@ -93,6 +98,7 @@ class SettingsSecurityView extends StatelessWidget {
], ],
), ),
), ),
),
); );
} }
} }

8
lib/pages/settings_style/settings_style_view.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:adaptive_theme/adaptive_theme.dart'; import 'package:adaptive_theme/adaptive_theme.dart';
@ -93,7 +92,7 @@ class SettingsStyleView extends StatelessWidget {
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
trailing: const Icon( trailing: const Icon(
CupertinoIcons.delete, Icons.delete_outlined,
color: Colors.red, color: Colors.red,
), ),
onTap: controller.deleteWallpaperAction, onTap: controller.deleteWallpaperAction,
@ -101,7 +100,10 @@ class SettingsStyleView extends StatelessWidget {
Builder(builder: (context) { Builder(builder: (context) {
return ListTile( return ListTile(
title: Text(L10n.of(context).changeWallpaper), title: Text(L10n.of(context).changeWallpaper),
trailing: const Icon(CupertinoIcons.photo), trailing: Icon(
Icons.photo_outlined,
color: Theme.of(context).textTheme.bodyText1.color,
),
onTap: controller.setWallpaperAction, onTap: controller.setWallpaperAction,
); );
}), }),

4
lib/widgets/content_banner.dart
View File

@ -18,7 +18,7 @@ class ContentBanner extends StatelessWidget {
const ContentBanner(this.mxContent, const ContentBanner(this.mxContent,
{this.height = 400, {this.height = 400,
this.defaultIcon = CupertinoIcons.group, this.defaultIcon = Icons.people_outlined,
this.loading = false, this.loading = false,
this.onEdit, this.onEdit,
this.client, this.client,
@ -72,7 +72,7 @@ class ContentBanner extends StatelessWidget {
onPressed: onEdit, onPressed: onEdit,
backgroundColor: Theme.of(context).backgroundColor, backgroundColor: Theme.of(context).backgroundColor,
foregroundColor: Theme.of(context).textTheme.bodyText1.color, foregroundColor: Theme.of(context).textTheme.bodyText1.color,
child: const Icon(CupertinoIcons.camera), child: const Icon(Icons.camera_alt_outlined),
), ),
), ),
], ],