diff --git a/lib/common/constants.dart b/lib/common/constants.dart index dda54361..0607206c 100644 --- a/lib/common/constants.dart +++ b/lib/common/constants.dart @@ -15,5 +15,4 @@ class Constants { // 59b43e04ad6965f34319062b478f83dd TV端 static const String appSec = '59b43e04ad6965f34319062b478f83dd'; static const String thirdSign = '04224646d1fea004e79606d3b038c84a'; - static const List publicFavFolder = [0, 2, 22]; } diff --git a/lib/pages/fav/widgets/item.dart b/lib/pages/fav/widgets/item.dart index 412b498f..5269d579 100644 --- a/lib/pages/fav/widgets/item.dart +++ b/lib/pages/fav/widgets/item.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/network_img_layer.dart'; +import 'package:pilipala/utils/logic_utils.dart'; import 'package:pilipala/utils/utils.dart'; class FavItem extends StatelessWidget { @@ -96,9 +97,7 @@ class VideoContent extends StatelessWidget { ), const Spacer(), Text( - Constants.publicFavFolder.contains(favFolderItem.attr) - ? '公开' - : '私密', + LogicUtils.isPublic(favFolderItem.attr) ? '公开' : '私密', textAlign: TextAlign.start, style: TextStyle( fontSize: Theme.of(context).textTheme.labelMedium!.fontSize, diff --git a/lib/pages/video/detail/introduction/widgets/fav_panel.dart b/lib/pages/video/detail/introduction/widgets/fav_panel.dart index fa043cb6..acccf862 100644 --- a/lib/pages/video/detail/introduction/widgets/fav_panel.dart +++ b/lib/pages/video/detail/introduction/widgets/fav_panel.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; -import 'package:pilipala/common/constants.dart'; import 'package:pilipala/common/widgets/http_error.dart'; import 'package:pilipala/utils/feed_back.dart'; +import 'package:pilipala/utils/logic_utils.dart'; import 'package:pilipala/utils/storage.dart'; class FavPanel extends StatefulWidget { @@ -67,14 +67,13 @@ class _FavPanelState extends State { onTap: () => widget.ctr!.onChoose(item.favState != 1, index), dense: true, - leading: Icon( - Constants.publicFavFolder.contains(item.attr) - ? Icons.folder_outlined - : Icons.lock_outline), + leading: Icon(LogicUtils.isPublic(item.attr) + ? Icons.folder_outlined + : Icons.lock_outline), minLeadingWidth: 0, title: Text(item.title!), subtitle: Text( - '${item.mediaCount}个内容 - ${Constants.publicFavFolder.contains(item.attr) ? '公开' : '私密'}', + '${item.mediaCount}个内容 - ${LogicUtils.isPublic(item.attr) ? '公开' : '私密'}', ), trailing: Transform.scale( scale: 0.9, diff --git a/lib/utils/logic_utils.dart b/lib/utils/logic_utils.dart new file mode 100644 index 00000000..3994c222 --- /dev/null +++ b/lib/utils/logic_utils.dart @@ -0,0 +1,6 @@ +class LogicUtils { + // 收藏夹是否公开 + static bool isPublic(int attr) { + return (attr & 1) == 0; + } +}