merge design

lib/common/widgets/video_card_v.dart

@@ -287,23 +287,18 @@ class VideoStat extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
+    return RichText(
-      children: [
+      maxLines: 1,
-        Text(
+      text: TextSpan(
-          '${videoItem.stat.view}观看',
+        style: TextStyle(
-          style: TextStyle(
+          fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+          color: Theme.of(context).colorScheme.outline,
-            color: Theme.of(context).colorScheme.outline,
-          ),
         ),
-        Text(
+        children: [
-          ' • ${videoItem.stat.danmu}弹幕',
+          TextSpan(text: '${videoItem.stat.view}观看'),
-          style: TextStyle(
+          TextSpan(text: ' • ${videoItem.stat.danmu}弹幕'),
-            fontSize: Theme.of(context).textTheme.labelSmall!.fontSize,
+        ],
-            color: Theme.of(context).colorScheme.outline,
+      ),
-          ),
-        ),
-      ],
     );
   }
 }

lib/pages/live/controller.dart

@@ -20,7 +20,7 @@ class LiveController extends GetxController {
   void onInit() {
     super.onInit();
     crossAxisCount.value =
-        setting.get(SettingBoxKey.enableSingleRow, defaultValue: false) ? 1 : 2;
+        setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
 
   // 获取推荐

lib/pages/live/widgets/live_item.dart

@@ -120,15 +120,18 @@ class LiveContent extends StatelessWidget {
             if (crossAxisCount == 1) const SizedBox(height: 4),
             Row(
               children: [
-                Text(
+                Expanded(
-                  liveItem.uname,
+                  child: Text(
-                  textAlign: TextAlign.start,
+                    liveItem.uname,
-                  style: TextStyle(
+                    textAlign: TextAlign.start,
-                    fontSize: Theme.of(context).textTheme.labelMedium!.fontSize,
+                    style: TextStyle(
-                    color: Theme.of(context).colorScheme.outline,
+                      fontSize:
+                          Theme.of(context).textTheme.labelMedium!.fontSize,
+                      color: Theme.of(context).colorScheme.outline,
+                    ),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
                   ),
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
                 ),
                 if (crossAxisCount == 1) ...[
                   Text(
@@ -169,7 +172,7 @@ class VideoStat extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       height: 50,
-      padding: const EdgeInsets.only(top: 22, left: 10, right: 10),
+      padding: const EdgeInsets.only(top: 26, left: 10, right: 10),
       decoration: const BoxDecoration(
         gradient: LinearGradient(
           begin: Alignment.topCenter,
@@ -181,18 +184,17 @@ class VideoStat extends StatelessWidget {
           tileMode: TileMode.mirror,
         ),
       ),
-      child: Row(
+      child: RichText(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        maxLines: 1,
-        children: [
+        textAlign: TextAlign.justify,
-          Text(
+        softWrap: false,
-            liveItem!.areaName!,
+        text: TextSpan(
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          style: const TextStyle(fontSize: 11, color: Colors.white),
-          ),
+          children: [
-          Text(
+            TextSpan(text: liveItem!.areaName!),
-            liveItem!.watchedShow!['text_small'],
+            TextSpan(text: liveItem!.watchedShow!['text_small']),
-            style: const TextStyle(fontSize: 11, color: Colors.white),
+          ],
-          ),
+        ),
-        ],
       ),
     );
   }

lib/pages/rcmd/controller.dart

@@ -20,7 +20,7 @@ class RcmdController extends GetxController {
   void onInit() {
     super.onInit();
     crossAxisCount.value =
-        setting.get(SettingBoxKey.enableSingleRow, defaultValue: false) ? 1 : 2;
+        setting.get(SettingBoxKey.customRows, defaultValue: 2);
     if (recVideo.get('cacheList') != null &&
         recVideo.get('cacheList').isNotEmpty) {
       List<RecVideoItemAppModel> list = [];

lib/pages/setting/style_setting.dart

@@ -22,12 +22,14 @@ class _StyleSettingState extends State<StyleSetting> {
   Box setting = GStrorage.setting;
   late int picQuality;
   late ThemeType _tempThemeValue;
+  late dynamic defaultCustomRows;
 
   @override
   void initState() {
     super.initState();
     picQuality = setting.get(SettingBoxKey.defaultPicQa, defaultValue: 10);
     _tempThemeValue = settingController.themeType.value;
+    defaultCustomRows = setting.get(SettingBoxKey.customRows, defaultValue: 2);
   }
 
   @override
@@ -76,12 +78,37 @@ class _StyleSettingState extends State<StyleSetting> {
             setKey: SettingBoxKey.iosTransition,
             defaultVal: false,
           ),
-          SetSwitchItem(
+          // SetSwitchItem(
-            title: '首页单列',
+          //   title: '首页单列',
-            subTitle: '每行展示一个内容卡片',
+          //   subTitle: '每行展示一个内容卡片',
-            setKey: SettingBoxKey.enableSingleRow,
+          //   setKey: SettingBoxKey.enableSingleRow,
-            defaultVal: false,
+          //   defaultVal: false,
-            callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
+          //   callFn: (val) => {SmartDialog.showToast('下次启动时生效')},
+          // ),
+          ListTile(
+            dense: false,
+            title: Text('自定义列数', style: titleStyle),
+            subtitle: Text(
+              '当前列数',
+              style: subTitleStyle,
+            ),
+            trailing: PopupMenuButton(
+              initialValue: defaultCustomRows,
+              icon: const Icon(Icons.more_vert_outlined, size: 22),
+              onSelected: (item) {
+                defaultCustomRows = item;
+                setting.put(SettingBoxKey.customRows, item);
+                setState(() {});
+              },
+              itemBuilder: (BuildContext context) => <PopupMenuEntry>[
+                for (var i in [1, 2, 3, 4, 5]) ...[
+                  PopupMenuItem(
+                    value: i,
+                    child: Text(i.toString()),
+                  ),
+                ]
+              ],
+            ),
           ),
           ListTile(
             dense: false,

lib/utils/storage.dart

@@ -133,6 +133,7 @@ class SettingBoxKey {
   static const String iosTransition = 'iosTransition'; // ios路由
   static const String enableSingleRow = 'enableSingleRow'; // 首页单列
   static const String displayMode = 'displayMode';
+  static const String customRows = 'customRows'; // 自定义列
 }
 
 class LocalCacheKey {