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

opt: color

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2024-12-14 12:25:42 +08:00
parent b898a78e62
commit bc0914e146
17 changed files with 115 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -393,10 +393,17 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
height: 35, height: 35,
child: TextButton.icon( child: TextButton.icon(
onPressed: () => _dynamicDetailController.queryBySort(), onPressed: () => _dynamicDetailController.queryBySort(),
icon: const Icon(Icons.sort, size: 16), icon: Icon(
Icons.sort,
size: 16,
color: Theme.of(context).colorScheme.secondary,
),
label: Obx(() => Text( label: Obx(() => Text(
_dynamicDetailController.sortTypeLabel.value, _dynamicDetailController.sortTypeLabel.value,
style: const TextStyle(fontSize: 13), style: TextStyle(
fontSize: 13,
color: Theme.of(context).colorScheme.secondary,
),
)), )),
), ),
) )

2
lib/pages/follow/widgets/follow_item.dart
View File

@@ -57,7 +57,7 @@ class FollowItem extends StatelessWidget {
padding: const EdgeInsets.fromLTRB(15, 0, 15, 0), padding: const EdgeInsets.fromLTRB(15, 0, 15, 0),
foregroundColor: Theme.of(context).colorScheme.outline, foregroundColor: Theme.of(context).colorScheme.outline,
backgroundColor: backgroundColor:
Theme.of(context).colorScheme.onInverseSurface, // 设置按钮背景色 Theme.of(context).colorScheme.onInverseSurface,
), ),
child: const Text( child: const Text(
'已关注', '已关注',

14
lib/pages/member/new/content/member_contribute/content/video/member_video.dart
View File

@@ -86,7 +86,12 @@ class _MemberVideoState extends State<MemberVideo>
height: 35, height: 35,
child: TextButton.icon( child: TextButton.icon(
onPressed: _controller.queryBySort, onPressed: _controller.queryBySort,
icon: const Icon(Icons.sort, size: 16), icon: Icon(
Icons.sort,
size: 16,
color:
Theme.of(context).colorScheme.secondary,
),
label: Obx( label: Obx(
() => Text( () => Text(
widget.type == ContributeType.video widget.type == ContributeType.video
@@ -96,7 +101,12 @@ class _MemberVideoState extends State<MemberVideo>
: _controller.sort.value == 'desc' : _controller.sort.value == 'desc'
? '默认' ? '默认'
: '倒序', : '倒序',
style: const TextStyle(fontSize: 13), style: TextStyle(
fontSize: 13,
color: Theme.of(context)
.colorScheme
.secondary,
),
), ),
), ),
), ),

10
lib/pages/member/new/widget/user_info_card.dart
View File

@@ -131,11 +131,11 @@ class UserInfoCard extends StatelessWidget {
imageUrl: card.vip!.label!.image!, imageUrl: card.vip!.label!.image!,
height: 20, height: 20,
), ),
if (card.nameplate?.image?.isNotEmpty == true) // if (card.nameplate?.image?.isNotEmpty == true)
CachedNetworkImage( // CachedNetworkImage(
imageUrl: card.nameplate!.image!, // imageUrl: card.nameplate!.image!,
height: 20, // height: 20,
), // ),
// GestureDetector( // GestureDetector(
// onTap: () { // onTap: () {
// Utils.copyText(card.mid.toString()); // Utils.copyText(card.mid.toString());

4
lib/pages/member/widgets/profile.dart
View File

@@ -199,9 +199,7 @@ class ProfilePanel extends StatelessWidget {
? Theme.of(context) ? Theme.of(context)
.colorScheme .colorScheme
.onInverseSurface .onInverseSurface
: Theme.of(context) : Theme.of(context).colorScheme.primary,
.colorScheme
.primary, // 设置按钮背景色
), ),
child: Obx(() => Text(ctr.attributeText.value)), child: Obx(() => Text(ctr.attributeText.value)),
), ),

26
lib/pages/search/view.dart
View File

