HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-06 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: custom horizontal preview

Browse Source 
Closes #117

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-01-08 19:13:37 +08:00
parent 0b9d4d970a
commit 8d4294ba75
22 changed files with 255 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/common/widgets/article_content.dart
View File

@@ -8,6 +8,7 @@ import 'package:flutter_html/flutter_html.dart';
Widget articleContent({
required BuildContext context,
required List<ArticleContentModel> list,
Function(List<String>, int)? callback,
}) {
List<String>? imgList = list
.where((item) => item.pic != null)
@@ -59,10 +60,17 @@ Widget articleContent({
tag: item.pic!.pics!.first.url!,
child: GestureDetector(
onTap: () {
context.imageView(
initialPage: imgList.indexOf(item.pic!.pics!.first.url!),
imgList: imgList,
);
if (callback != null) {
callback(
imgList,
imgList.indexOf(item.pic!.pics!.first.url!),
);
} else {
context.imageView(
initialPage: imgList.indexOf(item.pic!.pics!.first.url!),
imgList: imgList,
);
}
},
child: NetworkImgLayer(
width: constraints.maxWidth,

11
lib/common/widgets/html_render.dart
View File

@@ -9,6 +9,7 @@ Widget htmlRender({
int? imgCount,
List<String>? imgList,
required double constrainedWidth,
Function(List<String>, int)? callback,
}) {
return SelectionArea(
child: Html(
@@ -49,9 +50,13 @@ Widget htmlRender({
tag: imgUrl,
child: GestureDetector(
onTap: () {
context.imageView(
imgList: [imgUrl],
);
if (callback != null) {
callback([imgUrl], 0);
} else {
context.imageView(
imgList: [imgUrl],
);
}
},
child: NetworkImgLayer(
width: isEmote ? 22 : constrainedWidth,

21
lib/common/widgets/imageview.dart
View File

@@ -25,10 +25,11 @@ class ImageModel {
Widget imageview(
double maxWidth,
List<ImageModel> picArr, [
List<ImageModel> picArr, {
VoidCallback? onViewImage,
ValueChanged<int>? onDismissed,
]) {
Function(List<String>, int)? callback,
}) {
double imageWidth = (maxWidth - 2 * 5) / 3;
double imageHeight = imageWidth;
if (picArr.length == 1) {
@@ -59,12 +60,16 @@ Widget imageview(
tag: picArr[index].url,
child: GestureDetector(
onTap: () {
onViewImage?.call();
context.imageView(
initialPage: index,
imgList: picArr.map((item) => item.url).toList(),
onDismissed: onDismissed,
);
if (callback != null) {
callback(picArr.map((item) => item.url).toList(), index);
} else {
onViewImage?.call();
context.imageView(
initialPage: index,
imgList: picArr.map((item) => item.url).toList(),
onDismissed: onDismissed,
);
}
},
child: Stack(
alignment: Alignment.center,

13
lib/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart
View File

@@ -42,8 +42,11 @@ class InteractiveviewerGallery<T> extends StatefulWidget {
this.minScale = 1.0,
this.onPageChanged,
this.onDismissed,
this.setStatusBar,
});
final bool? setStatusBar;
/// The sources to show.
final List<String> sources;
@@ -108,7 +111,9 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
});
currentIndex = widget.initIndex;
setStatusBar();
if (widget.setStatusBar != false) {
setStatusBar();
}
}
setStatusBar() async {
@@ -125,8 +130,10 @@ class _InteractiveviewerGalleryState extends State<InteractiveviewerGallery>
_pageController?.dispose();
_animationController.removeListener(() {});
_animationController.dispose();
if (Platform.isIOS || Platform.isAndroid) {
StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
if (widget.setStatusBar != false) {
if (Platform.isIOS || Platform.isAndroid) {
StatusBarControl.setHidden(false, animation: StatusBarAnimation.FADE);
}
}
for (int index = 0; index < widget.sources.length; index++) {
CachedNetworkImageProvider(_getActualUrl(index)).evict();

3
lib/pages/dynamics/detail/controller.dart
View File

@@ -2,6 +2,7 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/common/reply_controller.dart';
import 'package:PiliPlus/utils/global_data.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:get/get.dart';
import 'package:PiliPlus/http/html.dart';
import 'package:PiliPlus/http/reply.dart';
@@ -14,6 +15,8 @@ class DynamicDetailController extends ReplyController {
dynamic item;
int? floor;
late final horizontalPreview = GStorage.horizontalPreview;
@override
void onInit() {
super.onInit();

29
lib/pages/dynamics/detail/view.dart
View File

@@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:math';
import 'package:PiliPlus/common/widgets/custom_sliver_persistent_header_delegate.dart';
import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item.dart';
@@ -51,6 +52,29 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
late final List<double> _ratio = GStorage.dynamicDetailRatio;
bool get _horizontalPreview =>
context.orientation == Orientation.landscape &&
_dynamicDetailController.horizontalPreview;
late final _key = GlobalKey<ScaffoldState>();
get _getImageCallback => _horizontalPreview
? (imgList, index) {
_key.currentState?.showBottomSheet(
(context) {
return InteractiveviewerGallery(
sources: imgList,
initIndex: index,
setStatusBar: false,
);
},
enableDrag: false,
elevation: 0,
backgroundColor: Colors.transparent,
);
}
: null;
@override
void initState() {
super.initState();
@@ -299,6 +323,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
child: DynamicPanel(
item: _dynamicDetailController.item,
source: 'detail',
callback: _getImageCallback,
),
),
replyPersistentHeader(context),
@@ -326,6 +351,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
child: DynamicPanel(
item: _dynamicDetailController.item,
source: 'detail',
callback: _getImageCallback,
),
),
),
@@ -335,6 +361,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
Expanded(
flex: _ratio[1].toInt(),
child: Scaffold(
key: _key,
body: refreshIndicator(
onRefresh: () async {
await _dynamicDetailController.onRefresh();
@@ -499,6 +526,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
isTop:
_dynamicDetailController.hasUpTop && index == 0,
upMid: loadingState.response.subjectControl.upMid,
callback: _getImageCallback,
)
: ReplyItem(
replyItem: loadingState.response.replies[index],
@@ -515,6 +543,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
);
},
onDelete: _dynamicDetailController.onMDelete,
callback: _getImageCallback,
);
}
},

4
lib/pages/dynamics/widgets/article_panel.dart
View File

@@ -4,7 +4,7 @@ import 'package:PiliPlus/utils/utils.dart';
import '../../../common/constants.dart';
import 'pic_panel.dart';
Widget articlePanel(item, context, {floor = 1}) {
Widget articlePanel(item, context, callback, {floor = 1}) {
TextStyle authorStyle =
TextStyle(color: Theme.of(context).colorScheme.primary);
return Padding(
@@ -52,7 +52,7 @@ Widget articlePanel(item, context, {floor = 1}) {
),
const SizedBox(height: 2),
],
picWidget(item, context)
picWidget(item, context, callback)
],
),
);

104
lib/pages/dynamics/widgets/content_panel.dart
View File

@@ -4,15 +4,7 @@ import 'package:flutter/material.dart';
import 'rich_node_panel.dart';
class Content extends StatelessWidget {
final dynamic item;
final String? source;
const Content({
super.key,
this.item,
this.source,
});
Widget content(context, item, source, callback) {
InlineSpan picsNodes() {
return WidgetSpan(
child: LayoutBuilder(
@@ -27,60 +19,58 @@ class Content extends StatelessWidget {
),
)
.toList(),
callback: callback,
),
),
);
}
@override
Widget build(BuildContext context) {
TextStyle authorStyle =
TextStyle(color: Theme.of(context).colorScheme.primary);
InlineSpan? richNodes = richNode(item, context);
TextStyle authorStyle =
TextStyle(color: Theme.of(context).colorScheme.primary);
InlineSpan? richNodes = richNode(item, context);
return Container(
width: double.infinity,
padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item.modules.moduleDynamic.topic != null) ...[
GestureDetector(
child: Text(
'#${item.modules.moduleDynamic.topic.name}',
style: authorStyle,
),
),
],
if (richNodes != null)
IgnorePointer(
// 禁用SelectableRegion的触摸交互功能
ignoring: source == 'detail' ? false : true,
child: SelectableRegion(
magnifierConfiguration: const TextMagnifierConfiguration(),
focusNode: FocusNode(),
selectionControls: MaterialTextSelectionControls(),
child: Text.rich(
/// fix 默认20px高度
style: TextStyle(
height: 0,
fontSize: source == 'detail' ? 16 : 15,
),
richNodes,
maxLines: source == 'detail' ? 999 : 6,
overflow: TextOverflow.ellipsis,
),
),
),
if (item.modules.moduleDynamic.major != null &&
item.modules.moduleDynamic.major.opus != null &&
item.modules.moduleDynamic.major.opus.pics.isNotEmpty)
Text.rich(
picsNodes(),
// semanticsLabel: '动态图片',
return Container(
width: double.infinity,
padding: const EdgeInsets.fromLTRB(12, 0, 12, 6),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (item.modules.moduleDynamic.topic != null) ...[
GestureDetector(
child: Text(
'#${item.modules.moduleDynamic.topic.name}',
style: authorStyle,
),
),
],
),
);
}
if (richNodes != null)
IgnorePointer(
// 禁用SelectableRegion的触摸交互功能
ignoring: source == 'detail' ? false : true,
child: SelectableRegion(
magnifierConfiguration: const TextMagnifierConfiguration(),
focusNode: FocusNode(),
selectionControls: MaterialTextSelectionControls(),
child: Text.rich(
/// fix 默认20px高度
style: TextStyle(
height: 0,
fontSize: source == 'detail' ? 16 : 15,
),
richNodes,
maxLines: source == 'detail' ? 999 : 6,
overflow: TextOverflow.ellipsis,
),
),
),
if (item.modules.moduleDynamic.major != null &&
item.modules.moduleDynamic.major.opus != null &&
item.modules.moduleDynamic.major.opus.pics.isNotEmpty)
Text.rich(
picsNodes(),
// semanticsLabel: '动态图片',
),
],
),
);
}

6
lib/pages/dynamics/widgets/dynamic_panel.dart
View File

@@ -10,11 +10,13 @@ class DynamicPanel extends StatelessWidget {
final dynamic item;
final String? source;
final Function? onRemove;
final Function(List<String>, int)? callback;
DynamicPanel({
required this.item,
this.source,
this.onRemove,
this.callback,
super.key,
});
@@ -58,8 +60,8 @@ class DynamicPanel extends StatelessWidget {
),
if (item!.modules!.moduleDynamic!.desc != null ||
item!.modules!.moduleDynamic!.major != null)
Content(item: item, source: source),
forWard(item, context, _dynamicsController, source),
content(context, item, source, callback),
forWard(item, context, _dynamicsController, source, callback),
const SizedBox(height: 2),
if (source == null) ActionPanel(item: item),
],

14
lib/pages/dynamics/widgets/forward_panel.dart
View File

@@ -15,7 +15,7 @@ import 'pic_panel.dart';
import 'rich_node_panel.dart';
import 'video_panel.dart';
InlineSpan picsNodes(List<OpusPicsModel> pics) {
InlineSpan picsNodes(List<OpusPicsModel> pics, callback) {
return WidgetSpan(
child: LayoutBuilder(
builder: (context, constraints) => imageview(
@@ -29,12 +29,13 @@ InlineSpan picsNodes(List<OpusPicsModel> pics) {
),
)
.toList(),
callback: callback,
),
),
);
}
Widget forWard(item, context, ctr, source, {floor = 1}) {
Widget forWard(item, context, ctr, source, callback, {floor = 1}) {
TextStyle authorStyle =
TextStyle(color: Theme.of(context).colorScheme.primary);
@@ -100,7 +101,7 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
),
if (hasPics) ...[
Text.rich(
picsNodes(pics),
picsNodes(pics, callback),
// semanticsLabel: '动态图片',
),
],
@@ -110,7 +111,7 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
padding: floor == 2
? EdgeInsets.zero
: const EdgeInsets.only(left: 12, right: 12),
child: picWidget(item, context),
child: picWidget(item, context, callback),
),
/// 附加内容 商品信息、直播预约等等
@@ -129,7 +130,7 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
// 文章
case 'DYNAMIC_TYPE_ARTICLE':
return item is ItemOrigModel
? articlePanel(item, context, floor: floor)
? articlePanel(item, context, callback, floor: floor)
: const SizedBox.shrink();
// return Container(
// padding:
@@ -144,7 +145,8 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
padding:
const EdgeInsets.only(left: 15, top: 10, right: 15, bottom: 8),
color: Theme.of(context).dividerColor.withOpacity(0.08),
child: forWard(item.orig, context, ctr, source, floor: floor + 1),
child: forWard(item.orig, context, ctr, source, callback,
floor: floor + 1),
),
);
// 直播

3
lib/pages/dynamics/widgets/pic_panel.dart
View File

@@ -1,7 +1,7 @@
import 'package:PiliPlus/common/widgets/imageview.dart';
import 'package:flutter/material.dart';
Widget picWidget(item, context) {
Widget picWidget(item, context, callback) {
String type = item.modules.moduleDynamic.major.type;
if (type == 'MAJOR_TYPE_OPUS') {
/// fix 图片跟rich_node_panel重复
@@ -20,6 +20,7 @@ Widget picWidget(item, context) {
),
)
.toList(),
callback: callback,
),
);
}

3
lib/pages/html/controller.dart
View File

@@ -2,6 +2,7 @@ import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/common/reply_controller.dart';
import 'package:PiliPlus/utils/global_data.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:get/get.dart';
import 'package:PiliPlus/http/html.dart';
import 'package:PiliPlus/http/reply.dart';
@@ -17,6 +18,8 @@ class HtmlRenderController extends ReplyController {
RxBool loaded = false.obs;
late final horizontalPreview = GStorage.horizontalPreview;
@override
void onInit() {
super.onInit();

40
lib/pages/html/view.dart
View File

@@ -2,6 +2,7 @@ import 'dart:math';
import 'package:PiliPlus/common/widgets/article_content.dart';
import 'package:PiliPlus/common/widgets/http_error.dart';
import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart';
import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item.dart';
import 'package:PiliPlus/pages/video/detail/reply/widgets/reply_item_grpc.dart';
@@ -44,6 +45,29 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
late final List<double> _ratio = GStorage.dynamicDetailRatio;
bool get _horizontalPreview =>
context.orientation == Orientation.landscape &&
_htmlRenderCtr.horizontalPreview;
late final _key = GlobalKey<ScaffoldState>();
get _getImageCallback => _horizontalPreview
? (imgList, index) {
_key.currentState?.showBottomSheet(
(context) {
return InteractiveviewerGallery(
sources: imgList,
initIndex: index,
setStatusBar: false,
);
},
enableDrag: false,
elevation: 0,
backgroundColor: Colors.transparent,
);
}
: null;
@override
void initState() {
super.initState();
@@ -336,6 +360,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
Expanded(
flex: _ratio[1].toInt(),
child: Scaffold(
key: _key,
body: CustomScrollView(
controller: _htmlRenderCtr.scrollController,
slivers: [
@@ -442,6 +467,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
onDelete: _htmlRenderCtr.onMDelete,
isTop: _htmlRenderCtr.hasUpTop && index == 0,
upMid: loadingState.response.subjectControl.upMid,
callback: _getImageCallback,
)
: ReplyItem(
replyItem: loadingState.response.replies[index],
@@ -458,6 +484,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
);
},
onDelete: _htmlRenderCtr.onMDelete,
callback: _getImageCallback,
);
}
},
@@ -534,11 +561,12 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(_htmlRenderCtr.response['uname'],
style: TextStyle(
fontSize:
Theme.of(context).textTheme.titleSmall!.fontSize,
)),
Text(
_htmlRenderCtr.response['uname'],
style: TextStyle(
fontSize: Theme.of(context).textTheme.titleSmall!.fontSize,
),
),
Text(
_htmlRenderCtr.response['updateTime'],
style: TextStyle(
@@ -561,6 +589,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
? articleContent(
context: context,
list: _htmlRenderCtr.response['content'],
callback: _getImageCallback,
)
: SliverToBoxAdapter(
child: LayoutBuilder(
@@ -568,6 +597,7 @@ class _HtmlRenderPageState extends State<HtmlRenderPage>
context: context,
htmlContent: _htmlRenderCtr.response['content'],
constrainedWidth: constraints.maxWidth,
callback: _getImageCallback,
),
),
)

7
lib/pages/setting/widgets/model.dart
View File

@@ -1655,6 +1655,13 @@ List<SettingsModel> get extraSettings => [
setKey: SettingBoxKey.continuePlayingPart,
defaultVal: true,
),
SettingsModel(
settingsType: SettingsType.sw1tch,
title: '横屏在侧栏打开图片预览',
leading: Icon(Icons.photo_outlined),
setKey: SettingBoxKey.horizontalPreview,
defaultVal: false,
),
SettingsModel(
settingsType: SettingsType.sw1tch,
enableFeedback: true,

4
lib/pages/video/detail/controller.dart
View File

@@ -246,7 +246,9 @@ class VideoDetailController extends GetxController
imageStatus = false;
}
// 页面来源 稍后再看 收藏夹
late final horizontalPreview = GStorage.horizontalPreview;
// 页面来源 稍后再看 收藏夹
String sourceType = 'normal';
late bool _mediaDesc = false;
late RxList<MediaVideoItemModel> mediaList = <MediaVideoItemModel>[].obs;

4
lib/pages/video/detail/reply/view.dart
View File

@@ -24,6 +24,7 @@ class VideoReplyPanel extends StatefulWidget {
final Function replyReply;
final VoidCallback? onViewImage;
final ValueChanged<int>? onDismissed;
final Function(List<String>, int)? callback;
const VideoReplyPanel({
super.key,
@@ -35,6 +36,7 @@ class VideoReplyPanel extends StatefulWidget {
required this.replyReply,
this.onViewImage,
this.onDismissed,
this.callback,
});
@override
@@ -264,6 +266,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
getTag: () => heroTag,
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: widget.callback,
)
: ReplyItem(
replyItem: loadingState.response.replies[index],
@@ -282,6 +285,7 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
getTag: () => heroTag,
callback: widget.callback,
);
}
},

7
lib/pages/video/detail/reply/widgets/reply_item.dart
View File

@@ -35,6 +35,7 @@ class ReplyItem extends StatelessWidget {
this.onViewImage,
this.onDismissed,
this.getTag,
this.callback,
});
final ReplyItemModel? replyItem;
final String? replyLevel;
@@ -47,6 +48,7 @@ class ReplyItem extends StatelessWidget {
final VoidCallback? onViewImage;
final ValueChanged<int>? onDismissed;
final Function? getTag;
final Function(List<String>, int)? callback;
@override
Widget build(BuildContext context) {
@@ -975,8 +977,9 @@ class ReplyItem extends StatelessWidget {
),
)
.toList(),
onViewImage,
onDismissed,
onViewImage: onViewImage,
onDismissed: onDismissed,
callback: callback,
),
),
),

7
lib/pages/video/detail/reply/widgets/reply_item_grpc.dart
View File

@@ -38,6 +38,7 @@ class ReplyItemGrpc extends StatelessWidget {
this.getTag,
this.onViewImage,
this.onDismissed,
this.callback,
});
final ReplyInfo replyItem;
final String? replyLevel;
@@ -53,6 +54,7 @@ class ReplyItemGrpc extends StatelessWidget {
final Function? getTag;
final VoidCallback? onViewImage;
final ValueChanged<int>? onDismissed;
final Function(List<String>, int)? callback;
@override
Widget build(BuildContext context) {
@@ -1006,8 +1008,9 @@ class ReplyItemGrpc extends StatelessWidget {
),
)
.toList(),
onViewImage,
onDismissed,
onViewImage: onViewImage,
onDismissed: onDismissed,
callback: callback,
),
),
),

5
lib/pages/video/detail/reply_reply/controller.dart
View File

@@ -4,6 +4,7 @@ import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models/video/reply/item.dart';
import 'package:PiliPlus/pages/common/common_controller.dart';
import 'package:PiliPlus/utils/global_data.dart';
import 'package:PiliPlus/utils/storage.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:PiliPlus/http/reply.dart';
@@ -37,11 +38,13 @@ class VideoReplyReplyController extends CommonController
RxInt count = (-1).obs;
int? upMid;
dynamic firstFloor;
int? index;
AnimationController? controller;
Animation<Color?>? colorAnimation;
dynamic firstFloor;
late final horizontalPreview = GStorage.horizontalPreview;
@override
void onInit() {

26
lib/pages/video/detail/reply_reply/view.dart
View File

@@ -1,3 +1,4 @@
import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart';
import 'package:PiliPlus/common/widgets/refresh_indicator.dart';
import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart';
import 'package:PiliPlus/http/loading_state.dart';
@@ -58,6 +59,10 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
dynamic get firstFloor =>
widget.firstFloor ?? _videoReplyReplyController.firstFloor;
bool get _horizontalPreview =>
context.orientation == Orientation.landscape &&
_videoReplyReplyController.horizontalPreview;
@override
void initState() {
super.initState();
@@ -174,6 +179,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
isTop: widget.isTop,
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _getImageCallback,
)
: ReplyItem(
replyItem: firstFloor,
@@ -186,6 +192,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
},
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _getImageCallback,
);
} else if (index == 1) {
return Divider(
@@ -271,6 +278,23 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
),
);
get _getImageCallback => _horizontalPreview
? (imgList, index) {
_key.currentState?.showBottomSheet(
(context) {
return InteractiveviewerGallery(
sources: imgList,
initIndex: index,
setStatusBar: false,
);
},
enableDrag: false,
elevation: 0,
backgroundColor: Colors.transparent,
);
}
: null;
void _onReply(dynamic item, int index) {
dynamic oid = item?.oid.toInt();
dynamic root = GlobalData().grpcReply ? item?.id.toInt() : item?.rpid;
@@ -457,6 +481,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
},
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _getImageCallback,
)
: ReplyItem(
replyItem: replyItem,
@@ -477,6 +502,7 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
},
onViewImage: widget.onViewImage,
onDismissed: widget.onDismissed,
callback: _getImageCallback,
);
}

