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

Merge branch 'soru/emote-settings' into 'main'

Browse source 
fix: Make emote settings work again

Closes #446

See merge request famedly/fluffychat!429
This commit is contained in:
Krille Fear 2021-06-24 14:43:46 +00:00
commit bf378a3caf
5 changed files with 49 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pages/views/settings_emotes_view.dart
View file

@ -28,7 +28,7 @@ class EmotesSettingsView extends StatelessWidget {
: null,
body: MaxWidthBody(
child: StreamBuilder(
stream: controller.widget.room?.onUpdate?.stream,
stream: controller.room?.onUpdate?.stream,
builder: (context, snapshot) {
return Column(
children: <Widget>[
@ -81,7 +81,7 @@ class EmotesSettingsView extends StatelessWidget {
),
),
),
if (controller.widget.room != null)
if (controller.room != null)
ListTile(
title: Text(L10n.of(context).enableEmotesGlobally),
trailing: Switch(
@ -89,7 +89,7 @@ class EmotesSettingsView extends StatelessWidget {
onChanged: controller.setIsGloballyActive,
),
),
if (!controller.readonly || controller.widget.room != null)
if (!controller.readonly || controller.room != null)
Divider(
height: 2,
thickness: 2,

3
lib/pages/views/settings_multiple_emotes_view.dart
View file

@ -44,7 +44,8 @@ class MultipleEmotesSettingsView extends StatelessWidget {
return ListTile(
title: Text(packName),
onTap: () async {
VRouter.of(context).push('/settings/emotes');
VRouter.of(context)
.push('/rooms/${room.id}/details/emotes/${keys[i]}');
},
);
});