GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-02-17 14:30:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/fix-emotes-screen' into 'main'

Browse Source 
fix: Bring back proper emote settings

See merge request famedly/fluffychat!362
This commit is contained in:
Krille Fear 2021-02-01 18:30:39 +00:00
commit 5423ca458d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/config/routes.dart
View File

@ -161,7 +161,10 @@ class FluffyRoutes {
case 'emotes': case 'emotes':
return ViewData( return ViewData(
leftView: (_) => Settings(), leftView: (_) => Settings(),
mainView: (_) => EmotesSettings(room: settings.arguments), mainView: (_) => EmotesSettings(
room: (settings.arguments as Map)['room'],
stateKey: (settings.arguments as Map)['stateKey'],
),
); );
case 'ignore': case 'ignore':
return ViewData( return ViewData(

5
lib/views/chat_details.dart
View File

@ -322,8 +322,9 @@ class _ChatDetailsState extends State<ChatDetails> {
await AdaptivePageLayout.of(context) await AdaptivePageLayout.of(context)
.pushNamed('/rooms/${room.id}/emotes'); .pushNamed('/rooms/${room.id}/emotes');
} else { } else {
await AdaptivePageLayout.of(context) await AdaptivePageLayout.of(context).pushNamed(
.pushNamed('/settings/emotes'); '/settings/emotes',
arguments: {'room': room});
} }
}, },
), ),

5
lib/views/settings_multiple_emotes.dart
View File

@ -45,7 +45,10 @@ class MultipleEmotesSettings extends StatelessWidget {
onTap: () async { onTap: () async {
await AdaptivePageLayout.of(context).pushNamed( await AdaptivePageLayout.of(context).pushNamed(
'/settings/emotes', '/settings/emotes',
arguments: room, arguments: {
'room': room,
'stateKey': keys[i],
},
); );
}, },
); );