@@ -130,8 +130,17 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
), ),
), ),
onPressed: _searchController.queryHotSearchList, onPressed: _searchController.queryHotSearchList,
icon: const Icon(Icons.refresh_outlined, size: 18), icon: Icon(
label: const Text('刷新'), Icons.refresh_outlined,
size: 18,
color: Theme.of(context).colorScheme.secondary,
),
label: Text(
'刷新',
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
), ),
), ),
], ],
@@ -183,8 +192,17 @@ class _SearchPageState extends State<SearchPage> with RouteAware {
), ),
), ),
onPressed: _searchController.onClearHistory, onPressed: _searchController.onClearHistory,
icon: const Icon(Icons.clear_all_outlined, size: 18), icon: Icon(
label: const Text('清空'), Icons.clear_all_outlined,
size: 18,
color: Theme.of(context).colorScheme.secondary,
),
label: Text(
'清空',
style: TextStyle(
color: Theme.of(context).colorScheme.secondary,
),
),
), ),
) )
], ],

8
lib/pages/search_panel/widgets/article_panel.dart
View File

@@ -293,10 +293,10 @@ class ArticlePanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentOrderFilterval.value bgColor: item['value'] == currentOrderFilterval.value
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.secondaryContainer
: null, : null,
textColor: item['value'] == currentOrderFilterval.value textColor: item['value'] == currentOrderFilterval.value
? Theme.of(context).colorScheme.onPrimaryContainer ? Theme.of(context).colorScheme.onSecondaryContainer
: null, : null,
), ),
) )
@@ -327,10 +327,10 @@ class ArticlePanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentZoneFilterval.value bgColor: item['value'] == currentZoneFilterval.value
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.secondaryContainer
: null, : null,
textColor: item['value'] == currentZoneFilterval.value textColor: item['value'] == currentZoneFilterval.value
? Theme.of(context).colorScheme.onPrimaryContainer ? Theme.of(context).colorScheme.onSecondaryContainer
: null, : null,
), ),
) )

8
lib/pages/search_panel/widgets/user_panel.dart
View File

@@ -227,10 +227,10 @@ class UserPanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentOrderFilterval.value bgColor: item['value'] == currentOrderFilterval.value
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.secondaryContainer
: null, : null,
textColor: item['value'] == currentOrderFilterval.value textColor: item['value'] == currentOrderFilterval.value
? Theme.of(context).colorScheme.onPrimaryContainer ? Theme.of(context).colorScheme.onSecondaryContainer
: null, : null,
), ),
) )
@@ -261,11 +261,11 @@ class UserPanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentUserTypeFilterval.value bgColor: item['value'] == currentUserTypeFilterval.value
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.secondaryContainer
: null, : null,
textColor: item['value'] == textColor: item['value'] ==
currentUserTypeFilterval.value currentUserTypeFilterval.value
? Theme.of(context).colorScheme.onPrimaryContainer ? Theme.of(context).colorScheme.onSecondaryContainer
: null, : null,
), ),
) )

24
lib/pages/search_panel/widgets/video_panel.dart
View File

@@ -311,11 +311,11 @@ class VideoPanelController extends GetxController {
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: currentPubTimeFilterval == -1 && bgColor: currentPubTimeFilterval == -1 &&
(isFirst ? customPubBegin : customPubEnd) (isFirst ? customPubBegin : customPubEnd)
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context).colorScheme.secondaryContainer
: null, : Theme.of(context).colorScheme.outline.withOpacity(0.1),
textColor: currentPubTimeFilterval == -1 && textColor: currentPubTimeFilterval == -1 &&
(isFirst ? customPubBegin : customPubEnd) (isFirst ? customPubBegin : customPubEnd)
? Theme.of(context).colorScheme.onPrimaryContainer ? Theme.of(context).colorScheme.onSecondaryContainer
: Theme.of(context).colorScheme.outline.withOpacity(0.8), : Theme.of(context).colorScheme.outline.withOpacity(0.8),
); );
} }
@@ -386,12 +386,14 @@ class VideoPanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentPubTimeFilterval bgColor: item['value'] == currentPubTimeFilterval
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context)
.colorScheme
.secondaryContainer
: null, : null,
textColor: item['value'] == currentPubTimeFilterval textColor: item['value'] == currentPubTimeFilterval
? Theme.of(context) ? Theme.of(context)
.colorScheme .colorScheme
.onPrimaryContainer .onSecondaryContainer
: null, : null,
), ),
) )
@@ -435,12 +437,14 @@ class VideoPanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentTimeFilterval bgColor: item['value'] == currentTimeFilterval
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context)
.colorScheme
.secondaryContainer
: null, : null,
textColor: item['value'] == currentTimeFilterval textColor: item['value'] == currentTimeFilterval
? Theme.of(context) ? Theme.of(context)
.colorScheme .colorScheme
.onPrimaryContainer .onSecondaryContainer
: null, : null,
), ),
) )
@@ -471,12 +475,14 @@ class VideoPanelController extends GetxController {
}, },
onLongSelect: (_) {}, onLongSelect: (_) {},
bgColor: item['value'] == currentZoneFilterval bgColor: item['value'] == currentZoneFilterval
? Theme.of(context).colorScheme.primaryContainer ? Theme.of(context)
.colorScheme
.secondaryContainer
: null, : null,
textColor: item['value'] == currentZoneFilterval textColor: item['value'] == currentZoneFilterval
? Theme.of(context) ? Theme.of(context)
.colorScheme .colorScheme
.onPrimaryContainer .onSecondaryContainer
: null, : null,
), ),
) )

