HCha/PiliPlus
1
0
Fork 0
mirror of https://github.com/HChaZZY/PiliPlus.git synced 2025-12-19 16:46:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: cross row select (#867)" (#868)

Browse Source 
This reverts commit 89a077be5c.
This commit is contained in:
My-Responsitories
2025-05-25 21:02:44 +08:00
committed by GitHub
parent 89a077be5c
commit db3b74e33f
4 changed files with 250 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

218
lib/pages/article/view.dart
View File

@@ -268,29 +268,25 @@ class _ArticlePageState extends State<ArticlePage>
return LayoutBuilder(builder: (context, constraints) { return LayoutBuilder(builder: (context, constraints) {
final maxWidth = constraints.maxWidth - 2 * padding - 24; final maxWidth = constraints.maxWidth - 2 * padding - 24;
return Padding( return Padding(
padding: EdgeInsets.symmetric(horizontal: padding), padding: EdgeInsets.symmetric(horizontal: padding),
child: SelectionArea( child: CustomScrollView(
child: CustomScrollView( controller: _articleCtr.scrollController,
controller: _articleCtr.scrollController, physics: const AlwaysScrollableScrollPhysics(),
physics: const AlwaysScrollableScrollPhysics(), slivers: [
slivers: [ _buildContent(theme, maxWidth),
_buildContent(theme, maxWidth), SliverToBoxAdapter(
SelectionContainer.disabled( child: Divider(
child: SliverToBoxAdapter( thickness: 8,
child: Divider( color:
thickness: 8, theme.dividerColor.withValues(alpha: 0.05),
color: theme.dividerColor ),
.withValues(alpha: 0.05),
),
)),
SelectionContainer.disabled(
child: _buildReplyHeader(theme)),
SelectionContainer.disabled(
child: Obx(() => _buildReplyList(theme,
_articleCtr.loadingState.value))),
],
), ),
)); _buildReplyHeader(theme),
Obx(() => _buildReplyList(
theme, _articleCtr.loadingState.value)),
],
),
);
}); });
} else { } else {
return Row( return Row(
@@ -302,8 +298,7 @@ class _ArticlePageState extends State<ArticlePage>
builder: (context, constraints) { builder: (context, constraints) {
final maxWidth = final maxWidth =
constraints.maxWidth - padding / 4 - 24; constraints.maxWidth - padding / 4 - 24;
return SelectionArea( return CustomScrollView(
child: CustomScrollView(
controller: _articleCtr.scrollController, controller: _articleCtr.scrollController,
physics: const AlwaysScrollableScrollPhysics(), physics: const AlwaysScrollableScrollPhysics(),
slivers: [ slivers: [
@@ -317,7 +312,7 @@ class _ArticlePageState extends State<ArticlePage>
sliver: _buildContent(theme, maxWidth), sliver: _buildContent(theme, maxWidth),
), ),
], ],
)); );
}, },
), ),
), ),
@@ -426,89 +421,90 @@ class _ArticlePageState extends State<ArticlePage>
?.pics?.isNotEmpty == ?.pics?.isNotEmpty ==
true) true)
SliverToBoxAdapter( SliverToBoxAdapter(
child: SelectionContainer.disabled(child: Builder( child: Builder(
builder: (context) { builder: (context) {
final pics = _articleCtr final pics = _articleCtr.opusData!.modules.moduleTop!
.opusData!.modules.moduleTop!.display!.album!.pics!; .display!.album!.pics!;
final length = pics.length; final length = pics.length;
final first = pics.first; final first = pics.first;
double height; double height;
double paddingRight; double paddingRight;
if (first.height != null && first.width != null) { if (first.height != null && first.width != null) {
final ratio = first.height! / first.width!; final ratio = first.height! / first.width!;
height = min(maxWidth * ratio, Get.height * 0.55); height = min(maxWidth * ratio, Get.height * 0.55);
paddingRight = (maxWidth - height / ratio) / 2 + 12; paddingRight = (maxWidth - height / ratio) / 2 + 12;
} else { } else {
height = Get.height * 0.55; height = Get.height * 0.55;
paddingRight = 12; paddingRight = 12;
} }
return Stack( return Stack(
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
Container( Container(
height: height, height: height,
width: maxWidth, width: maxWidth,
margin: const EdgeInsets.only(bottom: 10), margin: const EdgeInsets.only(bottom: 10),
child: PageView.builder( child: PageView.builder(
physics: const ClampingScrollPhysics(), physics: const ClampingScrollPhysics(),
onPageChanged: (value) { onPageChanged: (value) {
_articleCtr.topIndex.value = value; _articleCtr.topIndex.value = value;
}, },
itemCount: length, itemCount: length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final pic = pics[index]; final pic = pics[index];
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () => context.imageView( onTap: () => context.imageView(
imgList: pics imgList: pics
.map((e) => SourceModel(url: e.url!)) .map(
.toList(), (e) => SourceModel(url: e.url!))
initialPage: index, .toList(),
), initialPage: index,
child: Hero(
tag: pic.url!,
child: Stack(
clipBehavior: Clip.none,
alignment: Alignment.center,
children: [
Positioned.fill(
child: CachedNetworkImage(
fit: pic.isLongPic == true
? BoxFit.cover
: null,
imageUrl: Utils.thumbnailImgUrl(
pic.url, 60),
),
),
if (pic.isLongPic == true)
PBadge(
text: '长图',
type: PBadgeType.primary,
right: paddingRight,
bottom: 12,
),
],
), ),
), child: Hero(
); tag: pic.url!,
}, child: Stack(
clipBehavior: Clip.none,
alignment: Alignment.center,
children: [
Positioned.fill(
child: CachedNetworkImage(
fit: pic.isLongPic == true
? BoxFit.cover
: null,
imageUrl: Utils.thumbnailImgUrl(
pic.url, 60),
),
),
if (pic.isLongPic == true)
PBadge(
text: '长图',
type: PBadgeType.primary,
right: paddingRight,
bottom: 12,
),
],
),
),
);
},
),
), ),
), Obx(
Obx( () => PBadge(
() => PBadge( top: 12,
top: 12, right: paddingRight,
right: paddingRight, type: PBadgeType.gray,
type: PBadgeType.gray, text:
text: '${_articleCtr.topIndex.value + 1}/$length'),
'${_articleCtr.topIndex.value + 1}/$length'), ),
), ],
], );
); },
}, ),
))), ),
if (_articleCtr.summary.title != null) if (_articleCtr.summary.title != null)
SelectionContainer.disabled( SliverToBoxAdapter(
child: SliverToBoxAdapter(
child: Text( child: Text(
_articleCtr.summary.title!, _articleCtr.summary.title!,
style: const TextStyle( style: const TextStyle(
@@ -516,9 +512,8 @@ class _ArticlePageState extends State<ArticlePage>
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
)), ),
SelectionContainer.disabled( SliverToBoxAdapter(
child: SliverToBoxAdapter(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 10), padding: const EdgeInsets.symmetric(vertical: 10),
child: GestureDetector( child: GestureDetector(
@@ -559,16 +554,15 @@ class _ArticlePageState extends State<ArticlePage>
), ),
), ),
), ),
)), ),
if (_articleCtr.type != 'read' && if (_articleCtr.type != 'read' &&
_articleCtr.opusData?.modules.moduleCollection != null) _articleCtr.opusData?.modules.moduleCollection != null)
SelectionContainer.disabled( SliverToBoxAdapter(
child: SliverToBoxAdapter(
child: opusCollection( child: opusCollection(
theme, theme,
_articleCtr.opusData!.modules.moduleCollection!, _articleCtr.opusData!.modules.moduleCollection!,
), ),
)), ),
content, content,
], ],
); );

