From 8a8e99f30b53dd0a4dc23dded86592f2fee272d6 Mon Sep 17 00:00:00 2001 From: guozhigq Date: Tue, 22 Aug 2023 20:53:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=B0=83=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/common/widgets/video_card_h.dart | 13 +-- lib/common/widgets/video_card_v.dart | 8 +- lib/main.dart | 7 +- lib/pages/bangumi/view.dart | 3 +- lib/pages/bangumi/widgets/bangumu_card_v.dart | 5 +- lib/pages/fav/widgets/item.dart | 1 - lib/pages/favDetail/view.dart | 54 +++++----- .../favDetail/widget/fav_video_card.dart | 1 - lib/pages/history/widgets/item.dart | 1 - lib/pages/live/view.dart | 3 +- lib/pages/live/widgets/live_item.dart | 8 +- lib/pages/media/view.dart | 2 +- lib/pages/rcmd/view.dart | 3 +- lib/pages/searchPanel/widgets/live_panel.dart | 21 ++-- .../widgets/media_bangumi_panel.dart | 7 +- lib/pages/setting/pages/font_size_select.dart | 101 ++++++++++++++++++ lib/pages/setting/style_setting.dart | 5 + .../introduction/widgets/intro_detail.dart | 2 +- lib/router/app_pages.dart | 2 + lib/utils/storage.dart | 2 +- 20 files changed, 175 insertions(+), 74 deletions(-) create mode 100644 lib/pages/setting/pages/font_size_select.dart diff --git a/lib/common/widgets/video_card_h.dart b/lib/common/widgets/video_card_h.dart index ed7b299e..6d4fa61a 100644 --- a/lib/common/widgets/video_card_h.dart +++ b/lib/common/widgets/video_card_h.dart @@ -58,8 +58,11 @@ class VideoCardH extends StatelessWidget { StyleString.safeSpace, 5, StyleString.safeSpace, 5), child: LayoutBuilder( builder: (context, boxConstraints) { - double width = - (boxConstraints.maxWidth - StyleString.cardSpace * 6) / 2; + double width = (boxConstraints.maxWidth - + StyleString.cardSpace * + 6 / + MediaQuery.of(context).textScaleFactor) / + 2; return Container( constraints: const BoxConstraints(minHeight: 88), height: width / StyleString.aspectRatio, @@ -123,7 +126,7 @@ class VideoContent extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Padding( - padding: const EdgeInsets.fromLTRB(10, 2, 6, 0), + padding: const EdgeInsets.fromLTRB(10, 0, 6, 0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -132,7 +135,6 @@ class VideoContent extends StatelessWidget { videoItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, ), maxLines: 2, @@ -147,7 +149,6 @@ class VideoContent extends StatelessWidget { TextSpan( text: i['text'], style: TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, color: i['type'] == 'em' @@ -177,7 +178,7 @@ class VideoContent extends StatelessWidget { // color: Theme.of(context).colorScheme.surfaceTint), // ), // ), - const SizedBox(height: 4), + // const SizedBox(height: 4), Row( children: [ Text( diff --git a/lib/common/widgets/video_card_v.dart b/lib/common/widgets/video_card_v.dart index 53300d3e..eb37d0e1 100644 --- a/lib/common/widgets/video_card_v.dart +++ b/lib/common/widgets/video_card_v.dart @@ -77,11 +77,8 @@ class VideoCardV extends StatelessWidget { Widget build(BuildContext context) { String heroTag = Utils.makeHeroTag(videoItem.id); return Card( - elevation: 0, + elevation: 1, clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: StyleString.mdRadius, - ), margin: EdgeInsets.zero, child: GestureDetector( onLongPress: () { @@ -129,14 +126,13 @@ class VideoContent extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Padding( - padding: const EdgeInsets.fromLTRB(4, 8, 0, 3), + padding: const EdgeInsets.fromLTRB(9, 8, 9, 4), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text( videoItem.title, - style: const TextStyle(fontSize: 13), maxLines: 2, overflow: TextOverflow.ellipsis, ), diff --git a/lib/main.dart b/lib/main.dart index 525cfd68..ddf910dc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -48,6 +48,9 @@ class MyApp extends StatelessWidget { // 是否动态取色 bool isDynamicColor = setting.get(SettingBoxKey.dynamicColor, defaultValue: true); + // 字体缩放大小 + double textScale = + setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0); return DynamicColorBuilder( builder: ((ColorScheme? lightDynamic, ColorScheme? darkDynamic) { @@ -107,7 +110,9 @@ class MyApp extends StatelessWidget { return FlutterSmartDialog( toastBuilder: (String msg) => CustomToast(msg: msg), child: MediaQuery( - data: MediaQuery.of(context).copyWith(textScaleFactor: 1.0), + data: MediaQuery.of(context).copyWith( + textScaleFactor: + MediaQuery.of(context).textScaleFactor * textScale), child: child!, ), ); diff --git a/lib/pages/bangumi/view.dart b/lib/pages/bangumi/view.dart index 3032bb4d..f9c3e37d 100644 --- a/lib/pages/bangumi/view.dart +++ b/lib/pages/bangumi/view.dart @@ -213,7 +213,8 @@ class _BangumiPageState extends State crossAxisSpacing: StyleString.cardSpace, // 列数 crossAxisCount: 3, - mainAxisExtent: Get.size.width / 3 / 0.65 + 30, + mainAxisExtent: Get.size.width / 3 / 0.65 + + 32 * MediaQuery.of(context).textScaleFactor, ), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/bangumi/widgets/bangumu_card_v.dart b/lib/pages/bangumi/widgets/bangumu_card_v.dart index 47629331..937d9d40 100644 --- a/lib/pages/bangumi/widgets/bangumu_card_v.dart +++ b/lib/pages/bangumi/widgets/bangumu_card_v.dart @@ -29,9 +29,6 @@ class BangumiCardV extends StatelessWidget { return Card( elevation: 0, clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: StyleString.mdRadius, - ), margin: EdgeInsets.zero, child: GestureDetector( // onLongPress: () { @@ -149,7 +146,6 @@ class BangumiContent extends StatelessWidget { bangumiItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, ), @@ -158,6 +154,7 @@ class BangumiContent extends StatelessWidget { )), ], ), + const SizedBox(height: 1), if (bangumiItem.indexShow != null) Text( bangumiItem.indexShow, diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart index 816153c2..08730d7b 100644 --- a/lib/pages/fav/widgets/item.dart +++ b/lib/pages/fav/widgets/item.dart @@ -77,7 +77,6 @@ class VideoContent extends StatelessWidget { favFolderItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, ), diff --git a/lib/pages/favDetail/view.dart b/lib/pages/favDetail/view.dart index d90d4f11..a99d1c03 100644 --- a/lib/pages/favDetail/view.dart +++ b/lib/pages/favDetail/view.dart @@ -127,32 +127,34 @@ class _FavDetailPageState extends State { ), ), const SizedBox(width: 14), - Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const SizedBox(height: 4), - Text( - _favDetailController.item!.title!, - style: TextStyle( - fontSize: Theme.of(context) - .textTheme - .titleMedium! - .fontSize, - fontWeight: FontWeight.bold), - ), - const SizedBox(height: 4), - Text( - _favDetailController.item!.upper!.name!, - style: TextStyle( - fontSize: Theme.of(context) - .textTheme - .labelSmall! - .fontSize, - color: Theme.of(context).colorScheme.outline), - ) - ], - ) + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 4), + Text( + _favDetailController.item!.title!, + style: TextStyle( + fontSize: Theme.of(context) + .textTheme + .titleMedium! + .fontSize, + fontWeight: FontWeight.bold), + ), + const SizedBox(height: 4), + Text( + _favDetailController.item!.upper!.name!, + style: TextStyle( + fontSize: Theme.of(context) + .textTheme + .labelSmall! + .fontSize, + color: Theme.of(context).colorScheme.outline), + ) + ], + ), + ), ], ), ), diff --git a/lib/pages/favDetail/widget/fav_video_card.dart b/lib/pages/favDetail/widget/fav_video_card.dart index 084a8681..61ac06f1 100644 --- a/lib/pages/favDetail/widget/fav_video_card.dart +++ b/lib/pages/favDetail/widget/fav_video_card.dart @@ -159,7 +159,6 @@ class VideoContent extends StatelessWidget { videoItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, ), diff --git a/lib/pages/history/widgets/item.dart b/lib/pages/history/widgets/item.dart index a368a978..2d801668 100644 --- a/lib/pages/history/widgets/item.dart +++ b/lib/pages/history/widgets/item.dart @@ -205,7 +205,6 @@ class VideoContent extends StatelessWidget { videoItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, ), diff --git a/lib/pages/live/view.dart b/lib/pages/live/view.dart index 385d3272..1acf0dc7 100644 --- a/lib/pages/live/view.dart +++ b/lib/pages/live/view.dart @@ -146,7 +146,8 @@ class _LivePageState extends State { // 列数 crossAxisCount: crossAxisCount, mainAxisExtent: - Get.size.width / crossAxisCount / StyleString.aspectRatio + 66, + Get.size.width / crossAxisCount / StyleString.aspectRatio + + 68 * MediaQuery.of(context).textScaleFactor, ), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/live/widgets/live_item.dart b/lib/pages/live/widgets/live_item.dart index f676a877..a8185be7 100644 --- a/lib/pages/live/widgets/live_item.dart +++ b/lib/pages/live/widgets/live_item.dart @@ -23,11 +23,8 @@ class LiveCardV extends StatelessWidget { Widget build(BuildContext context) { String heroTag = Utils.makeHeroTag(liveItem.roomId); return Card( - elevation: 0, + elevation: 1, clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: StyleString.mdRadius, - ), margin: EdgeInsets.zero, child: GestureDetector( onLongPress: () { @@ -103,7 +100,7 @@ class LiveContent extends StatelessWidget { return Expanded( child: Padding( // 多列 - padding: const EdgeInsets.fromLTRB(4, 8, 0, 6), + padding: const EdgeInsets.fromLTRB(9, 9, 9, 8), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -112,7 +109,6 @@ class LiveContent extends StatelessWidget { liveItem.title, textAlign: TextAlign.start, style: const TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, ), diff --git a/lib/pages/media/view.dart b/lib/pages/media/view.dart index 3657dbb5..42ade71c 100644 --- a/lib/pages/media/view.dart +++ b/lib/pages/media/view.dart @@ -138,7 +138,7 @@ class _MediaPageState extends State // const SizedBox(height: 10), SizedBox( width: double.infinity, - height: 170, + height: 170 * MediaQuery.of(context).textScaleFactor, child: FutureBuilder( future: _futureBuilderFuture, builder: (context, snapshot) { diff --git a/lib/pages/rcmd/view.dart b/lib/pages/rcmd/view.dart index d8d7c57a..0ed66ac9 100644 --- a/lib/pages/rcmd/view.dart +++ b/lib/pages/rcmd/view.dart @@ -159,7 +159,8 @@ class _RcmdPageState extends State // 列数 crossAxisCount: crossAxisCount, mainAxisExtent: - Get.size.width / crossAxisCount / StyleString.aspectRatio + 66, + (Get.size.width / crossAxisCount / StyleString.aspectRatio) + + 68 * MediaQuery.of(context).textScaleFactor, ), delegate: SliverChildBuilderDelegate( (BuildContext context, int index) { diff --git a/lib/pages/searchPanel/widgets/live_panel.dart b/lib/pages/searchPanel/widgets/live_panel.dart index 02b56d3a..6cd9f4c2 100644 --- a/lib/pages/searchPanel/widgets/live_panel.dart +++ b/lib/pages/searchPanel/widgets/live_panel.dart @@ -12,13 +12,12 @@ Widget searchLivePanel(BuildContext context, ctr, list) { primary: false, controller: ctr!.scrollController, gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - crossAxisSpacing: StyleString.cardSpace + 2, - mainAxisSpacing: StyleString.cardSpace + 3, - mainAxisExtent: - MediaQuery.of(context).size.width / 2 / StyleString.aspectRatio + - 60, - ), + crossAxisCount: 2, + crossAxisSpacing: StyleString.cardSpace + 2, + mainAxisSpacing: StyleString.cardSpace + 3, + mainAxisExtent: + MediaQuery.of(context).size.width / 2 / StyleString.aspectRatio + + 66 * MediaQuery.of(context).textScaleFactor), itemCount: list.length, itemBuilder: (context, index) { return LiveItem(liveItem: list![index]); @@ -35,11 +34,8 @@ class LiveItem extends StatelessWidget { Widget build(BuildContext context) { String heroTag = Utils.makeHeroTag(liveItem.roomid); return Card( - elevation: 0, + elevation: 1, clipBehavior: Clip.hardEdge, - shape: RoundedRectangleBorder( - borderRadius: StyleString.mdRadius, - ), margin: EdgeInsets.zero, child: InkWell( onTap: () async { @@ -104,7 +100,7 @@ class LiveContent extends StatelessWidget { Widget build(BuildContext context) { return Expanded( child: Padding( - padding: const EdgeInsets.fromLTRB(4, 5, 6, 6), + padding: const EdgeInsets.fromLTRB(9, 8, 9, 6), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -116,7 +112,6 @@ class LiveContent extends StatelessWidget { TextSpan( text: i['text'], style: TextStyle( - fontSize: 13, fontWeight: FontWeight.w500, letterSpacing: 0.3, color: i['type'] == 'em' diff --git a/lib/pages/searchPanel/widgets/media_bangumi_panel.dart b/lib/pages/searchPanel/widgets/media_bangumi_panel.dart index b17c74de..b8ae8d2e 100644 --- a/lib/pages/searchPanel/widgets/media_bangumi_panel.dart +++ b/lib/pages/searchPanel/widgets/media_bangumi_panel.dart @@ -68,9 +68,10 @@ Widget searchMbangumiPanel(BuildContext context, ctr, list) { text: i['text'], style: TextStyle( fontSize: Theme.of(context) - .textTheme - .titleSmall! - .fontSize, + .textTheme + .titleSmall! + .fontSize! * + MediaQuery.of(context).textScaleFactor, fontWeight: FontWeight.bold, color: i['type'] == 'em' ? Theme.of(context).colorScheme.primary diff --git a/lib/pages/setting/pages/font_size_select.dart b/lib/pages/setting/pages/font_size_select.dart new file mode 100644 index 00000000..04d6794d --- /dev/null +++ b/lib/pages/setting/pages/font_size_select.dart @@ -0,0 +1,101 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:hive/hive.dart'; +import 'package:pilipala/utils/storage.dart'; + +class FontSizeSelectPage extends StatefulWidget { + const FontSizeSelectPage({super.key}); + + @override + State createState() => _FontSizeSelectPageState(); +} + +class _FontSizeSelectPageState extends State { + Box setting = GStrorage.setting; + List list = [0.9, 0.95, 1.0, 1.05, 1.1, 1.15, 1.2, 1.25, 1.3]; + late double minsize; + late double maxSize; + late double currentSize; + + @override + void initState() { + super.initState(); + minsize = list.first; + maxSize = list.last; + currentSize = + setting.get(SettingBoxKey.defaultTextScale, defaultValue: 1.0); + } + + setFontSize() { + setting.put(SettingBoxKey.defaultTextScale, currentSize); + Get.forceAppUpdate(); + Get.back(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + actions: [ + TextButton(onPressed: () => setFontSize(), child: const Text('确定')), + const SizedBox(width: 12) + ], + ), + body: Column( + children: [ + Expanded( + child: SingleChildScrollView( + child: Center( + child: Text( + '当前字体大小:${currentSize == 1.0 ? '默认' : currentSize}', + style: TextStyle(fontSize: 14 * currentSize), + ), + ), + ), + ), + Container( + width: double.infinity, + padding: EdgeInsets.only( + left: 20, + right: 20, + top: 20, + bottom: MediaQuery.of(context).padding.bottom + 20, + ), + decoration: BoxDecoration( + border: Border( + top: BorderSide( + color: Theme.of(context) + .colorScheme + .primary + .withOpacity(0.3))), + color: Theme.of(context).colorScheme.background, + ), + child: Row( + children: [ + const Text('小'), + Expanded( + child: Slider( + min: minsize, + value: currentSize, + max: maxSize, + divisions: list.length - 1, + secondaryTrackValue: 1, + onChanged: (double val) { + currentSize = double.parse(val.toStringAsFixed(2)); + setState(() {}); + }, + ), + ), + const SizedBox(width: 5), + const Text( + '大', + style: TextStyle(fontSize: 20), + ), + ], + ), + ) + ], + ), + ); + } +} diff --git a/lib/pages/setting/style_setting.dart b/lib/pages/setting/style_setting.dart index 6dfd4031..7b47e5e1 100644 --- a/lib/pages/setting/style_setting.dart +++ b/lib/pages/setting/style_setting.dart @@ -189,6 +189,11 @@ class _StyleSettingState extends State { onTap: () => Get.toNamed('/colorSetting'), title: Text('应用主题', style: titleStyle), ), + ListTile( + dense: false, + onTap: () => Get.toNamed('/fontSizeSetting'), + title: Text('字体大小', style: titleStyle), + ) ], ), ); diff --git a/lib/pages/video/detail/introduction/widgets/intro_detail.dart b/lib/pages/video/detail/introduction/widgets/intro_detail.dart index 7b1029f3..d9846b19 100644 --- a/lib/pages/video/detail/introduction/widgets/intro_detail.dart +++ b/lib/pages/video/detail/introduction/widgets/intro_detail.dart @@ -100,7 +100,7 @@ class IntroDetail extends StatelessWidget { Text.rich( style: const TextStyle( height: 1.4, - fontSize: 13, + // fontSize: 13, ), TextSpan( children: [ diff --git a/lib/router/app_pages.dart b/lib/router/app_pages.dart index f5505b72..74dce755 100644 --- a/lib/router/app_pages.dart +++ b/lib/router/app_pages.dart @@ -18,6 +18,7 @@ import 'package:pilipala/pages/search/index.dart'; import 'package:pilipala/pages/searchResult/index.dart'; import 'package:pilipala/pages/setting/extra_setting.dart'; import 'package:pilipala/pages/setting/pages/color_select.dart'; +import 'package:pilipala/pages/setting/pages/font_size_select.dart'; import 'package:pilipala/pages/setting/play_setting.dart'; import 'package:pilipala/pages/setting/privacy_setting.dart'; import 'package:pilipala/pages/setting/style_setting.dart'; @@ -87,6 +88,7 @@ class Routes { // GetPage(name: '/blackListPage', page: () => const BlackListPage()), GetPage(name: '/colorSetting', page: () => const ColorSelectPage()), + GetPage(name: '/fontSizeSetting', page: () => const FontSizeSelectPage()), // 关于 GetPage(name: '/about', page: () => const AboutPage()), ]; diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart index 2f5c1f6d..39654fab 100644 --- a/lib/utils/storage.dart +++ b/lib/utils/storage.dart @@ -100,7 +100,7 @@ class SettingBoxKey { static const String autoUpdate = 'autoUpdate'; static const String themeMode = 'themeMode'; - static const String defaultFontSize = 'fontSize'; + static const String defaultTextScale = 'textScale'; static const String dynamicColor = 'dynamicColor'; // bool static const String customColor = 'customColor'; // 自定义主题色 }