mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-12-25 06:52:35 +01:00
Merge branch 'soru/fix-emotes-screen' into 'main'
fix: Bring back proper emote settings See merge request famedly/fluffychat!362
This commit is contained in:
commit
5423ca458d
@ -161,7 +161,10 @@ class FluffyRoutes {
|
||||
case 'emotes':
|
||||
return ViewData(
|
||||
leftView: (_) => Settings(),
|
||||
mainView: (_) => EmotesSettings(room: settings.arguments),
|
||||
mainView: (_) => EmotesSettings(
|
||||
room: (settings.arguments as Map)['room'],
|
||||
stateKey: (settings.arguments as Map)['stateKey'],
|
||||
),
|
||||
);
|
||||
case 'ignore':
|
||||
return ViewData(
|
||||
|
@ -322,8 +322,9 @@ class _ChatDetailsState extends State<ChatDetails> {
|
||||
await AdaptivePageLayout.of(context)
|
||||
.pushNamed('/rooms/${room.id}/emotes');
|
||||
} else {
|
||||
await AdaptivePageLayout.of(context)
|
||||
.pushNamed('/settings/emotes');
|
||||
await AdaptivePageLayout.of(context).pushNamed(
|
||||
'/settings/emotes',
|
||||
arguments: {'room': room});
|
||||
}
|
||||
},
|
||||
),
|
||||
|
@ -45,7 +45,10 @@ class MultipleEmotesSettings extends StatelessWidget {
|
||||
onTap: () async {
|
||||
await AdaptivePageLayout.of(context).pushNamed(
|
||||
'/settings/emotes',
|
||||
arguments: room,
|
||||
arguments: {
|
||||
'room': room,
|
||||
'stateKey': keys[i],
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user