12
lib/pages/video/detail/introduction/view.dart
View File

@@ -305,8 +305,9 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 12,
color: t.colorScheme.primary), // color: t.colorScheme.primary,
),
// semanticsLabel: "UP主：${owner.name}", // semanticsLabel: "UP主：${owner.name}",
), ),
const SizedBox(height: 0), const SizedBox(height: 0),
@@ -667,11 +668,12 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
onPressed: () => videoIntroController.actionRelationMod(context), onPressed: () => videoIntroController.actionRelationMod(context),
style: TextButton.styleFrom( style: TextButton.styleFrom(
visualDensity: const VisualDensity(horizontal: -2, vertical: -3), visualDensity: const VisualDensity(horizontal: -2, vertical: -3),
foregroundColor: foregroundColor: attr != 0
attr != 0 ? t.colorScheme.outline : t.colorScheme.onPrimary, ? t.colorScheme.outline
: t.colorScheme.onSecondaryContainer,
backgroundColor: attr != 0 backgroundColor: attr != 0
? t.colorScheme.onInverseSurface ? t.colorScheme.onInverseSurface
: t.colorScheme.primary, // 设置按钮背景色 : t.colorScheme.secondaryContainer,
), ),
child: Text( child: Text(
attr == 128 attr == 128

5
lib/pages/video/detail/introduction/widgets/fav_panel.dart
View File

@@ -179,9 +179,8 @@ class _FavPanelState extends State<FavPanel> {
vertical: -2, vertical: -2,
), ),
foregroundColor: Theme.of(context).colorScheme.outline, foregroundColor: Theme.of(context).colorScheme.outline,
backgroundColor: Theme.of(context) backgroundColor:
.colorScheme Theme.of(context).colorScheme.onInverseSurface,
.onInverseSurface, // 设置按钮背景色
), ),
child: const Text('取消'), child: const Text('取消'),
), ),

3
lib/pages/video/detail/introduction/widgets/group_panel.dart
View File

@@ -178,8 +178,7 @@ class _GroupPanelState extends State<GroupPanel> {
style: TextButton.styleFrom( style: TextButton.styleFrom(
padding: const EdgeInsets.only(left: 30, right: 30), padding: const EdgeInsets.only(left: 30, right: 30),
foregroundColor: Theme.of(context).colorScheme.onPrimary, foregroundColor: Theme.of(context).colorScheme.onPrimary,
backgroundColor: backgroundColor: Theme.of(context).colorScheme.primary,
Theme.of(context).colorScheme.primary, // 设置按钮背景色
), ),
child: Text(showDefaultBtn ? '保存至默认分组' : '保存'), child: Text(showDefaultBtn ? '保存至默认分组' : '保存'),
), ),

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

@@ -150,11 +150,19 @@ class _VideoReplyPanelState extends State<VideoReplyPanel>
child: TextButton.icon( child: TextButton.icon(
onPressed: () => onPressed: () =>
_videoReplyController.queryBySort(), _videoReplyController.queryBySort(),
icon: const Icon(Icons.sort, size: 16), icon: Icon(
Icons.sort,
size: 16,
color: Theme.of(context).colorScheme.secondary,
),
label: Obx( label: Obx(
() => Text( () => Text(
_videoReplyController.sortTypeLabel.value, _videoReplyController.sortTypeLabel.value,
style: const TextStyle(fontSize: 13), style: TextStyle(
fontSize: 13,
color:
Theme.of(context).colorScheme.secondary,
),
), ),
), ),
), ),

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

