From 83d5d3ec5874fd334d1e0122133ca9a88ef296c9 Mon Sep 17 00:00:00 2001 From: Krille Date: Wed, 16 Aug 2023 07:55:07 +0200 Subject: [PATCH] change: Remove widgets feature --- .../chat/cupertino_widgets_bottom_sheet.dart | 50 ------------------- lib/pages/chat/widgets_bottom_sheet.dart | 49 ------------------ lib/widgets/chat_settings_popup_menu.dart | 46 ----------------- 3 files changed, 145 deletions(-) delete mode 100644 lib/pages/chat/cupertino_widgets_bottom_sheet.dart delete mode 100644 lib/pages/chat/widgets_bottom_sheet.dart diff --git a/lib/pages/chat/cupertino_widgets_bottom_sheet.dart b/lib/pages/chat/cupertino_widgets_bottom_sheet.dart deleted file mode 100644 index 0bc7ac346..000000000 --- a/lib/pages/chat/cupertino_widgets_bottom_sheet.dart +++ /dev/null @@ -1,50 +0,0 @@ -import 'package:flutter/cupertino.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; -import 'package:url_launcher/link.dart'; - -import 'edit_widgets_dialog.dart'; - -class CupertinoWidgetsBottomSheet extends StatelessWidget { - final Room room; - - const CupertinoWidgetsBottomSheet({Key? key, required this.room}) - : super(key: key); - - @override - Widget build(BuildContext context) { - return CupertinoActionSheet( - title: Text(L10n.of(context)!.matrixWidgets), - actions: [ - ...room.widgets.map( - (widget) => Link( - builder: (context, callback) { - return CupertinoActionSheetAction( - onPressed: callback ?? () {}, - child: Text(widget.name ?? widget.url), - ); - }, - target: LinkTarget.blank, - uri: Uri.parse(widget.url), - ), - ), - CupertinoActionSheetAction( - child: Text(L10n.of(context)!.editWidgets), - onPressed: () { - Navigator.of(context).pop(); - showCupertinoDialog( - context: context, - builder: (context) => EditWidgetsDialog(room: room), - useRootNavigator: false, - ); - }, - ), - CupertinoActionSheetAction( - onPressed: Navigator.of(context).pop, - child: Text(L10n.of(context)!.cancel), - ), - ], - ); - } -} diff --git a/lib/pages/chat/widgets_bottom_sheet.dart b/lib/pages/chat/widgets_bottom_sheet.dart deleted file mode 100644 index 7a52929ce..000000000 --- a/lib/pages/chat/widgets_bottom_sheet.dart +++ /dev/null @@ -1,49 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:matrix/matrix.dart'; -import 'package:url_launcher/link.dart'; - -import 'edit_widgets_dialog.dart'; - -class WidgetsBottomSheet extends StatelessWidget { - final Room room; - - const WidgetsBottomSheet({Key? key, required this.room}) : super(key: key); - - @override - Widget build(BuildContext context) { - return ListView.builder( - shrinkWrap: true, - itemBuilder: (context, index) { - if (index == room.widgets.length) { - return ListTile( - leading: const Icon(Icons.edit), - title: Text(L10n.of(context)!.editWidgets), - onTap: () { - Navigator.of(context).pop(); - showDialog( - context: context, - builder: (context) => EditWidgetsDialog(room: room), - useRootNavigator: false, - ); - }, - ); - } - final widget = room.widgets[index]; - return Link( - builder: (context, callback) { - return ListTile( - title: Text(widget.name ?? widget.url), - subtitle: Text(widget.type), - onTap: callback, - ); - }, - target: LinkTarget.blank, - uri: Uri.parse(widget.url), - ); - }, - itemCount: room.widgets.length + 1, - ); - } -} diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 13dcb5fc9..835f9f44c 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -1,6 +1,5 @@ import 'dart:async'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -11,10 +10,6 @@ import 'package:go_router/go_router.dart'; import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/pages/chat/cupertino_widgets_bottom_sheet.dart'; -import 'package:fluffychat/pages/chat/edit_widgets_dialog.dart'; -import 'package:fluffychat/pages/chat/widgets_bottom_sheet.dart'; -import 'package:fluffychat/utils/adaptive_bottom_sheet.dart'; import 'matrix.dart'; class ChatSettingsPopupMenu extends StatefulWidget { @@ -48,16 +43,6 @@ class ChatSettingsPopupMenuState extends State { (u) => setState(() {}), ); final items = >[ - PopupMenuItem( - value: 'widgets', - child: Row( - children: [ - const Icon(Icons.widgets_outlined), - const SizedBox(width: 12), - Text(L10n.of(context)!.matrixWidgets), - ], - ), - ), widget.room.pushRuleState == PushRuleState.notify ? PopupMenuItem( value: 'mute', @@ -117,29 +102,9 @@ class ChatSettingsPopupMenuState extends State { onKeysPressed: _showChatDetails, child: const SizedBox.shrink(), ), - KeyBoardShortcuts( - keysToPress: { - LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.keyW - }, - helpLabel: L10n.of(context)!.matrixWidgets, - onKeysPressed: _showWidgets, - child: const SizedBox.shrink(), - ), PopupMenuButton( onSelected: (String choice) async { switch (choice) { - case 'widgets': - if (widget.room.widgets.isNotEmpty) { - _showWidgets(); - } else { - showDialog( - context: context, - builder: (context) => EditWidgetsDialog(room: widget.room), - useRootNavigator: false, - ); - } - break; case 'leave': final confirmed = await showOkCancelAlertDialog( useRootNavigator: false, @@ -183,17 +148,6 @@ class ChatSettingsPopupMenuState extends State { ); } - void _showWidgets() => [TargetPlatform.iOS, TargetPlatform.macOS] - .contains(Theme.of(context).platform) - ? showCupertinoModalPopup( - context: context, - builder: (context) => CupertinoWidgetsBottomSheet(room: widget.room), - ) - : showAdaptiveBottomSheet( - context: context, - builder: (context) => WidgetsBottomSheet(room: widget.room), - ); - void _showChatDetails() { if (GoRouterState.of(context).uri.path.endsWith('/details')) { context.go('/rooms/${widget.room.id}');