Merge pull request #531 from lamarios/fix/remove-horizontal-scroll-on…

…-screens fix #527
lamarios · Apr 27, 2024 · cbf393e · cbf393e
2 parents 72f7b43 + 964af31
commit cbf393e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/lib/channels/views/screens/channel.dart b/lib/channels/views/screens/channel.dart
@@ -28,6 +28,7 @@ class ChannelScreen extends StatelessWidget {
             var deviceType = getDeviceType();
             return AutoTabsRouter.tabBar(
                 key: ValueKey(channelState.channel),
+                physics: const NeverScrollableScrollPhysics(),
                 routes: [
                   ChannelInfoRoute(channel: channelState.channel),
                   ChannelVideoRoute(channel: channelState.channel),

diff --git a/lib/home/views/screens/home.dart b/lib/home/views/screens/home.dart
@@ -128,6 +128,7 @@ class _MainScreenState extends State<MainContentScreen> {
               key: ValueKey(appState.server?.url),
               homeIndex: selectedIndex,
               routes: allowedPages.map((e) => e.route!).toList(),
+              physics: const NeverScrollableScrollPhysics(),
               builder: (context, child, controller) {
                 final tabsRouter = AutoTabsRouter.of(context);
                 final selectedPage = allowedPages[tabsRouter.activeIndex];

diff --git a/lib/search/views/screens/search.dart b/lib/search/views/screens/search.dart
@@ -35,6 +35,7 @@ class SearchScreen extends StatelessWidget {
             builder: (context, state) {
               var cubit = context.read<SearchCubit>();
               return AutoTabsRouter.tabBar(
+                  physics: const NeverScrollableScrollPhysics(),
                   routes: const [
                     SearchVideoRoute(),
                     SearchChannelRoute(),

diff --git a/lib/videos/views/screens/video.dart b/lib/videos/views/screens/video.dart
@@ -93,7 +93,7 @@ class VideoScreen extends StatelessWidget {
             settings.state.autoplayVideoOnLoad &&
             previous.video != current.video,
         listener: (context, state) {
-          AutoRouter.of(context).pop();
+          AutoRouter.of(context).maybePop();
           context.read<VideoCubit>().playVideo(false);
         },
         builder: (context, videoState) {
@@ -117,6 +117,7 @@ class VideoScreen extends StatelessWidget {
               opacity: videoState.opacity,
               child: AutoTabsRouter.tabBar(
                   key: ValueKey(videoState.video),
+                  physics: const NeverScrollableScrollPhysics(),
                   routes: [
                     VideoInfoRoute(
                         video: videoState.video,