@@ -373,7 +373,7 @@ class ReplyItem extends StatelessWidget {
child: Text( child: Text(
'UP主觉得很赞', 'UP主觉得很赞',
style: TextStyle( style: TextStyle(
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.secondary,
fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),
@@ -387,7 +387,7 @@ class ReplyItem extends StatelessWidget {
Text( Text(
'热评', '热评',
style: TextStyle( style: TextStyle(
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.secondary,
fontSize: Theme.of(context).textTheme.labelMedium!.fontSize), fontSize: Theme.of(context).textTheme.labelMedium!.fontSize),
), ),
const Spacer(), const Spacer(),
@@ -459,7 +459,7 @@ class ReplyItem extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onSurface .onSurface
.withOpacity(0.85), .withOpacity(0.8),
height: 1.6), height: 1.6),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
@@ -471,7 +471,7 @@ class ReplyItem extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.primary .primary
.withOpacity(0.85), .withOpacity(0.8),
), ),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () { ..onTap = () {
@@ -541,14 +541,14 @@ class ReplyItem extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onSurface .onSurface
.withOpacity(0.85))), .withOpacity(0.8))),
TextSpan( TextSpan(
text: replyControl!.entryText!, text: replyControl!.entryText!,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.primary .primary
.withOpacity(0.85), .withOpacity(0.8),
), ),
) )
], ],

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

@@ -371,7 +371,7 @@ class ReplyItemGrpc extends StatelessWidget {
child: Text( child: Text(
'UP主觉得很赞', 'UP主觉得很赞',
style: TextStyle( style: TextStyle(
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.secondary,
fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
), ),
@@ -387,7 +387,7 @@ class ReplyItemGrpc extends StatelessWidget {
Text( Text(
'热评', '热评',
style: TextStyle( style: TextStyle(
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.secondary,
fontSize: Theme.of(context).textTheme.labelMedium!.fontSize), fontSize: Theme.of(context).textTheme.labelMedium!.fontSize),
), ),
if (replyLevel == '2' && if (replyLevel == '2' &&
@@ -475,7 +475,7 @@ class ReplyItemGrpc extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onSurface .onSurface
.withOpacity(0.85), .withOpacity(0.8),
height: 1.6), height: 1.6),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
maxLines: 2, maxLines: 2,
@@ -487,7 +487,7 @@ class ReplyItemGrpc extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.primary .primary
.withOpacity(0.85), .withOpacity(0.8),
), ),
recognizer: TapGestureRecognizer() recognizer: TapGestureRecognizer()
..onTap = () { ..onTap = () {
@@ -560,14 +560,14 @@ class ReplyItemGrpc extends StatelessWidget {
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onSurface .onSurface
.withOpacity(0.85))), .withOpacity(0.8))),
TextSpan( TextSpan(
text: replyItem.replyControl.subReplyEntryText, text: replyItem.replyControl.subReplyEntryText,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.primary .primary
.withOpacity(0.85), .withOpacity(0.8),
), ),
) )
], ],

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

@@ -248,14 +248,21 @@ class _VideoReplyReplyPanelState extends State<VideoReplyReplyPanel> {
height: 35, height: 35,
child: TextButton.icon( child: TextButton.icon(
onPressed: () => _videoReplyReplyController.queryBySort(), onPressed: () => _videoReplyReplyController.queryBySort(),
icon: const Icon(Icons.sort, size: 16), icon: Icon(
Icons.sort,
size: 16,
color: Theme.of(context).colorScheme.secondary,
),
label: Obx( label: Obx(
() => Text( () => Text(
_videoReplyReplyController.mode.value == _videoReplyReplyController.mode.value ==
Mode.MAIN_LIST_HOT Mode.MAIN_LIST_HOT
? '按热度' ? '按热度'
: '按时间', : '按时间',
style: const TextStyle(fontSize: 13), style: TextStyle(
fontSize: 13,
color: Theme.of(context).colorScheme.secondary,
),
), ),
), ),
), ),

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

@@ -1201,7 +1201,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
// ignore: deprecated_member_use // ignore: deprecated_member_use
color: videoDetailController color: videoDetailController
.plPlayerController.isOpenDanmu.value .plPlayerController.isOpenDanmu.value
? Theme.of(context).colorScheme.primary ? Theme.of(context).colorScheme.secondary
: Theme.of(context).colorScheme.outline, : Theme.of(context).colorScheme.outline,
), ),
), ),