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 comments bug when changing episode #573

Merged
merged 2 commits into from
Jan 8, 2025
Merged

fix comments bug when changing episode #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f256186
fix comments bug when changing episode
ErBWs Jan 8, 2025
a8b59b9
fix keyboard focus
ErBWs Jan 8, 2025
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
64 changes: 34 additions & 30 deletions lib/pages/player/episode_comments_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ class EpisodeCommentsSheet extends StatefulWidget {
State<EpisodeCommentsSheet> createState() => _EpisodeCommentsSheetState();
}

class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet>
with AutomaticKeepAliveClientMixin {
class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {
final infoController = Modular.get<InfoController>();
bool isLoading = false;
bool commentsQueryTimeout = false;
Expand Down Expand Up @@ -58,30 +57,39 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet>

Widget get episodeCommentsBody {
return SelectionArea(
child: Padding(
padding: const EdgeInsets.fromLTRB(4, 0, 4, 4),
child: Observer(builder: (context) {
if (isLoading) {
return const Center(
child: CircularProgressIndicator(),
);
}
if (commentsQueryTimeout) {
return const Center(
child: Text('空空如也'),
);
}
return SingleChildScrollView(
child: ListView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemCount: infoController.episodeCommentsList.length,
itemBuilder: (context, index) {
return EpisodeCommentsCard(
commentItem: infoController.episodeCommentsList[index]);
}));
}),
));
child: CustomScrollView(
slivers: [
SliverPadding(
padding: const EdgeInsets.fromLTRB(4, 0, 4, 4),
sliver: Observer(builder: (context) {
if (isLoading) {
return const SliverFillRemaining(
child: Center(
child: CircularProgressIndicator(),
),
);
}
if (commentsQueryTimeout) {
return const SliverFillRemaining(
child: Center(
child: Text('空空如也'),
),
);
}
return SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {
return EpisodeCommentsCard(
commentItem: infoController.episodeCommentsList[index]);
},
childCount: infoController.episodeCommentsList.length,
),
);
}),
),
],
),
);
}

Widget get commentsInfo {
Expand Down Expand Up @@ -184,15 +192,11 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet>

@override
Widget build(BuildContext context) {
super.build(context);
return Scaffold(
body: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [commentsInfo, Expanded(child: episodeCommentsBody)],
),
);
}

@override
bool get wantKeepAlive => true;
}
34 changes: 16 additions & 18 deletions lib/pages/player/player_item.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,21 @@ import 'package:kazumi/pages/player/player_item_surface.dart';
import 'package:mobx/mobx.dart' as mobx;

class PlayerItem extends StatefulWidget {
const PlayerItem(
{super.key,
required this.openMenu,
required this.locateEpisode,
required this.changeEpisode,
required this.onBackPressed});
const PlayerItem({
super.key,
required this.openMenu,
required this.locateEpisode,
required this.changeEpisode,
required this.onBackPressed,
required this.keyboardFocus,
});

final VoidCallback openMenu;
final VoidCallback locateEpisode;
final Future<void> Function(int episode, {int currentRoad, int offset})
changeEpisode;
final void Function(BuildContext) onBackPressed;
final FocusNode keyboardFocus;

@override
State<PlayerItem> createState() => _PlayerItemState();
Expand All @@ -60,7 +63,6 @@ class _PlayerItemState extends State<PlayerItem>
final HistoryController historyController = Modular.get<HistoryController>();
final InfoController infoController = Modular.get<InfoController>();
final CollectController collectController = Modular.get<CollectController>();
final FocusNode _focusNode = FocusNode();
late DanmakuController danmakuController;

// 1. 在看
Expand Down Expand Up @@ -289,10 +291,8 @@ class _PlayerItemState extends State<PlayerItem>
Timer getPlayerTimer() {
return Timer.periodic(const Duration(seconds: 1), (timer) {
playerController.playing = playerController.playerPlaying;
playerController.isBuffering =
playerController.playerBuffering;
playerController.currentPosition =
playerController.playerPosition;
playerController.isBuffering = playerController.playerBuffering;
playerController.currentPosition = playerController.playerPosition;
playerController.buffer = playerController.playerBuffer;
playerController.duration = playerController.playerDuration;
playerController.completed = playerController.playerCompleted;
Expand Down Expand Up @@ -361,8 +361,7 @@ class _PlayerItemState extends State<PlayerItem>
});
}
// 历史记录相关
if (playerController.playerPlaying &&
!videoPageController.loading) {
if (playerController.playerPlaying && !videoPageController.loading) {
historyController.updateHistory(
videoPageController.currentEpisode,
videoPageController.currentRoad,
Expand Down Expand Up @@ -481,7 +480,7 @@ class _PlayerItemState extends State<PlayerItem>
TextButton(
onPressed: () {
KazumiDialog.dismiss();
_focusNode.requestFocus();
widget.keyboardFocus.requestFocus();
},
child: Text(
'取消',
Expand Down Expand Up @@ -644,7 +643,8 @@ class _PlayerItemState extends State<PlayerItem>
child: Focus(
// workaround for #461
// I don't know why, but the focus node will break popscope.
focusNode: Utils.isDesktop() ? _focusNode : null,
focusNode:
Utils.isDesktop() ? widget.keyboardFocus : null,
autofocus: Utils.isDesktop(),
onKeyEvent: (focusNode, KeyEvent event) {
if (event is KeyDownEvent) {
Expand Down Expand Up @@ -919,9 +919,7 @@ class _PlayerItemState extends State<PlayerItem>
),
),
),
)
// SizedBox(child: Text("${videoController.androidFullscreen}")),
;
);
},
);
}
Expand Down
106 changes: 53 additions & 53 deletions lib/pages/video/video_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ class _VideoPageState extends State<VideoPage>
late bool playResume;
bool showDebugLog = false;
List<String> logLines = [];
final FocusNode keyboardFocus = FocusNode();

ScrollController scrollController = ScrollController();
late GridObserverController observerController;
Expand Down Expand Up @@ -200,6 +201,7 @@ class _VideoPageState extends State<VideoPage>
Future.delayed(const Duration(milliseconds: 100), () {
videoPageController.showTabBody = false;
});
keyboardFocus.requestFocus();
}