24
lib/pages/article/widgets/html_render.dart
View File

@@ -126,15 +126,17 @@ Widget htmlRender({
margin: Margins.zero, margin: Margins.zero,
), ),
}; };
return element != null return SelectionArea(
? Html.fromElement( child: element != null
documentElement: element, ? Html.fromElement(
extensions: extensions, documentElement: element,
style: style, extensions: extensions,
) style: style,
: Html( )
data: html, : Html(
extensions: extensions, data: html,
style: style, extensions: extensions,
); style: style,
),
);
} }

250
lib/pages/article/widgets/opus_content.dart
View File

@@ -69,76 +69,78 @@ class OpusContent extends StatelessWidget {
switch (element.paraType) { switch (element.paraType) {
case 1 || 4: case 1 || 4:
final isQuote = element.paraType == 4; final isQuote = element.paraType == 4;
Widget widget = Text.rich( Widget widget = SelectionArea(
textAlign: element.align == 1 ? TextAlign.center : null, child: Text.rich(
TextSpan( textAlign: element.align == 1 ? TextAlign.center : null,
children: element.text?.nodes?.map((item) { TextSpan(
switch (item.type) { children: element.text?.nodes?.map((item) {
case 'TEXT_NODE_TYPE_RICH' when (item.rich != null): switch (item.type) {
Rich rich = item.rich!; case 'TEXT_NODE_TYPE_RICH' when (item.rich != null):
switch (rich.type) { Rich rich = item.rich!;
case 'RICH_TEXT_NODE_TYPE_EMOJI': switch (rich.type) {
Emoji emoji = rich.emoji!; case 'RICH_TEXT_NODE_TYPE_EMOJI':
final size = 20.0 * emoji.size; Emoji emoji = rich.emoji!;
return WidgetSpan( final size = 20.0 * emoji.size;
child: NetworkImgLayer( return WidgetSpan(
width: size, child: NetworkImgLayer(
height: size, width: size,
src: emoji.url, height: size,
type: ImageType.emote, src: emoji.url,
), type: ImageType.emote,
); ),
default: );
return TextSpan( default:
text: return TextSpan(
'${rich.type == 'RICH_TEXT_NODE_TYPE_WEB' ? '\u{1F517}' : ''}${item.rich!.text}', text:
style: _getStyle( '${rich.type == 'RICH_TEXT_NODE_TYPE_WEB' ? '\u{1F517}' : ''}${item.rich!.text}',
rich.style, style: _getStyle(
rich.type == 'RICH_TEXT_NODE_TYPE_TEXT' rich.style,
? null rich.type == 'RICH_TEXT_NODE_TYPE_TEXT'
: colorScheme.primary, ? null
), : colorScheme.primary,
recognizer: TapGestureRecognizer() ),
..onTap = () { recognizer: TapGestureRecognizer()
switch (rich.type) { ..onTap = () {
case 'RICH_TEXT_NODE_TYPE_AT': switch (rich.type) {
Get.toNamed('/member?mid=${rich.rid}'); case 'RICH_TEXT_NODE_TYPE_AT':
// case 'RICH_TEXT_NODE_TYPE_TOPIC': Get.toNamed('/member?mid=${rich.rid}');
default: // case 'RICH_TEXT_NODE_TYPE_TOPIC':
if (rich.jumpUrl != null) { default:
PiliScheme.routePushFromUrl( if (rich.jumpUrl != null) {
rich.jumpUrl!, PiliScheme.routePushFromUrl(
); rich.jumpUrl!,
} );
} }
}, }
); },
} );
case 'TEXT_NODE_TYPE_FORMULA' when (item.formula != null): }
return TextSpan( case 'TEXT_NODE_TYPE_FORMULA' when (item.formula != null):
children: [ return TextSpan(
WidgetSpan( children: [
child: CachedNetworkSVGImage( WidgetSpan(
height: 65, child: CachedNetworkSVGImage(
'https://api.bilibili.com/x/web-frontend/mathjax/tex?formula=${Uri.encodeComponent(item.formula!.latexContent!)}', height: 65,
colorFilter: ColorFilter.mode( 'https://api.bilibili.com/x/web-frontend/mathjax/tex?formula=${Uri.encodeComponent(item.formula!.latexContent!)}',
colorScheme.onSurfaceVariant, colorFilter: ColorFilter.mode(
BlendMode.srcIn, colorScheme.onSurfaceVariant,
BlendMode.srcIn,
),
alignment: Alignment.centerLeft,
placeholderBuilder: (_) =>
const SizedBox.shrink(),
), ),
alignment: Alignment.centerLeft,
placeholderBuilder: (_) =>
const SizedBox.shrink(),
), ),
), ],
], );
); default:
default: return _getSpan(
return _getSpan( item.word,
item.word, isQuote ? colorScheme.onSurfaceVariant : null,
isQuote ? colorScheme.onSurfaceVariant : null, );
); }
} }).toList()),
}).toList()), ),
); );
if (isQuote) { if (isQuote) {
widget = Container( widget = Container(
@@ -165,8 +167,7 @@ class OpusContent extends StatelessWidget {
final height = width == null || pic.height == null final height = width == null || pic.height == null
? null ? null
: width * pic.height! / pic.width!; : width * pic.height! / pic.width!;
return SelectionContainer.disabled( return Hero(
child: Hero(
tag: pic.url!, tag: pic.url!,
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
@@ -191,42 +192,42 @@ class OpusContent extends StatelessWidget {
), ),
), ),
), ),
)); );
} else { } else {
return SelectionContainer.disabled( return imageView(
child: imageView( maxWidth,
maxWidth, element.pic!.pics!
element.pic!.pics! .map(
.map((e) => (e) => ImageModel(width: 1, height: 1, url: e.url!))
ImageModel(width: 1, height: 1, url: e.url!)) .toList());
.toList()));
} }
case 3 when (element.line != null): case 3 when (element.line != null):
return SelectionContainer.disabled( return CachedNetworkImage(
child: CachedNetworkImage(
width: maxWidth, width: maxWidth,
fit: BoxFit.contain, fit: BoxFit.contain,
height: element.line!.pic!.height?.toDouble(), height: element.line!.pic!.height?.toDouble(),
imageUrl: Utils.thumbnailImgUrl(element.line!.pic!.url!), imageUrl: Utils.thumbnailImgUrl(element.line!.pic!.url!),
)); );
case 5 when (element.list != null): case 5 when (element.list != null):
return Text.rich( return SelectionArea(
TextSpan( child: Text.rich(
children: element.list!.items?.indexed.map((entry) { TextSpan(
return TextSpan( children: element.list!.items?.indexed.map((entry) {
children: [ return TextSpan(
const WidgetSpan( children: [
child: Icon(MdiIcons.circleMedium), const WidgetSpan(
alignment: PlaceholderAlignment.middle, child: Icon(MdiIcons.circleMedium),
), alignment: PlaceholderAlignment.middle,
...entry.$2.nodes!.map((item) { ),
return _getSpan(item.word); ...entry.$2.nodes!.map((item) {
}), return _getSpan(item.word);
if (entry.$1 < element.list!.items!.length - 1) }),
const TextSpan(text: '\n'), if (entry.$1 < element.list!.items!.length - 1)
], const TextSpan(text: '\n'),
); ],
}).toList(), );
}).toList(),
),
), ),
); );
case 6: case 6:
@@ -527,7 +528,7 @@ class OpusContent extends StatelessWidget {
), ),
); );
case 7 when (element.code != null): case 7 when (element.code != null):
final highlight = Highlight() final Highlight highlight = Highlight()
..registerLanguages(builtinAllLanguages); ..registerLanguages(builtinAllLanguages);
final HighlightResult result = highlight.highlightAuto( final HighlightResult result = highlight.highlightAuto(
element.code!.content!, element.code!.content!,
@@ -538,7 +539,7 @@ class OpusContent extends StatelessWidget {
.replaceAll('language-', '') .replaceAll('language-', '')
.replaceAll('like', ''), .replaceAll('like', ''),
]); ]);
final renderer = TextSpanRenderer( final TextSpanRenderer renderer = TextSpanRenderer(
const TextStyle(), builtinAllThemes['github']!); const TextStyle(), builtinAllThemes['github']!);
result.render(renderer); result.render(renderer);
return Container( return Container(
@@ -548,34 +549,40 @@ class OpusContent extends StatelessWidget {
color: colorScheme.onInverseSurface, color: colorScheme.onInverseSurface,
), ),
width: double.infinity, width: double.infinity,
child: Text.rich(renderer.span!), child: SelectionArea(child: Text.rich(renderer.span!)),
); );
default: default:
debugPrint('unknown type ${element.paraType}'); debugPrint('unknown type ${element.paraType}');
if (element.text?.nodes?.isNotEmpty == true) { if (element.text?.nodes?.isNotEmpty == true) {
return Text.rich( return SelectionArea(
textAlign: element.align == 1 ? TextAlign.center : null, child: Text.rich(
TextSpan( textAlign: element.align == 1 ? TextAlign.center : null,
children: element.text!.nodes! TextSpan(
.map<TextSpan>((item) => _getSpan(item.word)) children: element.text!.nodes!
.toList()), .map<TextSpan>((item) => _getSpan(item.word))
.toList()),
),
); );
} }
return Text( return SelectionArea(
'不支持的类型 (${element.paraType})', child: Text(
style: const TextStyle( '不支持的类型 (${element.paraType})',
fontWeight: FontWeight.bold, style: const TextStyle(
color: Colors.red, fontWeight: FontWeight.bold,
color: Colors.red,
),
), ),
); );
} }
} catch (e) { } catch (e) {
return Text( return SelectionArea(
'错误的类型 $e', child: Text(
style: const TextStyle( '错误的类型 $e',
fontWeight: FontWeight.bold, style: const TextStyle(
color: Colors.red, fontWeight: FontWeight.bold,
color: Colors.red,
),
), ),
); );
} }
@@ -590,7 +597,7 @@ Widget moduleBlockedItem(
BoxDecoration? bgImg() { BoxDecoration? bgImg() {
return moduleBlocked.bgImg == null return moduleBlocked.bgImg == null
? null ? null
: (BoxDecoration( : BoxDecoration(
image: DecorationImage( image: DecorationImage(
fit: BoxFit.fill, fit: BoxFit.fill,
image: CachedNetworkImageProvider( image: CachedNetworkImageProvider(
@@ -601,7 +608,7 @@ Widget moduleBlockedItem(
), ),
), ),
), ),
)); );
} }
Widget icon(double width) { Widget icon(double width) {
@@ -683,8 +690,7 @@ Widget moduleBlockedItem(
), ),
); );
} }
return SelectionContainer.disabled( return Container(
child: Container(
decoration: bgImg(), decoration: bgImg(),
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: Row( child: Row(
@@ -720,7 +726,7 @@ Widget moduleBlockedItem(
), ),
], ],
), ),
)); );
} }
Widget opusCollection(ThemeData theme, ModuleCollection item) { Widget opusCollection(ThemeData theme, ModuleCollection item) {

7
lib/pages/article/widgets/read_opus.dart
View File

@@ -25,14 +25,13 @@ class ReadOpus extends StatelessWidget {
try { try {
final item = ops![index]; final item = ops![index];
if (item.insert is String) { if (item.insert is String) {
return Text(item.insert); return SelectableText(item.insert);
} }
if (item.insert is Insert) { if (item.insert is Insert) {
InsertCard card = item.insert.card; InsertCard card = item.insert.card;
if (card.url?.isNotEmpty == true) { if (card.url?.isNotEmpty == true) {
return SelectionContainer.disabled( return GestureDetector(
child: GestureDetector(
onTap: () { onTap: () {
switch (item.attributes?.clazz) { switch (item.attributes?.clazz) {
case 'article-card card': case 'article-card card':
@@ -61,7 +60,7 @@ class ReadOpus extends StatelessWidget {
imageUrl: Utils.thumbnailImgUrl(card.url, 60), imageUrl: Utils.thumbnailImgUrl(card.url, 60),
), ),
), ),
)); );
} }
} }