Skip to content

Commit

Permalink
Merge branch 'feature-updateVideoDetailStructure'
Browse files Browse the repository at this point in the history
  • Loading branch information
guozhigq committed Mar 13, 2024
2 parents cab74cf + 2ad9c3c commit 73693c5
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
5 changes: 4 additions & 1 deletion lib/pages/video/detail/introduction/view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
final Color outline = t.colorScheme.outline;
return SliverPadding(
padding: const EdgeInsets.only(
left: StyleString.safeSpace, right: StyleString.safeSpace, top: 10),
left: StyleString.safeSpace,
right: StyleString.safeSpace,
top: 16,
),
sliver: SliverToBoxAdapter(
child: !loadingStatus
? Column(
Expand Down
19 changes: 13 additions & 6 deletions lib/pages/video/detail/view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:nil/nil.dart';
import 'package:pilipala/common/widgets/network_img_layer.dart';
import 'package:pilipala/http/user.dart';
import 'package:pilipala/models/common/search_type.dart';
Expand Down Expand Up @@ -308,11 +307,20 @@ class _VideoDetailPageState extends State<VideoDetailPage>
);

/// tabbar
Widget tabbarBuild = SizedBox(
Widget tabbarBuild = Container(
width: double.infinity,
height: 45,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
width: 1,
color: Theme.of(context).dividerColor.withOpacity(0.1),
),
),
),
child: Row(
children: [
const SizedBox(width: 20),
Expanded(
child: TabBar(
controller: vdCtr.tabCtr,
Expand All @@ -321,7 +329,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
),
),
SizedBox(
width: 200,
width: 220,
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
Expand All @@ -333,9 +341,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
padding: MaterialStateProperty.all(EdgeInsets.zero),
),
onPressed: () => vdCtr.showShootDanmakuSheet(),
child: const Text(
'发弹幕',
),
child: const Text('发弹幕', style: TextStyle(fontSize: 12)),
),
),
const SizedBox(width: 4),
Expand All @@ -353,6 +359,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
child: Obx(() => Text(
'弹',
style: TextStyle(
fontSize: 12,
color: (plPlayerController?.isOpenDanmu.value ??
false)
? Theme.of(context).colorScheme.primary
Expand Down

0 comments on commit 73693c5

Please sign in to comment.