void onBackPressed(BuildContext context) async {
Expand Down Expand Up @@ -270,7 +272,7 @@ class _VideoPageState extends State<VideoPage>
width: MediaQuery.of(context).size.width,
child: playerBody,
),
if (videoPageController.showTabBody)
if (videoPageController.showTabBody) ...[
GestureDetector(
onTap: () {
closeTabBodyAnimated();
Expand All @@ -281,17 +283,18 @@ class _VideoPageState extends State<VideoPage>
height: double.infinity,
),
),
SlideTransition(
position: _rightOffsetAnimation,
child: SizedBox(
height: MediaQuery.of(context).size.height,
width:
MediaQuery.of(context).size.width * 1 / 3 > 420
? 420
: MediaQuery.of(context).size.width * 1 / 3,
child: tabBody,
SlideTransition(
position: _rightOffsetAnimation,
child: SizedBox(
height: MediaQuery.of(context).size.height,
width: MediaQuery.of(context).size.width * 1 / 3 >
420
? 420
: MediaQuery.of(context).size.width * 1 / 3,
child: tabBody,
),
),
),
],
],
)
: (!videoPageController.isFullscreen)
Expand Down Expand Up @@ -522,6 +525,7 @@ class _VideoPageState extends State<VideoPage>
locateEpisode: menuJumpToCurrentEpisode,
changeEpisode: changeEpisode,
onBackPressed: onBackPressed,
keyboardFocus: keyboardFocus,
),
),

Expand Down Expand Up @@ -718,50 +722,46 @@ class _VideoPageState extends State<VideoPage>
episodeNum = videoPageController.currentEpisode;
}

return Visibility(
maintainState: true,
visible: videoPageController.showTabBody,
child: Container(
color: Theme.of(context).canvasColor,
child: DefaultTabController(
length: 2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
dividerHeight: Utils.isDesktop() ? 0.5 : 0.2,
isScrollable: true,
tabAlignment: TabAlignment.start,
labelPadding:
const EdgeInsetsDirectional.only(start: 30, end: 30),
onTap: (index) {
if (index == 0) {
menuJumpToCurrentEpisode();
}
},
tabs: const [
Tab(text: '选集'),
Tab(text: '评论'),
],
),
Expanded(
child: TabBarView(
children: [
GridViewObserver(
controller: observerController,
child: Column(
children: [
menuBar,
menuBody,
],
),
return Container(
color: Theme.of(context).canvasColor,
child: DefaultTabController(
length: 2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
dividerHeight: Utils.isDesktop() ? 0.5 : 0.2,
isScrollable: true,
tabAlignment: TabAlignment.start,
labelPadding:
const EdgeInsetsDirectional.only(start: 30, end: 30),
onTap: (index) {
if (index == 0) {
menuJumpToCurrentEpisode();
}
},
tabs: const [
Tab(text: '选集'),
Tab(text: '评论'),
],
),
Expanded(
child: TabBarView(
children: [
GridViewObserver(
controller: observerController,
child: Column(
children: [
menuBar,
menuBody,
],
),
EpisodeCommentsSheet(episode: episodeNum),
],
),
),
EpisodeCommentsSheet(episode: episodeNum),
],
),
],
),
),
],
),
),
);
Expand Down
Loading