2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

design: Adjust design to new material 3 capabilities of Flutter 3.7

Browse source
This commit is contained in:
Christian Pauly 2023-02-02 09:47:35 +01:00
commit b176811f7c
10 changed files with 34 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pages/chat/chat_input_row.dart
View file

@ -11,7 +11,6 @@ import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
import '../../config/themes.dart';
import '../../widgets/m2_popup_menu_button.dart';
import 'chat.dart';
import 'input_bar.dart';
@ -92,7 +91,7 @@ class ChatInputRow extends StatelessWidget {
alignment: Alignment.center,
clipBehavior: Clip.hardEdge,
decoration: const BoxDecoration(),
child: M2PopupMenuButton<String>(
child: PopupMenuButton<String>(
icon: const Icon(Icons.add_outlined),
onSelected: controller.onAddPopupMenuButtonSelected,
itemBuilder: (BuildContext context) =>
@ -298,7 +297,7 @@ class _ChatAccountPicker extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
child: FutureBuilder<Profile>(
future: controller.sendingClient!.fetchOwnProfile(),
builder: (context, snapshot) => M2PopupMenuButton<String>(
builder: (context, snapshot) => PopupMenuButton<String>(
onSelected: _popupMenuButtonSelected,
itemBuilder: (BuildContext context) => clients
.map((client) => PopupMenuItem<String>(

3
lib/pages/chat/chat_view.dart
View file

@ -22,7 +22,6 @@ import 'package:fluffychat/widgets/connection_status_header.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:fluffychat/widgets/unread_rooms_badge.dart';
import '../../utils/stream_extension.dart';
import '../../widgets/m2_popup_menu_button.dart';
import 'chat_emoji_picker.dart';
import 'chat_input_row.dart';
@ -67,7 +66,7 @@ class ChatView extends StatelessWidget {
tooltip: L10n.of(context)!.pinMessage,
),
if (controller.selectedEvents.length == 1)
M2PopupMenuButton<_EventContextAction>(
PopupMenuButton<_EventContextAction>(
onSelected: (action) {
switch (action) {
case _EventContextAction.info:

7
lib/pages/chat_details/chat_details_view.dart
View file

@ -16,7 +16,6 @@ import 'package:fluffychat/widgets/content_banner.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
import 'package:fluffychat/widgets/matrix.dart';
import '../../utils/url_launcher.dart';
import '../../widgets/m2_popup_menu_button.dart';
class ChatDetailsView extends StatelessWidget {
final ChatDetailsController controller;
@ -198,7 +197,7 @@ class ChatDetailsView extends StatelessWidget {
Text(L10n.of(context)!.setCustomEmotes),
onTap: controller.goToEmoteSettings,
),
M2PopupMenuButton(
PopupMenuButton(
onSelected: controller.setJoinRulesAction,
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<JoinRules>>[
@ -232,7 +231,7 @@ class ChatDetailsView extends StatelessWidget {
),
),
),
M2PopupMenuButton(
PopupMenuButton(
onSelected:
controller.setHistoryVisibilityAction,
itemBuilder: (BuildContext context) =>
@ -285,7 +284,7 @@ class ChatDetailsView extends StatelessWidget {
),
),
if (room.joinRules == JoinRules.public)
M2PopupMenuButton(
PopupMenuButton(
onSelected: controller.setGuestAccessAction,
itemBuilder: (BuildContext context) =>
<PopupMenuEntry<GuestAccess>>[

3
lib/pages/chat_list/client_chooser_button.dart
View file

@ -9,7 +9,6 @@ import 'package:vrouter/vrouter.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
import '../../utils/fluffy_share.dart';
import '../../widgets/m2_popup_menu_button.dart';
import 'chat_list.dart';
class ClientChooserButton extends StatelessWidget {
@ -207,7 +206,7 @@ class ClientChooserButton extends StatelessWidget {
onKeysPressed: () => _previousAccount(matrix, context),
child: Container(),
),
M2PopupMenuButton<Object>(
PopupMenuButton<Object>(
onSelected: (o) => _clientSelected(o, context),
itemBuilder: _bundleMenuItems,
child: Material(

3
lib/pages/story/story_view.dart
View file

@ -16,7 +16,6 @@ import 'package:fluffychat/utils/string_color.dart';
import 'package:fluffychat/utils/url_launcher.dart';
import 'package:fluffychat/widgets/avatar.dart';
import '../../config/themes.dart';
import '../../widgets/m2_popup_menu_button.dart';
class StoryView extends StatelessWidget {
final StoryPageController controller;
@ -104,7 +103,7 @@ class StoryView extends StatelessWidget {
icon: Icon(Icons.adaptive.share_outlined),
onPressed: controller.share,
),
M2PopupMenuButton<PopupStoryAction>(
PopupMenuButton<PopupStoryAction>(
color: Colors.white,
onSelected: controller.onPopupStoryAction,
icon: Icon(