mirror of
https://github.com/bggRGjQaUbCoE/PiliPlus.git
synced 2026-04-21 11:22:16 +08:00
tweaks (#1780)
* opt: sized * fix: self send * feat: ctrl enter to send * opt: checked * opt: download notifier * opt: Future.syncValue * mod: account * mod: loading state * opt: DebounceStreamMixin * opt: report * opt: enum map * opt: file handler * opt: dyn color * opt: Uint8List subview * opt: FileExt * opt: computeLuminance * opt: isNullOrEmpty * opt: Get context * update [skip ci] Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * opt dynamicColor [skip ci] Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * fixes [skip ci] * update Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> * update Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me> --------- Signed-off-by: My-Responsitories <107370289+My-Responsitories@users.noreply.github.com> Co-authored-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
My-Responsitories
committed by
GitHub
GitHub
parent
02e0d34127
commit
ce5e85e64b
@@ -6,7 +6,6 @@ import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
|
||||
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
|
||||
import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
|
||||
import 'package:PiliPlus/common/widgets/pair.dart';
|
||||
import 'package:PiliPlus/common/widgets/self_sized_horizontal_list.dart';
|
||||
import 'package:PiliPlus/http/loading_state.dart';
|
||||
import 'package:PiliPlus/models/common/image_type.dart';
|
||||
import 'package:PiliPlus/models_new/live/live_feed_index/card_data_list_item.dart';
|
||||
@@ -40,6 +39,14 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
@override
|
||||
bool get wantKeepAlive => true;
|
||||
|
||||
late TextScaler textScaler;
|
||||
|
||||
@override
|
||||
void didChangeDependencies() {
|
||||
super.didChangeDependencies();
|
||||
textScaler = MediaQuery.textScalerOf(context);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
@@ -77,85 +84,88 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
Widget _buildTop(ThemeData theme, Pair<LiveCardList?, LiveCardList?> data) {
|
||||
return SliverMainAxisGroup(
|
||||
slivers: [
|
||||
if (data.first != null)
|
||||
SliverToBoxAdapter(child: _buildFollowList(theme, data.first!)),
|
||||
if (data.second?.cardData?.areaEntranceV3?.list?.isNotEmpty == true)
|
||||
SliverToBoxAdapter(
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: SelfSizedHorizontalList(
|
||||
gapSize: 12,
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 12,
|
||||
),
|
||||
childBuilder: (index) {
|
||||
late final item = data
|
||||
.second!
|
||||
.cardData!
|
||||
.areaEntranceV3!
|
||||
.list![index - 1];
|
||||
return Obx(
|
||||
() {
|
||||
final isCurr = index == controller.areaIndex.value;
|
||||
return SearchText(
|
||||
fontSize: 14,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
text: index == 0 ? '推荐' : '${item.title}',
|
||||
bgColor: isCurr
|
||||
? theme.colorScheme.secondaryContainer
|
||||
: Colors.transparent,
|
||||
textColor: isCurr
|
||||
? theme.colorScheme.onSecondaryContainer
|
||||
: null,
|
||||
onTap: (value) {
|
||||
controller.onSelectArea(
|
||||
index,
|
||||
index == 0 ? null : item,
|
||||
if (data.first != null) ..._buildFollowList(theme, data.first!),
|
||||
if (data.second?.cardData?.areaEntranceV3?.list case final list?)
|
||||
if (list.isNotEmpty)
|
||||
SliverToBoxAdapter(
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
// 20+10+14*textScaler
|
||||
height: 30.0 + textScaler.scale(14),
|
||||
child: ListView.separated(
|
||||
scrollDirection: Axis.horizontal,
|
||||
separatorBuilder: (context, index) =>
|
||||
const SizedBox(width: 12),
|
||||
padding: const EdgeInsets.only(
|
||||
top: 10,
|
||||
bottom: 10,
|
||||
right: 12,
|
||||
),
|
||||
itemBuilder: (context, index) {
|
||||
late final item = list[index - 1];
|
||||
return Obx(
|
||||
() {
|
||||
final isCurr =
|
||||
index == controller.areaIndex.value;
|
||||
return SearchText(
|
||||
fontSize: 14,
|
||||
height: 1,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 5,
|
||||
),
|
||||
text: index == 0 ? '推荐' : '${item.title}',
|
||||
bgColor: isCurr
|
||||
? theme.colorScheme.secondaryContainer
|
||||
: Colors.transparent,
|
||||
textColor: isCurr
|
||||
? theme.colorScheme.onSecondaryContainer
|
||||
: null,
|
||||
onTap: (value) {
|
||||
controller.onSelectArea(
|
||||
index,
|
||||
index == 0 ? null : item,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
itemCount:
|
||||
data.second!.cardData!.areaEntranceV3!.list!.length + 1,
|
||||
itemCount: list.length + 1,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
iconButton(
|
||||
size: 26,
|
||||
iconSize: 16,
|
||||
context: context,
|
||||
tooltip: '游戏赛事',
|
||||
icon: const Icon(Icons.gamepad),
|
||||
onPressed: () => Get.toNamed(
|
||||
'/webview',
|
||||
parameters: {
|
||||
'uaType': 'mob',
|
||||
'url':
|
||||
'https://www.bilibili.com/h5/match/data/home?navhide=1&${Utils.themeUrl(theme.brightness.isDark)}',
|
||||
},
|
||||
iconButton(
|
||||
size: 26,
|
||||
iconSize: 16,
|
||||
context: context,
|
||||
tooltip: '游戏赛事',
|
||||
icon: const Icon(Icons.gamepad),
|
||||
onPressed: () => Get.toNamed(
|
||||
'/webview',
|
||||
parameters: {
|
||||
'uaType': 'mob',
|
||||
'url':
|
||||
'https://www.bilibili.com/h5/match/data/home?navhide=1&${Utils.themeUrl(theme.brightness.isDark)}',
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
iconButton(
|
||||
size: 26,
|
||||
iconSize: 16,
|
||||
context: context,
|
||||
tooltip: '全部标签',
|
||||
icon: const Icon(Icons.widgets),
|
||||
onPressed: () => Get.to(const LiveAreaPage()),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
else
|
||||
const SliverToBoxAdapter(child: SizedBox(height: 10)),
|
||||
const SizedBox(width: 8),
|
||||
iconButton(
|
||||
size: 26,
|
||||
iconSize: 16,
|
||||
context: context,
|
||||
tooltip: '全部标签',
|
||||
icon: const Icon(Icons.widgets),
|
||||
onPressed: () => Get.to(const LiveAreaPage()),
|
||||
),
|
||||
],
|
||||
),
|
||||
)
|
||||
else
|
||||
const SliverToBoxAdapter(child: SizedBox(height: 10)),
|
||||
],
|
||||
);
|
||||
}
|
||||
@@ -165,7 +175,7 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
crossAxisSpacing: StyleString.cardSpace,
|
||||
maxCrossAxisExtent: Grid.smallCardWidth,
|
||||
childAspectRatio: StyleString.aspectRatio,
|
||||
mainAxisExtent: MediaQuery.textScalerOf(context).scale(90),
|
||||
mainAxisExtent: textScaler.scale(90),
|
||||
);
|
||||
|
||||
Widget _buildBody(ThemeData theme, LoadingState<List?> loadingState) {
|
||||
@@ -180,38 +190,44 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
if (controller.newTags case final newTags?)
|
||||
if (newTags.isNotEmpty)
|
||||
SliverToBoxAdapter(
|
||||
child: SelfSizedHorizontalList(
|
||||
gapSize: 12,
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
childBuilder: (index) {
|
||||
late final item = newTags[index];
|
||||
return Obx(
|
||||
() {
|
||||
final isCurr = index == controller.tagIndex.value;
|
||||
return SearchText(
|
||||
fontSize: 13,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 3,
|
||||
),
|
||||
text: '${item.name}',
|
||||
bgColor: isCurr
|
||||
? theme.colorScheme.secondaryContainer
|
||||
: Colors.transparent,
|
||||
textColor: isCurr
|
||||
? theme.colorScheme.onSecondaryContainer
|
||||
: null,
|
||||
onTap: (value) {
|
||||
controller.onSelectTag(
|
||||
index,
|
||||
item.sortType,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
itemCount: newTags.length,
|
||||
child: SizedBox(
|
||||
// 8+10+13*textScaler
|
||||
height: 18.0 + textScaler.scale(13),
|
||||
child: ListView.separated(
|
||||
scrollDirection: Axis.horizontal,
|
||||
separatorBuilder: (_, _) => const SizedBox(width: 12),
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
itemBuilder: (context, index) {
|
||||
late final item = newTags[index];
|
||||
return Obx(
|
||||
() {
|
||||
final isCurr = index == controller.tagIndex.value;
|
||||
return SearchText(
|
||||
height: 1,
|
||||
fontSize: 13,
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 5,
|
||||
),
|
||||
text: '${item.name}',
|
||||
bgColor: isCurr
|
||||
? theme.colorScheme.secondaryContainer
|
||||
: Colors.transparent,
|
||||
textColor: isCurr
|
||||
? theme.colorScheme.onSecondaryContainer
|
||||
: null,
|
||||
onTap: (value) {
|
||||
controller.onSelectTag(
|
||||
index,
|
||||
item.sortType,
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
);
|
||||
},
|
||||
itemCount: newTags.length,
|
||||
),
|
||||
),
|
||||
),
|
||||
response != null && response.isNotEmpty
|
||||
@@ -241,12 +257,10 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
};
|
||||
}
|
||||
|
||||
Widget _buildFollowList(ThemeData theme, LiveCardList item) {
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
List<Widget> _buildFollowList(ThemeData theme, LiveCardList item) {
|
||||
return [
|
||||
SliverToBoxAdapter(
|
||||
child: Row(
|
||||
children: [
|
||||
Text.rich(
|
||||
TextSpan(
|
||||
@@ -277,66 +291,76 @@ class _LivePageState extends CommonPageState<LivePage, LiveController>
|
||||
),
|
||||
],
|
||||
),
|
||||
if (item.cardData?.myIdolV1?.list?.isNotEmpty == true)
|
||||
_buildFollowBody(theme, item.cardData!.myIdolV1!.list!),
|
||||
],
|
||||
);
|
||||
),
|
||||
if (item.cardData?.myIdolV1?.list case final list?)
|
||||
if (list.isNotEmpty) _buildFollowBody(theme, list),
|
||||
];
|
||||
}
|
||||
|
||||
Widget _buildFollowBody(ThemeData theme, List<CardLiveItem> followList) {
|
||||
return SelfSizedHorizontalList(
|
||||
gapSize: 5,
|
||||
padding: EdgeInsets.zero,
|
||||
childBuilder: (index) {
|
||||
final item = followList[index];
|
||||
return SizedBox(
|
||||
width: 65,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () => PageUtils.toLiveRoom(item.roomid),
|
||||
onLongPress: () {
|
||||
Feedback.forLongPress(context);
|
||||
Get.toNamed('/member?mid=${item.uid}');
|
||||
},
|
||||
onSecondaryTap: PlatformUtils.isMobile
|
||||
? null
|
||||
: () => Get.toNamed('/member?mid=${item.uid}'),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const SizedBox(height: 8),
|
||||
Container(
|
||||
margin: const EdgeInsets.all(2),
|
||||
padding: const EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
width: 1.5,
|
||||
color: theme.colorScheme.primary,
|
||||
strokeAlign: BorderSide.strokeAlignOutside,
|
||||
return SliverToBoxAdapter(
|
||||
child: SizedBox(
|
||||
// 8+4+4+45+4+12*textScaler
|
||||
height: 65.0 + textScaler.scale(12),
|
||||
child: CustomScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
slivers: [
|
||||
SliverFixedExtentList.builder(
|
||||
itemExtent: 70,
|
||||
itemCount: followList.length,
|
||||
itemBuilder: (context, index) {
|
||||
final item = followList[index];
|
||||
return SizedBox(
|
||||
width: 65,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () => PageUtils.toLiveRoom(item.roomid),
|
||||
onLongPress: () {
|
||||
Feedback.forLongPress(context);
|
||||
Get.toNamed('/member?mid=${item.uid}');
|
||||
},
|
||||
onSecondaryTap: PlatformUtils.isMobile
|
||||
? null
|
||||
: () => Get.toNamed('/member?mid=${item.uid}'),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
const SizedBox(height: 8),
|
||||
Container(
|
||||
margin: const EdgeInsets.all(2),
|
||||
padding: const EdgeInsets.all(2),
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
width: 1.5,
|
||||
color: theme.colorScheme.primary,
|
||||
strokeAlign: BorderSide.strokeAlignOutside,
|
||||
),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: NetworkImgLayer(
|
||||
type: ImageType.avatar,
|
||||
width: 45,
|
||||
height: 45,
|
||||
src: item.face,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
item.uname!,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: const TextStyle(fontSize: 12, height: 1),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
),
|
||||
shape: BoxShape.circle,
|
||||
),
|
||||
child: NetworkImgLayer(
|
||||
type: ImageType.avatar,
|
||||
width: 45,
|
||||
height: 45,
|
||||
src: item.face,
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 4),
|
||||
Text(
|
||||
item.uname!,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: const TextStyle(fontSize: 12),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
);
|
||||
},
|
||||
itemCount: followList.length,
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user