diff --git a/lib/common/widgets/dialog/dialog.dart b/lib/common/widgets/dialog/dialog.dart index 23ffcf14f..9d9ff7b22 100644 --- a/lib/common/widgets/dialog/dialog.dart +++ b/lib/common/widgets/dialog/dialog.dart @@ -3,21 +3,16 @@ import 'package:get/get.dart'; Future showConfirmDialog({ required BuildContext context, - required String title, - Object? content, + required Widget title, + Widget? content, // @Deprecated('use `bool result = await showConfirmDialog()` instead') VoidCallback? onConfirm, }) async { - assert(content is String? || content is Widget); return await showDialog( context: context, builder: (context) => AlertDialog( - title: Text(title), - content: content is String - ? Text(content) - : content is Widget - ? content - : null, + title: title, + content: content, actions: [ TextButton( onPressed: Get.back, diff --git a/lib/common/widgets/image_viewer/viewer.dart b/lib/common/widgets/image_viewer/viewer.dart index 1611995e5..77748a0ed 100644 --- a/lib/common/widgets/image_viewer/viewer.dart +++ b/lib/common/widgets/image_viewer/viewer.dart @@ -235,6 +235,7 @@ class _ViewerState extends State with SingleTickerProviderStateMixin { void _handleDoubleTap() { if (!mounted) return; if (_animationController.isAnimating) return; + _stopFling(); _scaleFrom = _scale; _positionFrom = _position; @@ -528,6 +529,7 @@ class _ViewerState extends State with SingleTickerProviderStateMixin { widget.onChangePage!.call(event.scrollDelta.dy < 0 ? -1 : 1); return; } + _stopFling(); final double scaleChange = math.exp(-event.scrollDelta.dy / _scaleFactor); final Offset local = event.localPosition; final Offset focalPointScene = _toScene(local); diff --git a/lib/http/member.dart b/lib/http/member.dart index dd4cc008f..69bc23205 100644 --- a/lib/http/member.dart +++ b/lib/http/member.dart @@ -143,14 +143,7 @@ abstract final class MemberHttp { 'vmid': mid, }; final res = await Request().get( - switch (type) { - ContributeType.video => Api.spaceArchive, - ContributeType.charging => Api.spaceChargingArchive, - ContributeType.season => Api.spaceSeason, - ContributeType.series => Api.spaceSeries, - ContributeType.bangumi => Api.spaceBangumi, - ContributeType.comic => Api.spaceComic, - }, + type.api, queryParameters: params, options: Options( headers: { diff --git a/lib/models/common/member/contribute_type.dart b/lib/models/common/member/contribute_type.dart index a3b08a8f4..e0076673a 100644 --- a/lib/models/common/member/contribute_type.dart +++ b/lib/models/common/member/contribute_type.dart @@ -1,8 +1,14 @@ +import 'package:PiliPlus/http/api.dart'; + enum ContributeType { - video, - charging, - season, - series, - bangumi, - comic, + video(Api.spaceArchive), + charging(Api.spaceChargingArchive), + season(Api.spaceSeason), + series(Api.spaceSeries), + bangumi(Api.spaceBangumi), + comic(Api.spaceComic) + ; + + final String api; + const ContributeType(this.api); } diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart index 7a7554f66..29ee5b55e 100644 --- a/lib/pages/about/view.dart +++ b/lib/pages/about/view.dart @@ -213,8 +213,8 @@ Commit Hash: ${BuildConfig.commitHash}''', if (cacheSize.value.isNotEmpty) { showConfirmDialog( context: context, - title: '提示', - content: '该操作将清除图片及网络请求缓存数据,确认清除?', + title: const Text('提示'), + content: const Text('该操作将清除图片及网络请求缓存数据,确认清除?'), onConfirm: () async { SmartDialog.showLoading(msg: '正在清除...'); try { diff --git a/lib/pages/blacklist/controller.dart b/lib/pages/blacklist/controller.dart index 9884e20c2..615b0d8be 100644 --- a/lib/pages/blacklist/controller.dart +++ b/lib/pages/blacklist/controller.dart @@ -35,7 +35,7 @@ class BlackListController void onRemove(BuildContext context, int index, name, mid) { showConfirmDialog( context: context, - title: '确定将 $name 移出黑名单?', + title: Text('确定将 $name 移出黑名单?'), onConfirm: () async { final result = await VideoHttp.relationMod(mid: mid, act: 6, reSrc: 11); if (result.isSuccess) { diff --git a/lib/pages/danmaku_block/view.dart b/lib/pages/danmaku_block/view.dart index 8adc3d119..6e4e349de 100644 --- a/lib/pages/danmaku_block/view.dart +++ b/lib/pages/danmaku_block/view.dart @@ -97,7 +97,7 @@ class _DanmakuBlockPageState extends State { icon: const Icon(Icons.delete_outlined), onPressed: () => showConfirmDialog( context: context, - title: '确定删除该规则?', + title: const Text('确定删除该规则?'), onConfirm: () => _controller.danmakuFilterDel( tabIndex, itemIndex, diff --git a/lib/pages/download/controller.dart b/lib/pages/download/controller.dart index 96808fa9a..3bb57c1a7 100644 --- a/lib/pages/download/controller.dart +++ b/lib/pages/download/controller.dart @@ -7,6 +7,7 @@ import 'package:PiliPlus/pages/common/multi_select/base.dart' import 'package:PiliPlus/services/download/download_service.dart'; import 'package:PiliPlus/utils/extension/iterable_ext.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/widgets.dart' show Text; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -76,7 +77,7 @@ class DownloadPageController extends GetxController void onRemove() { showConfirmDialog( context: Get.context!, - title: '确定删除选中视频?', + title: const Text('确定删除选中视频?'), onConfirm: () async { SmartDialog.showLoading(); final watchProgress = GStorage.watchProgress; diff --git a/lib/pages/download/detail/view.dart b/lib/pages/download/detail/view.dart index f555bbb11..be1312dda 100644 --- a/lib/pages/download/detail/view.dart +++ b/lib/pages/download/detail/view.dart @@ -198,7 +198,7 @@ class _DownloadDetailPageState extends State void onRemove() { showConfirmDialog( context: context, - title: '确定删除选中视频?', + title: const Text('确定删除选中视频?'), onConfirm: () async { SmartDialog.showLoading(); final watchProgress = GStorage.watchProgress; diff --git a/lib/pages/download/detail/widgets/item.dart b/lib/pages/download/detail/widgets/item.dart index bfd2325ed..5223eb925 100644 --- a/lib/pages/download/detail/widgets/item.dart +++ b/lib/pages/download/detail/widgets/item.dart @@ -73,7 +73,7 @@ class DetailItem extends StatelessWidget { Get.back(); showConfirmDialog( context: context, - title: '确定删除该视频?', + title: const Text('确定删除该视频?'), onConfirm: onDelete, ); }, diff --git a/lib/pages/download/downloading/view.dart b/lib/pages/download/downloading/view.dart index 80cf3b5a4..001da6ea9 100644 --- a/lib/pages/download/downloading/view.dart +++ b/lib/pages/download/downloading/view.dart @@ -109,7 +109,7 @@ class _DownloadingPageState extends State void onRemove() { showConfirmDialog( context: context, - title: '确定删除选中视频?', + title: const Text('确定删除选中视频?'), onConfirm: () async { SmartDialog.showLoading(); final allChecked = this.allChecked.toSet(); diff --git a/lib/pages/download/search/controller.dart b/lib/pages/download/search/controller.dart index d15697d3a..e291fa77b 100644 --- a/lib/pages/download/search/controller.dart +++ b/lib/pages/download/search/controller.dart @@ -6,6 +6,7 @@ import 'package:PiliPlus/pages/common/multi_select/base.dart' import 'package:PiliPlus/pages/common/search/common_search_controller.dart'; import 'package:PiliPlus/services/download/download_service.dart'; import 'package:PiliPlus/utils/storage.dart'; +import 'package:flutter/widgets.dart' show Text; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -52,7 +53,7 @@ class DownloadSearchController void onRemove() { showConfirmDialog( context: Get.context!, - title: '确定删除选中视频?', + title: const Text('确定删除选中视频?'), onConfirm: () async { SmartDialog.showLoading(); final allChecked = this.allChecked.toSet(); diff --git a/lib/pages/download/view.dart b/lib/pages/download/view.dart index f002be2e5..b743e2040 100644 --- a/lib/pages/download/view.dart +++ b/lib/pages/download/view.dart @@ -248,7 +248,7 @@ class _DownloadPageState extends State { Get.back(); showConfirmDialog( context: context, - title: '确定删除?', + title: const Text('确定删除?'), onConfirm: () async { await GStorage.watchProgress.deleteAll( pageInfo.entries.map((e) => e.cid.toString()), diff --git a/lib/pages/dynamics_create_vote/controller.dart b/lib/pages/dynamics_create_vote/controller.dart index 4e57cf3e0..db4c9e463 100644 --- a/lib/pages/dynamics_create_vote/controller.dart +++ b/lib/pages/dynamics_create_vote/controller.dart @@ -5,6 +5,7 @@ import 'package:PiliPlus/http/msg.dart'; import 'package:PiliPlus/models/dynamics/vote_model.dart'; import 'package:PiliPlus/utils/accounts.dart'; import 'package:PiliPlus/utils/utils.dart'; +import 'package:flutter/widgets.dart' show Text; import 'package:get/get.dart'; class CreateVoteController extends GetxController { @@ -71,7 +72,7 @@ class CreateVoteController extends GetxController { } else { showConfirmDialog( context: Get.context!, - title: res.toString(), + title: Text(res.toString()), onConfirm: Get.back, ); } diff --git a/lib/pages/fan/view.dart b/lib/pages/fan/view.dart index 81df03c1f..d10ec5d19 100644 --- a/lib/pages/fan/view.dart +++ b/lib/pages/fan/view.dart @@ -67,7 +67,7 @@ class _FansPageState extends FollowTypePageState { Widget buildItem(int index, FollowItemModel item) { void onRemove() => showConfirmDialog( context: context, - title: '确定移除 ${item.uname} ?', + title: Text('确定移除 ${item.uname} ?'), onConfirm: () => controller.onRemoveFan(index, item.mid), ); diff --git a/lib/pages/fav/article/view.dart b/lib/pages/fav/article/view.dart index 1bef59617..f2b74a017 100644 --- a/lib/pages/fav/article/view.dart +++ b/lib/pages/fav/article/view.dart @@ -64,7 +64,7 @@ class _FavArticlePageState extends State item: item, onDelete: () => showConfirmDialog( context: context, - title: '确定取消收藏?', + title: const Text('确定取消收藏?'), onConfirm: () => _favArticleController.onRemove(index, item.opusId!), ), diff --git a/lib/pages/fav/cheese/view.dart b/lib/pages/fav/cheese/view.dart index c1a3e4fef..c41616520 100644 --- a/lib/pages/fav/cheese/view.dart +++ b/lib/pages/fav/cheese/view.dart @@ -66,7 +66,7 @@ class _FavCheesePageState extends State item: item, onRemove: () => showConfirmDialog( context: context, - title: '确定取消收藏该课堂?', + title: const Text('确定取消收藏该课堂?'), onConfirm: () => _controller.onRemove(index, item.seasonId!), ), diff --git a/lib/pages/fav/note/child_view.dart b/lib/pages/fav/note/child_view.dart index 7a42cbba7..4c9efa84e 100644 --- a/lib/pages/fav/note/child_view.dart +++ b/lib/pages/fav/note/child_view.dart @@ -125,7 +125,7 @@ class _FavNoteChildPageState extends State if (_favNoteController.checkedCount != 0) { showConfirmDialog( context: context, - title: '确定删除已选中的笔记吗?', + title: const Text('确定删除已选中的笔记吗?'), onConfirm: _favNoteController.onRemove, ); } diff --git a/lib/pages/fav/topic/view.dart b/lib/pages/fav/topic/view.dart index 5349b0595..69f75c3c6 100644 --- a/lib/pages/fav/topic/view.dart +++ b/lib/pages/fav/topic/view.dart @@ -83,7 +83,7 @@ class _FavTopicPageState extends State void onLongPress() => showConfirmDialog( context: context, - title: '确定取消收藏?', + title: const Text('确定取消收藏?'), onConfirm: () => _controller.onRemove(index, item.id!), ); diff --git a/lib/pages/fav_detail/controller.dart b/lib/pages/fav_detail/controller.dart index 36245bfb5..8f23ec9d9 100644 --- a/lib/pages/fav_detail/controller.dart +++ b/lib/pages/fav_detail/controller.dart @@ -16,7 +16,7 @@ import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; -import 'package:flutter/services.dart' show ValueChanged; +import 'package:flutter/widgets.dart' show Text, ValueChanged; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -51,8 +51,8 @@ mixin BaseFavController void onRemove() { showConfirmDialog( context: Get.context!, - content: '确认删除所选收藏吗?', - title: '提示', + title: const Text('提示'), + content: const Text('确认删除所选收藏吗?'), onConfirm: () async { final removeList = allChecked.toSet(); final res = await FavHttp.favVideo( diff --git a/lib/pages/fav_detail/view.dart b/lib/pages/fav_detail/view.dart index 4d8fffb46..a083e49cc 100644 --- a/lib/pages/fav_detail/view.dart +++ b/lib/pages/fav_detail/view.dart @@ -280,7 +280,7 @@ class _FavDetailPageState extends State with GridMixin { PopupMenuItem( onTap: () => showConfirmDialog( context: context, - title: '确定删除该收藏夹?', + title: const Text('确定删除该收藏夹?'), onConfirm: () => FavHttp.deleteFolder(mediaIds: mediaId).then((res) { if (res.isSuccess) { diff --git a/lib/pages/follow/view.dart b/lib/pages/follow/view.dart index 745a21fcd..3401b387d 100644 --- a/lib/pages/follow/view.dart +++ b/lib/pages/follow/view.dart @@ -191,7 +191,7 @@ class _FollowPageState extends State { String tagName = item.name!; showConfirmDialog( context: context, - title: '编辑分组名称', + title: const Text('编辑分组名称'), content: TextFormField( autofocus: true, initialValue: tagName, @@ -221,8 +221,8 @@ class _FollowPageState extends State { Get.back(); showConfirmDialog( context: context, - title: '删除分组', - content: '删除后,该分组下的用户依旧保留?', + title: const Text('删除分组'), + content: const Text('删除后,该分组下的用户依旧保留?'), onConfirm: () => _followController.onDelTag(item.tagid!), ); }, @@ -242,7 +242,7 @@ class _FollowPageState extends State { String tagName = ''; showConfirmDialog( context: context, - title: '新建分组', + title: const Text('新建分组'), content: TextFormField( autofocus: true, initialValue: tagName, diff --git a/lib/pages/history/controller.dart b/lib/pages/history/controller.dart index 2e95e6872..e7e418c7b 100644 --- a/lib/pages/history/controller.dart +++ b/lib/pages/history/controller.dart @@ -126,8 +126,8 @@ class HistoryController void onRemove() { showConfirmDialog( context: Get.context!, - content: '确认删除所选历史记录吗?', - title: '提示', + title: const Text('提示'), + content: const Text('确认删除所选历史记录吗?'), onConfirm: () => _onDelete(allChecked.toSet()), ); } diff --git a/lib/pages/history_search/controller.dart b/lib/pages/history_search/controller.dart index 2d67344f3..112266416 100644 --- a/lib/pages/history_search/controller.dart +++ b/lib/pages/history_search/controller.dart @@ -6,6 +6,7 @@ import 'package:PiliPlus/models_new/history/list.dart'; import 'package:PiliPlus/pages/common/multi_select/base.dart'; import 'package:PiliPlus/pages/common/search/common_search_controller.dart'; import 'package:PiliPlus/utils/accounts.dart'; +import 'package:flutter/widgets.dart' show Text; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -45,8 +46,8 @@ class HistorySearchController void onRemove() { showConfirmDialog( context: Get.context!, - content: '确认删除所选历史记录吗?', - title: '提示', + title: const Text('提示'), + content: const Text('确认删除所选历史记录吗?'), onConfirm: () async { SmartDialog.showLoading(msg: '请求中'); final removeList = allChecked.toSet(); diff --git a/lib/pages/later/controller.dart b/lib/pages/later/controller.dart index 3799a8098..69e1e561f 100644 --- a/lib/pages/later/controller.dart +++ b/lib/pages/later/controller.dart @@ -28,8 +28,8 @@ mixin BaseLaterController void onRemove() { showConfirmDialog( context: Get.context!, - content: '确认删除所选稍后再看吗?', - title: '提示', + title: const Text('提示'), + content: const Text('确认删除所选稍后再看吗?'), onConfirm: () async { final removeList = allChecked.toSet(); SmartDialog.showLoading(msg: '请求中'); @@ -135,8 +135,8 @@ class LaterController extends MultiSelectController }; showConfirmDialog( context: context, - title: '确认', - content: content, + title: const Text('确认'), + content: Text(content), onConfirm: () async { final res = await UserHttp.toViewClear(cleanType); if (res.isSuccess) { diff --git a/lib/pages/live_dm_block/view.dart b/lib/pages/live_dm_block/view.dart index fbc501722..e79b27cff 100644 --- a/lib/pages/live_dm_block/view.dart +++ b/lib/pages/live_dm_block/view.dart @@ -176,7 +176,7 @@ class _LiveDmBlockPageState extends State { text: item is ShieldUserList ? item.uname! : item as String, onTap: (value) => showConfirmDialog( context: context, - title: '确定删除该规则?', + title: const Text('确定删除该规则?'), onConfirm: () => _controller.onRemove(e.$1, item), ), ); @@ -348,7 +348,7 @@ class _LiveDmBlockPageState extends State { String value = ''; showConfirmDialog( context: context, - title: '${isKeyword ? '关键词' : '用户'}屏蔽', + title: Text('${isKeyword ? '关键词' : '用户'}屏蔽'), content: TextFormField( autofocus: true, initialValue: value, diff --git a/lib/pages/msg_feed_top/at_me/view.dart b/lib/pages/msg_feed_top/at_me/view.dart index dc3f1028f..554888ee6 100644 --- a/lib/pages/msg_feed_top/at_me/view.dart +++ b/lib/pages/msg_feed_top/at_me/view.dart @@ -95,7 +95,7 @@ class _AtMePageState extends State { final item = response[index]; void onLongPress() => showConfirmDialog( context: context, - title: '确定删除该通知?', + title: const Text('确定删除该通知?'), onConfirm: () => _atMeController.onRemove(item.id!, index), ); return ListTile( diff --git a/lib/pages/msg_feed_top/like_me/view.dart b/lib/pages/msg_feed_top/like_me/view.dart index 53c710fe3..c5164002c 100644 --- a/lib/pages/msg_feed_top/like_me/view.dart +++ b/lib/pages/msg_feed_top/like_me/view.dart @@ -211,8 +211,8 @@ class _LikeMePageState extends State { Get.back(); showConfirmDialog( context: context, - title: '删除', - content: '该条通知删除后,当有新点赞时会重新出现在列表,是否继续?', + title: const Text('删除'), + content: const Text('该条通知删除后,当有新点赞时会重新出现在列表,是否继续?'), onConfirm: () => onRemove(item.id), ); }, @@ -228,8 +228,8 @@ class _LikeMePageState extends State { if (isNotice) { showConfirmDialog( context: context, - title: '不再通知', - content: '这条内容的点赞将不再通知,但仍可在列表内查看,是否继续?', + title: const Text('不再通知'), + content: const Text('这条内容的点赞将不再通知,但仍可在列表内查看,是否继续?'), onConfirm: () => _likeMeController.onSetNotice(item, isNotice), ); diff --git a/lib/pages/msg_feed_top/reply_me/view.dart b/lib/pages/msg_feed_top/reply_me/view.dart index 40fec0936..ed941d6db 100644 --- a/lib/pages/msg_feed_top/reply_me/view.dart +++ b/lib/pages/msg_feed_top/reply_me/view.dart @@ -97,7 +97,7 @@ class _ReplyMePageState extends State { void onLongPress() => showConfirmDialog( context: context, - title: '确定删除该通知?', + title: const Text('确定删除该通知?'), onConfirm: () => _replyMeController.onRemove(item.id, index), ); diff --git a/lib/pages/msg_feed_top/sys_msg/view.dart b/lib/pages/msg_feed_top/sys_msg/view.dart index 9d9b3d1af..e33e34a42 100644 --- a/lib/pages/msg_feed_top/sys_msg/view.dart +++ b/lib/pages/msg_feed_top/sys_msg/view.dart @@ -82,7 +82,7 @@ class _SysMsgPageState extends State { final item = response[index]; void onLongPress() => showConfirmDialog( context: context, - title: '确定删除该通知?', + title: const Text('确定删除该通知?'), onConfirm: () => _sysMsgController.onRemove(item.id, index), ); return ListTile( diff --git a/lib/pages/my_reply/view.dart b/lib/pages/my_reply/view.dart index f89b5eac4..2f5412fad 100644 --- a/lib/pages/my_reply/view.dart +++ b/lib/pages/my_reply/view.dart @@ -53,7 +53,7 @@ class _MyReplyState extends State with DynMixin { tooltip: 'Clear', onPressed: () => showConfirmDialog( context: context, - title: 'Clear Local Storage?', + title: const Text('Clear Local Storage?'), onConfirm: () { GStorage.reply!.clear(); _replies.clear(); diff --git a/lib/pages/pgc_review/child/view.dart b/lib/pages/pgc_review/child/view.dart index c32c65378..7660e3c61 100644 --- a/lib/pages/pgc_review/child/view.dart +++ b/lib/pages/pgc_review/child/view.dart @@ -163,7 +163,7 @@ class _PgcReviewChildPageState extends State Get.back(); showConfirmDialog( context: context, - title: '删除短评,同时删除评分?', + title: const Text('删除短评,同时删除评分?'), onConfirm: () => _controller.onDel(index, item.reviewId!), ); }, diff --git a/lib/pages/search/controller.dart b/lib/pages/search/controller.dart index bba91f97d..729e445c7 100644 --- a/lib/pages/search/controller.dart +++ b/lib/pages/search/controller.dart @@ -231,7 +231,7 @@ class SSearchController extends GetxController void onClearHistory() { showConfirmDialog( context: Get.context!, - title: '确定清空搜索历史?', + title: const Text('确定清空搜索历史?'), onConfirm: () { historyList.clear(); GStorage.historyWord.delete('cacheList'); diff --git a/lib/pages/search/widgets/search_text.dart b/lib/pages/search/widgets/search_text.dart index cd8958cc8..9bd36f4b7 100644 --- a/lib/pages/search/widgets/search_text.dart +++ b/lib/pages/search/widgets/search_text.dart @@ -9,8 +9,9 @@ class SearchText extends StatelessWidget { final Color? bgColor; final Color? textColor; final TextAlign? textAlign; - final EdgeInsetsGeometry? padding; final double? height; + final EdgeInsets padding; + final BorderRadius borderRadius; const SearchText({ super.key, @@ -21,8 +22,9 @@ class SearchText extends StatelessWidget { this.bgColor, this.textColor, this.textAlign, - this.padding, this.height, + this.padding = const .symmetric(horizontal: 11, vertical: 5), + this.borderRadius = const .all(.circular(6)), }); @override @@ -31,18 +33,16 @@ class SearchText extends StatelessWidget { final hasLongPress = onLongPress != null; return Material( color: bgColor ?? colorScheme.onInverseSurface, - borderRadius: const BorderRadius.all(Radius.circular(6)), + borderRadius: borderRadius, child: InkWell( onTap: () => onTap?.call(text), onLongPress: hasLongPress ? () => onLongPress!(text) : null, onSecondaryTap: hasLongPress && !PlatformUtils.isMobile ? () => onLongPress!(text) : null, - borderRadius: const BorderRadius.all(Radius.circular(6)), + borderRadius: borderRadius, child: Padding( - padding: - padding ?? - const EdgeInsets.symmetric(horizontal: 11, vertical: 5), + padding: padding, child: Text( text, textAlign: textAlign, diff --git a/lib/pages/setting/models/style_settings.dart b/lib/pages/setting/models/style_settings.dart index 92e450944..3501a2cb4 100644 --- a/lib/pages/setting/models/style_settings.dart +++ b/lib/pages/setting/models/style_settings.dart @@ -818,9 +818,10 @@ void _showReduceColorDialog( if (color.computeLuminance() < 0.2) { showConfirmDialog( context: context, - title: - '确认使用#${(color.toARGB32() & 0xFFFFFF).toRadixString(16).toUpperCase().padLeft(6)}?', - content: '所选颜色过于昏暗,可能会影响图片观看', + title: Text( + '确认使用#${(color.toARGB32() & 0xFFFFFF).toRadixString(16).toUpperCase().padLeft(6)}?', + ), + content: const Text('所选颜色过于昏暗,可能会影响图片观看'), onConfirm: onConfirm, ); } else { diff --git a/lib/pages/setting/widgets/switch_item.dart b/lib/pages/setting/widgets/switch_item.dart index d4402c3c3..25d2fc0ba 100644 --- a/lib/pages/setting/widgets/switch_item.dart +++ b/lib/pages/setting/widgets/switch_item.dart @@ -70,8 +70,8 @@ class _SetSwitchItemState extends State { if (widget.setKey == SettingBoxKey.badCertificateCallback && val) { val = await showConfirmDialog( context: context, - title: '确定禁用 SSL 证书验证?', - content: '禁用容易受到中间人攻击', + title: const Text('确定禁用 SSL 证书验证?'), + content: const Text('禁用容易受到中间人攻击'), ); } diff --git a/lib/pages/video/download_panel/view.dart b/lib/pages/video/download_panel/view.dart index 4672c527a..70de68a1d 100644 --- a/lib/pages/video/download_panel/view.dart +++ b/lib/pages/video/download_panel/view.dart @@ -544,7 +544,7 @@ class _DownloadPanelState extends State { onTap: () { showConfirmDialog( context: context, - title: '确定缓存全部?', + title: const Text('确定缓存全部?'), onConfirm: () { for (int i = 0; i < widget.episodes.length; i++) { _onDownload( diff --git a/lib/pages/video/introduction/ugc/view.dart b/lib/pages/video/introduction/ugc/view.dart index 2d0199ec3..fb2a88e0b 100644 --- a/lib/pages/video/introduction/ugc/view.dart +++ b/lib/pages/video/introduction/ugc/view.dart @@ -674,9 +674,10 @@ class _UgcIntroPanelState extends State { if (!mounted) return; final confirmed = await showConfirmDialog( context: context, - title: '空降助手:搬运视频同步', - content: - '${hasPortVideo ? "" : "是否将"}该视频${hasPortVideo ? "已" : ""}绑定到此YouTube视频($ytbId)', + title: const Text('空降助手:搬运视频同步'), + content: Text( + '${hasPortVideo ? "" : "是否将"}该视频${hasPortVideo ? "已" : ""}绑定到此YouTube视频($ytbId)', + ), ); if (!hasPortVideo && confirmed) { final res = await SponsorBlock.postPortVideo( diff --git a/lib/pages/video/medialist/view.dart b/lib/pages/video/medialist/view.dart index 3a0b097ba..d322d7316 100644 --- a/lib/pages/video/medialist/view.dart +++ b/lib/pages/video/medialist/view.dart @@ -288,7 +288,7 @@ class _MediaListPanelState extends State customBorder: const CircleBorder(), onTap: () => showConfirmDialog( context: context, - title: '确定移除该视频?', + title: const Text('确定移除该视频?'), onConfirm: () => widget.onDelete!(item, index), ), onLongPress: () => widget.onDelete!(item, index), diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart index 687bef3f2..86c5ad654 100644 --- a/lib/pages/whisper/widgets/item.dart +++ b/lib/pages/whisper/widgets/item.dart @@ -88,7 +88,7 @@ class WhisperSessionItem extends StatelessWidget { Get.back(); showConfirmDialog( context: context, - title: '确定删除该对话?', + title: const Text('确定删除该对话?'), onConfirm: () => onRemove(item.id.privateId.talkerUid.toInt()), ); @@ -122,7 +122,7 @@ class WhisperSessionItem extends StatelessWidget { height: 42, onTap: () => showConfirmDialog( context: context, - title: '确定删除该对话?', + title: const Text('确定删除该对话?'), onConfirm: () => onRemove(item.id.privateId.talkerUid.toInt()), ), diff --git a/lib/pages/whisper_block/view.dart b/lib/pages/whisper_block/view.dart index 96ec9f74f..2db486487 100644 --- a/lib/pages/whisper_block/view.dart +++ b/lib/pages/whisper_block/view.dart @@ -81,8 +81,8 @@ class _WhisperBlockPageState extends State { onTap: (keyword) { showConfirmDialog( context: context, - title: '删除屏蔽词?', - content: '该屏蔽词将不再生效', + title: const Text('删除屏蔽词?'), + content: const Text('该屏蔽词将不再生效'), onConfirm: () => _controller.onRemove(e), ); }, diff --git a/lib/pages/whisper_link_setting/controller.dart b/lib/pages/whisper_link_setting/controller.dart index 32679c05a..5d745b9b6 100644 --- a/lib/pages/whisper_link_setting/controller.dart +++ b/lib/pages/whisper_link_setting/controller.dart @@ -12,6 +12,7 @@ import 'package:PiliPlus/models_new/msg/msg_dnd/uid_setting.dart'; import 'package:PiliPlus/models_new/msg/session_ss/data.dart'; import 'package:PiliPlus/utils/accounts.dart'; import 'package:fixnum/fixnum.dart'; +import 'package:flutter/widgets.dart' show Text; import 'package:get/get.dart'; class WhisperLinkSettingController extends GetxController { @@ -64,8 +65,8 @@ class WhisperLinkSettingController extends GetxController { if (isPush) { showConfirmDialog( context: Get.context!, - title: '确认关闭内容推送吗?', - content: '若关闭此开关,你将不再收到该账号的图文消息与稿件推送,但通知类消息不受影响', + title: const Text('确认关闭内容推送吗?'), + content: const Text('若关闭此开关,你将不再收到该账号的图文消息与稿件推送,但通知类消息不受影响'), onConfirm: () => _setPush(isPush), ); return; @@ -132,8 +133,8 @@ class WhisperLinkSettingController extends GetxController { } else { showConfirmDialog( context: Get.context!, - title: '确认拉黑该用户', - content: '加入黑名单后,将自动解除关注关系和对该用户的合集订阅关系,禁止该用户与我互动或查看我的空间', + title: const Text('确认拉黑该用户'), + content: const Text('加入黑名单后,将自动解除关注关系和对该用户的合集订阅关系,禁止该用户与我互动或查看我的空间'), onConfirm: () async { final res = await VideoHttp.relationMod( mid: talkerUid, diff --git a/lib/utils/extension/three_dot_ext.dart b/lib/utils/extension/three_dot_ext.dart index 6affdec98..dbbeead32 100644 --- a/lib/utils/extension/three_dot_ext.dart +++ b/lib/utils/extension/three_dot_ext.dart @@ -47,15 +47,15 @@ extension ThreeDotItemTypeExt on ThreeDotItemType { case ThreeDotItemType.THREE_DOT_ITEM_TYPE_READ_ALL: showConfirmDialog( context: context, - title: '一键已读', - content: '是否清除全部新消息提醒?', + title: const Text('一键已读'), + content: const Text('是否清除全部新消息提醒?'), onConfirm: controller.onClearUnread, ); case ThreeDotItemType.THREE_DOT_ITEM_TYPE_CLEAR_LIST: showConfirmDialog( context: context, - title: '清空列表', - content: '清空后所有消息将被删除,无法恢复', + title: const Text('清空列表'), + content: const Text('清空后所有消息将被删除,无法恢复'), onConfirm: controller.onDeleteList, ); case ThreeDotItemType.THREE_DOT_ITEM_TYPE_MSG_SETTING: