diff --git a/lib/screens/channel/chat/chat.dart b/lib/screens/channel/chat/chat.dart index 4eb24573..3ef80217 100644 --- a/lib/screens/channel/chat/chat.dart +++ b/lib/screens/channel/chat/chat.dart @@ -59,8 +59,8 @@ class _ChatState extends State with WidgetsBindingObserver { builder: (context) => ChatMessage( ircMessage: chatStore.messages[index], assetsStore: chatStore.assetsStore, - hideMessageIfBanned: context.read().hideBannedMessages, - zeroWidth: context.read().zeroWidthEnabled, + hideMessageIfBanned: chatStore.settings.hideBannedMessages, + zeroWidth: chatStore.settings.zeroWidthEnabled, ), ), ), @@ -82,7 +82,7 @@ class _ChatState extends State with WidgetsBindingObserver { ], ), ), - if (context.read().isLoggedIn) ChatBottomBar(chatStore: chatStore), + if (chatStore.auth.isLoggedIn) ChatBottomBar(chatStore: chatStore), if (chatStore.assetsStore.showEmoteMenu) Expanded( child: EmoteMenu( diff --git a/lib/screens/channel/video/video.dart b/lib/screens/channel/video/video.dart index a9186f6f..f7162903 100644 --- a/lib/screens/channel/video/video.dart +++ b/lib/screens/channel/video/video.dart @@ -1,10 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_mobx/flutter_mobx.dart'; -import 'package:frosty/core/settings/settings_store.dart'; import 'package:frosty/screens/channel/video/video_overlay.dart'; import 'package:frosty/screens/channel/video/video_store.dart'; -import 'package:provider/provider.dart'; import 'package:webview_flutter/webview_flutter.dart'; class Video extends StatelessWidget { @@ -23,7 +21,7 @@ class Video extends StatelessWidget { aspectRatio: 16 / 9, child: Observer( builder: (context) { - if (context.read().overlayEnabled) { + if (videoStore.settingsStore.overlayEnabled) { return Stack( children: [ WebView( diff --git a/lib/screens/channel/video_chat.dart b/lib/screens/channel/video_chat.dart index ee13d4a0..bdd751e8 100644 --- a/lib/screens/channel/video_chat.dart +++ b/lib/screens/channel/video_chat.dart @@ -24,21 +24,24 @@ class VideoChat extends StatelessWidget { @override Widget build(BuildContext context) { + final authStore = context.read(); + final settingsStore = context.read(); + final video = Video( key: GlobalKey(), userLogin: userLogin, videoStore: VideoStore( userLogin: userLogin, - authStore: context.read(), - settingsStore: context.read(), + authStore: authStore, + settingsStore: settingsStore, ), ); final chat = Chat( key: GlobalKey(), chatStore: ChatStore( - auth: context.read(), - settings: context.read(), + auth: authStore, + settings: settingsStore, channelName: userLogin, ), ); @@ -54,7 +57,7 @@ class VideoChat extends StatelessWidget { onPressed: () => showModalBottomSheet( context: context, builder: (context) { - return Settings(settingsStore: context.read()); + return Settings(settingsStore: settingsStore); }, ), ), @@ -66,12 +69,12 @@ class VideoChat extends StatelessWidget { child: OrientationBuilder( builder: (context, orientation) { if (orientation == Orientation.landscape) { - if (context.read().fullScreen) SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky); + if (settingsStore.fullScreen) SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky); return Observer( builder: (context) { - if (context.read().videoEnabled) { + if (settingsStore.videoEnabled) { return Observer( - builder: (context) => context.read().fullScreen + builder: (context) => settingsStore.fullScreen ? WillPopScope( onWillPop: () async => false, child: Stack( @@ -114,7 +117,7 @@ class VideoChat extends StatelessWidget { children: [ Observer( builder: (context) { - if (context.read().videoEnabled) { + if (settingsStore.videoEnabled) { return video; } return appBar; diff --git a/lib/screens/home/home.dart b/lib/screens/home/home.dart index 16cd2d2a..2c8b3c40 100644 --- a/lib/screens/home/home.dart +++ b/lib/screens/home/home.dart @@ -32,14 +32,15 @@ class Home extends StatelessWidget { @override Widget build(BuildContext context) { - debugPrint('build home'); + final authStore = context.read(); + return Scaffold( appBar: AppBar( centerTitle: false, title: Observer( builder: (_) { final titles = [ - if (context.read().isLoggedIn) 'Followed Streams', + if (authStore.isLoggedIn) 'Followed Streams', 'Top Streams', 'Categories', 'Search', @@ -70,7 +71,7 @@ class Home extends StatelessWidget { return IndexedStack( index: homeStore.selectedIndex, children: [ - if (context.read().isLoggedIn) FollowedStreams(store: followedStreamsStore), + if (authStore.isLoggedIn) FollowedStreams(store: followedStreamsStore), TopStreams(store: topStreamsStore), Categories(store: categoriesStore), Search(searchStore: searchStore), @@ -83,7 +84,7 @@ class Home extends StatelessWidget { return BottomNavigationBar( type: BottomNavigationBarType.fixed, items: [ - if (context.read().isLoggedIn) + if (authStore.isLoggedIn) const BottomNavigationBarItem( icon: Icon(Icons.favorite), label: 'Followed',