EchoZenith/PiliPlus
1
0
Fork 0
mirror of https://github.com/bggRGjQaUbCoE/PiliPlus.git synced 2026-05-24 18:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

opt ui

Browse Source 
Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2026-01-05 14:21:59 +08:00
parent c226f8f6df
commit 5a0b045a1f
14 changed files with 232 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import 'package:PiliPlus/common/widgets/badge.dart';
import 'package:PiliPlus/common/widgets/custom_icon.dart';
import 'package:PiliPlus/common/widgets/flutter/refresh_indicator.dart';
import 'package:PiliPlus/common/widgets/image/network_img_layer.dart';
import 'package:PiliPlus/common/widgets/scroll_physics.dart';
import 'package:PiliPlus/models/common/badge_type.dart';
import 'package:PiliPlus/models/common/image_preview_type.dart';
import 'package:PiliPlus/models/common/image_type.dart';
@@ -16,6 +17,7 @@ import 'package:PiliPlus/pages/common/dyn/common_dyn_page.dart';
import 'package:PiliPlus/pages/dynamics_repost/view.dart';
import 'package:PiliPlus/utils/date_utils.dart';
import 'package:PiliPlus/utils/extension/get_ext.dart';
import 'package:PiliPlus/utils/extension/num_ext.dart';
import 'package:PiliPlus/utils/grid.dart';
import 'package:PiliPlus/utils/image_utils.dart';
import 'package:PiliPlus/utils/num_utils.dart';
@@ -180,7 +182,10 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
} else if (controller.articleData?.content != null) {
if (controller.articleData?.type == 3) {
// json
return ArticleOpus(ops: controller.articleData?.ops);
return ArticleOpus(
ops: controller.articleData?.ops,
maxWidth: maxWidth,
);
}
// if (kDebugMode) debugPrint('html page');
final res = parser.parse(controller.articleData!.content!);
@@ -238,14 +243,11 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
final length = pics.length;
final first = pics.first;
double height;
double paddingRight;
if (first.height != null && first.width != null) {
final ratio = first.height! / first.width!;
height = min(maxWidth * ratio, Get.height * 0.55);
paddingRight = (maxWidth - height / ratio) / 2 + 12;
height = min(maxWidth * ratio, maxHeight * 0.55);
} else {
height = Get.height * 0.55;
paddingRight = 12;
height = maxHeight * 0.55;
}
return Stack(
clipBehavior: Clip.none,
@@ -255,13 +257,25 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
width: maxWidth,
margin: const EdgeInsets.only(bottom: 10),
child: PageView.builder(
physics: const ClampingScrollPhysics(),
onPageChanged: (value) {
controller.topIndex.value = value;
},
physics: const CustomTabBarViewScrollPhysics(
parent: ClampingScrollPhysics(),
),
onPageChanged: (value) =>
controller.topIndex.value = value,
itemCount: length,
itemBuilder: (context, index) {
final pic = pics[index];
int? memCacheWidth, memCacheHeight;
if (pic.isLongPic ?? false) {
memCacheWidth = maxWidth.cacheSize(context);
} else if (pic.width != null &&
pic.height != null) {
if (pic.width! > pic.height!) {
memCacheWidth = maxWidth.cacheSize(context);
} else {
memCacheHeight = height.cacheSize(context);
}
}
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () => PageUtils.imageView(
@@ -277,31 +291,33 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
clipBehavior: Clip.none,
alignment: Alignment.center,
children: [
Positioned.fill(
child: CachedNetworkImage(
fit: pic.isLongPic == true
? BoxFit.cover
: null,
imageUrl: ImageUtils.thumbnailUrl(
pic.url,
60,
),
fadeInDuration: const Duration(
milliseconds: 120,
),
fadeOutDuration: const Duration(
milliseconds: 120,
),
placeholder: (_, _) =>
const SizedBox.shrink(),
CachedNetworkImage(
height: height,
width: maxWidth,
memCacheWidth: memCacheWidth,
memCacheHeight: memCacheHeight,
fit: pic.isLongPic == true
? BoxFit.cover
: null,
imageUrl: ImageUtils.thumbnailUrl(
pic.url,
60,
),
fadeInDuration: const Duration(
milliseconds: 120,
),
fadeOutDuration: const Duration(
milliseconds: 120,
),
placeholder: (_, _) =>
const SizedBox.shrink(),
),
if (pic.isLongPic == true)
PBadge(
text: '长图',
type: PBadgeType.primary,
right: paddingRight,
const PBadge(
right: 12,
bottom: 12,
text: '长图',
type: .primary,
),
],
),
@@ -313,7 +329,7 @@ class _ArticlePageState extends CommonDynPageState<ArticlePage> {
Obx(
() => PBadge(
top: 12,
right: paddingRight,
right: 12,
type: PBadgeType.gray,
text: '${controller.topIndex.value + 1}/$length',
),

20
lib/pages/article/widgets/article_ops.dart
View File

@@ -1,16 +1,24 @@
import 'dart:math' as math;
import 'package:PiliPlus/common/constants.dart';
import 'package:PiliPlus/models_new/article/article_view/ops.dart';
import 'package:PiliPlus/pages/dynamics/widgets/vote.dart';
import 'package:PiliPlus/utils/app_scheme.dart';
import 'package:PiliPlus/utils/extension/num_ext.dart';
import 'package:PiliPlus/utils/image_utils.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
class ArticleOpus extends StatelessWidget {
const ArticleOpus({super.key, required List<ArticleOps>? ops}) : _ops = ops;
const ArticleOpus({
super.key,
required List<ArticleOps>? ops,
required this.maxWidth,
}) : _ops = ops;
final List<ArticleOps>? _ops;
final double maxWidth;
@override
Widget build(BuildContext context) {
@@ -29,6 +37,13 @@ class ArticleOpus extends StatelessWidget {
case Insert(:final card):
if (card != null) {
if (card.url?.isNotEmpty == true) {
double? width = card.width == null
? null
: math.min(maxWidth, card.width!);
final height = width == null || card.height == null
? null
: width * card.height! / card.width!;
width ??= maxWidth;
return GestureDetector(
onTap: () {
switch (item.attributes?.clazz) {
@@ -55,6 +70,9 @@ class ArticleOpus extends StatelessWidget {
child: ClipRRect(
borderRadius: StyleString.mdRadius,
child: CachedNetworkImage(
width: width,
height: height,
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(card.url, 60),
placeholder: (_, _) => const SizedBox.shrink(),
),

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

@@ -41,13 +41,14 @@ Widget htmlRender({
if (clazz?.contains('cut-off') == true || height != null) {
return CachedNetworkImage(
width: maxWidth,
memCacheWidth: maxWidth.cacheSize(context),
height: height != null ? double.parse(height) : null,
imageUrl: ImageUtils.thumbnailUrl(imgUrl),
fit: BoxFit.contain,
placeholder: (_, _) => const SizedBox.shrink(),
);
}
final size = isEmote ? 22.0 : null;
final width = isEmote ? 22.0 : maxWidth;
return GestureDetector(
onTap: () => PageUtils.imageView(
imgList: [SourceModel(url: imgUrl)],
@@ -56,9 +57,9 @@ Widget htmlRender({
child: Hero(
tag: imgUrl,
child: CachedNetworkImage(
width: size,
height: size,
memCacheWidth: size?.cacheSize(context),
width: width,
height: isEmote ? 22.0 : null,
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(imgUrl, 60),
fadeInDuration: const Duration(milliseconds: 120),
fadeOutDuration: const Duration(milliseconds: 120),

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

@@ -215,12 +215,13 @@ class OpusContent extends StatelessWidget {
case 2 when (element.pic != null):
if (element.pic!.pics!.length == 1) {
final pic = element.pic!.pics!.first;
final width = pic.width == null
double? width = pic.width == null
? null
: math.min(maxWidth, pic.width!);
final height = width == null || pic.height == null
? null
: width * pic.height! / pic.width!;
width ??= maxWidth;
return GestureDetector(
onTap: () => PageUtils.imageView(
imgList: [SourceModel(url: pic.url!)],
@@ -232,7 +233,7 @@ class OpusContent extends StatelessWidget {
child: CachedNetworkImage(
width: width,
height: height,
memCacheWidth: width?.cacheSize(context),
memCacheWidth: width.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(pic.url!, 60),
fadeInDuration: const Duration(milliseconds: 120),
fadeOutDuration: const Duration(milliseconds: 120),
@@ -259,10 +260,10 @@ class OpusContent extends StatelessWidget {
case 3 when (element.line != null):
final height = element.line!.pic!.height?.toDouble();
return CachedNetworkImage(
width: maxWidth,
fit: BoxFit.contain,
fit: .contain,
height: height,
memCacheHeight: height?.cacheSize(context),
width: maxWidth,
memCacheWidth: maxWidth.cacheSize(context),
imageUrl: ImageUtils.thumbnailUrl(element.line!.pic!.url!),
placeholder: (_, _) => const SizedBox.shrink(),
);