mirror of
https://github.com/HChaZZY/PiliPlus.git
synced 2025-12-06 09:13:48 +08:00
feat: sponsorblock: show video label
Closes #102 Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
@@ -476,6 +476,7 @@ class VideoDetailController extends GetxController
|
|||||||
List<Segment>? _segmentProgressList;
|
List<Segment>? _segmentProgressList;
|
||||||
Color _getColor(SegmentType segment) =>
|
Color _getColor(SegmentType segment) =>
|
||||||
_blockColor?[segment.index] ?? segment.color;
|
_blockColor?[segment.index] ?? segment.color;
|
||||||
|
late RxString videoLabel = ''.obs;
|
||||||
|
|
||||||
Timer? skipTimer;
|
Timer? skipTimer;
|
||||||
late final listKey = GlobalKey<AnimatedListState>();
|
late final listKey = GlobalKey<AnimatedListState>();
|
||||||
@@ -747,6 +748,7 @@ class VideoDetailController extends GetxController
|
|||||||
},
|
},
|
||||||
options: _options,
|
options: _options,
|
||||||
);
|
);
|
||||||
|
videoLabel.value = '';
|
||||||
segmentList.clear();
|
segmentList.clear();
|
||||||
_segmentProgressList = null;
|
_segmentProgressList = null;
|
||||||
_handleSBData(result);
|
_handleSBData(result);
|
||||||
@@ -772,6 +774,10 @@ class VideoDetailController extends GetxController
|
|||||||
(item) {
|
(item) {
|
||||||
SegmentType segmentType =
|
SegmentType segmentType =
|
||||||
SegmentType.values[list.indexOf(item['category'])];
|
SegmentType.values[list.indexOf(item['category'])];
|
||||||
|
if (item['segment'][0] == 0 && item['segment'][1] == 0) {
|
||||||
|
videoLabel.value +=
|
||||||
|
'${videoLabel.value.isNotEmpty ? '/' : ''}${segmentType.title}';
|
||||||
|
}
|
||||||
SkipType skipType = _blockSettings![segmentType.index].second;
|
SkipType skipType = _blockSettings![segmentType.index].second;
|
||||||
if (skipType != SkipType.showOnly) {
|
if (skipType != SkipType.showOnly) {
|
||||||
if (item['segment'][1] == item['segment'][0] ||
|
if (item['segment'][1] == item['segment'][0] ||
|
||||||
|
|||||||
@@ -137,6 +137,77 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
|
|||||||
|
|
||||||
late final _horizontalMemberPage = GStorage.horizontalMemberPage;
|
late final _horizontalMemberPage = GStorage.horizontalMemberPage;
|
||||||
|
|
||||||
|
Widget get _buildVideoTitle => videoDetailCtr.enableSponsorBlock
|
||||||
|
? Obx(
|
||||||
|
() => Text.rich(
|
||||||
|
TextSpan(
|
||||||
|
children: [
|
||||||
|
if (videoDetailCtr.videoLabel.value.isNotEmpty) ...[
|
||||||
|
WidgetSpan(
|
||||||
|
alignment: PlaceholderAlignment.middle,
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 4,
|
||||||
|
vertical: 2,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Theme.of(context).colorScheme.secondaryContainer,
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Stack(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.shield_outlined,
|
||||||
|
size:
|
||||||
|
MediaQuery.textScalerOf(context).scale(16),
|
||||||
|
),
|
||||||
|
Icon(
|
||||||
|
Icons.play_arrow_rounded,
|
||||||
|
size:
|
||||||
|
MediaQuery.textScalerOf(context).scale(12),
|
||||||
|
color: Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.onSecondaryContainer,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
videoDetailCtr.videoLabel.value,
|
||||||
|
strutStyle: StrutStyle(leading: 0, height: 1),
|
||||||
|
style: TextStyle(
|
||||||
|
height: 1,
|
||||||
|
fontSize: 13,
|
||||||
|
color: Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.onSecondaryContainer,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
TextSpan(text: ' '),
|
||||||
|
],
|
||||||
|
TextSpan(
|
||||||
|
text: '${videoDetail.title ?? videoItem['title'] ?? ''}'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(fontSize: 16),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: Text(
|
||||||
|
'${videoDetail.title ?? videoItem['title'] ?? ''}',
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(fontSize: 16),
|
||||||
|
);
|
||||||
|
|
||||||
void handleState(Future Function() action) async {
|
void handleState(Future Function() action) async {
|
||||||
if (isProcessing.not) {
|
if (isProcessing.not) {
|
||||||
isProcessing = true;
|
isProcessing = true;
|
||||||
@@ -455,12 +526,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
|
|||||||
Utils.copyText(
|
Utils.copyText(
|
||||||
'${videoDetail.title ?? videoItem['title'] ?? ''}');
|
'${videoDetail.title ?? videoItem['title'] ?? ''}');
|
||||||
},
|
},
|
||||||
child: Text(
|
child: _buildVideoTitle,
|
||||||
'${videoDetail.title ?? videoItem['title'] ?? ''}',
|
|
||||||
maxLines: 2,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: const TextStyle(fontSize: 16),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
expanded: GestureDetector(
|
expanded: GestureDetector(
|
||||||
onLongPress: () {
|
onLongPress: () {
|
||||||
@@ -468,10 +534,7 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
|
|||||||
Utils.copyText(
|
Utils.copyText(
|
||||||
'${videoDetail.title ?? videoItem['title'] ?? ''}');
|
'${videoDetail.title ?? videoItem['title'] ?? ''}');
|
||||||
},
|
},
|
||||||
child: Text(
|
child: _buildVideoTitle,
|
||||||
videoDetail.title ?? videoItem['title'] ?? '',
|
|
||||||
style: const TextStyle(fontSize: 16),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
theme: const ExpandableThemeData(
|
theme: const ExpandableThemeData(
|
||||||
animationDuration: Duration(milliseconds: 300),
|
animationDuration: Duration(milliseconds: 300),
|
||||||
|
|||||||
Reference in New Issue
Block a user