21
lib/pages/video/detail/view.dart
View File

@@ -4,6 +4,7 @@ import 'dart:math';
import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/common/widgets/icon_button.dart';
import 'package:PiliPlus/common/widgets/interactiveviewer_gallery/interactiveviewer_gallery.dart';
import 'package:PiliPlus/common/widgets/list_sheet.dart';
import 'package:PiliPlus/common/widgets/segment_progress_bar.dart';
import 'package:PiliPlus/http/loading_state.dart';
@@ -94,6 +95,10 @@ class _VideoDetailPageState extends State<VideoDetailPage>
context.orientation == Orientation.landscape &&
videoDetailController.horizontalSeasonPanel;
bool get _horizontalPreview =>
context.orientation == Orientation.landscape &&
videoDetailController.horizontalPreview;
StreamSubscription? _listenerDetail;
StreamSubscription? _listenerLoadingState;
StreamSubscription? _listenerCid;
@@ -1543,6 +1548,22 @@ class _VideoDetailPageState extends State<VideoDetailPage>
replyReply: replyReply,
onViewImage: videoDetailController.onViewImage,
onDismissed: videoDetailController.onDismissed,
callback: _horizontalPreview
? (imgList, index) {
videoDetailController.childKey.currentState?.showBottomSheet(
(context) {
return InteractiveviewerGallery(
sources: imgList,
initIndex: index,
setStatusBar: false,
);
},
enableDrag: false,
elevation: 0,
backgroundColor: Colors.transparent,
);
}
: null,
),
);

4
lib/utils/storage.dart
View File

@@ -304,6 +304,9 @@ class GStorage {
static bool get autoUpdate =>
GStorage.setting.get(SettingBoxKey.autoUpdate, defaultValue: true);
static bool get horizontalPreview => GStorage.setting
.get(SettingBoxKey.horizontalPreview, defaultValue: false);
static List<double> get dynamicDetailRatio => List<double>.from(setting
.get(SettingBoxKey.dynamicDetailRatio, defaultValue: [60.0, 40.0]));
@@ -513,6 +516,7 @@ class SettingBoxKey {
badCertificateCallback = 'badCertificateCallback',
continuePlayingPart = 'continuePlayingPart',
cdnSpeedTest = 'cdnSpeedTest',
horizontalPreview = 'horizontalPreview',
// Sponsor Block
enableSponsorBlock = 'enableSponsorBlock',