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:
Krille Fear 2021-02-01 18:30:39 +00:00
commit 5423ca458d
3 changed files with 11 additions and 4 deletions

View File

@ -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(

View File

@ -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});
}
},
),

View File

@ -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],
},
);
},
);