Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #527 #531

Merged
merged 1 commit into from
Apr 27, 2024
Merged

fix #527 #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/channels/views/screens/channel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions lib/home/views/screens/home.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 1 addition & 0 deletions lib/search/views/screens/search.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
3 changes: 2 additions & 1 deletion lib/videos/views/screens/video.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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,
Expand Down
Loading