From a64ada50d45b54c52e66a3467309726d1622acf9 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 24 Apr 2021 08:00:03 +0200 Subject: [PATCH] refactor: MVC multiple emote settings --- lib/config/routes.dart | 2 +- lib/views/settings_multiple_emotes.dart | 18 ++++++++++++++++++ lib/views/ui/settings_multiple_emotes_ui.dart | 10 ++++++---- 3 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 lib/views/settings_multiple_emotes.dart diff --git a/lib/config/routes.dart b/lib/config/routes.dart index a780f77b..31c5e054 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -4,6 +4,7 @@ import 'package:fluffychat/views/archive.dart'; import 'package:fluffychat/views/homeserver_picker.dart'; import 'package:fluffychat/views/invitation_selection.dart'; import 'package:fluffychat/views/settings_emotes.dart'; +import 'package:fluffychat/views/settings_multiple_emotes.dart'; import 'package:fluffychat/views/sign_up.dart'; import 'package:fluffychat/views/sign_up_password.dart'; import 'package:fluffychat/views/widgets/matrix.dart'; @@ -23,7 +24,6 @@ import 'package:fluffychat/views/ui/settings_ui.dart'; import 'package:fluffychat/views/settings_3pid.dart'; import 'package:fluffychat/views/device_settings.dart'; import 'package:fluffychat/views/settings_ignore_list.dart'; -import 'package:fluffychat/views/ui/settings_multiple_emotes_ui.dart'; import 'package:fluffychat/views/ui/settings_notifications_ui.dart'; import 'package:fluffychat/views/settings_style.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/settings_multiple_emotes.dart b/lib/views/settings_multiple_emotes.dart new file mode 100644 index 00000000..5d8ea674 --- /dev/null +++ b/lib/views/settings_multiple_emotes.dart @@ -0,0 +1,18 @@ +import 'package:flutter/material.dart'; + +import 'ui/settings_multiple_emotes_ui.dart'; + +class MultipleEmotesSettings extends StatefulWidget { + final String roomId; + + MultipleEmotesSettings(this.roomId, {Key key}) : super(key: key); + + @override + MultipleEmotesSettingsController createState() => + MultipleEmotesSettingsController(); +} + +class MultipleEmotesSettingsController extends State { + @override + Widget build(BuildContext context) => MultipleEmotesSettingsUI(this); +} diff --git a/lib/views/ui/settings_multiple_emotes_ui.dart b/lib/views/ui/settings_multiple_emotes_ui.dart index 7885d5b9..a536af75 100644 --- a/lib/views/ui/settings_multiple_emotes_ui.dart +++ b/lib/views/ui/settings_multiple_emotes_ui.dart @@ -1,17 +1,19 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; +import 'package:fluffychat/views/settings_multiple_emotes.dart'; import 'package:fluffychat/views/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -class MultipleEmotesSettings extends StatelessWidget { - final String roomId; +class MultipleEmotesSettingsUI extends StatelessWidget { + final MultipleEmotesSettingsController controller; - MultipleEmotesSettings(this.roomId, {Key key}) : super(key: key); + MultipleEmotesSettingsUI(this.controller, {Key key}) : super(key: key); @override Widget build(BuildContext context) { - final room = Matrix.of(context).client.getRoomById(roomId); + final room = + Matrix.of(context).client.getRoomById(controller.widget.roomId); return Scaffold( appBar: AppBar( leading: BackButton(),