diff --git a/lib/models/live/live_area_list/area_list.dart b/lib/models/live/live_area_list/area_list.dart index 30b25a01..0db539f8 100644 --- a/lib/models/live/live_area_list/area_list.dart +++ b/lib/models/live/live_area_list/area_list.dart @@ -1,4 +1,4 @@ -import 'area_item.dart'; +import 'package:PiliPlus/models/live/live_area_list/area_item.dart'; class AreaList { int? id; diff --git a/lib/models/live/live_feed_index/card_data.dart b/lib/models/live/live_feed_index/card_data.dart index 4c01af74..1d259fc8 100644 --- a/lib/models/live/live_feed_index/card_data.dart +++ b/lib/models/live/live_feed_index/card_data.dart @@ -1,7 +1,6 @@ +import 'package:PiliPlus/models/live/live_feed_index/card_data_item.dart'; import 'package:PiliPlus/models/live/live_feed_index/card_data_list_item.dart'; -import 'card_data_item.dart'; - class CardData { CardDataItem? bannerV2; CardDataItem? myIdolV1; diff --git a/lib/models/live/live_feed_index/card_data_item.dart b/lib/models/live/live_feed_index/card_data_item.dart index 3c586894..7e60764b 100644 --- a/lib/models/live/live_feed_index/card_data_item.dart +++ b/lib/models/live/live_feed_index/card_data_item.dart @@ -1,6 +1,5 @@ import 'package:PiliPlus/models/live/live_feed_index/card_data_list_item.dart'; - -import 'module_info.dart'; +import 'package:PiliPlus/models/live/live_feed_index/module_info.dart'; class CardDataItem { ModuleInfo? moduleInfo; diff --git a/lib/models/live/live_feed_index/card_data_list_item.dart b/lib/models/live/live_feed_index/card_data_list_item.dart index 7c63ce56..d6a0e1e8 100644 --- a/lib/models/live/live_feed_index/card_data_list_item.dart +++ b/lib/models/live/live_feed_index/card_data_list_item.dart @@ -1,4 +1,4 @@ -import 'watched_show.dart'; +import 'package:PiliPlus/models/live/live_feed_index/watched_show.dart'; class CardLiveItem { int? roomid; diff --git a/lib/models/live/live_feed_index/card_list.dart b/lib/models/live/live_feed_index/card_list.dart index 1774a7e9..538d0f10 100644 --- a/lib/models/live/live_feed_index/card_list.dart +++ b/lib/models/live/live_feed_index/card_list.dart @@ -1,4 +1,4 @@ -import 'card_data.dart'; +import 'package:PiliPlus/models/live/live_feed_index/card_data.dart'; class LiveCardList { String? cardType; diff --git a/lib/models/live/live_feed_index/data.dart b/lib/models/live/live_feed_index/data.dart index 67899368..b7390897 100644 --- a/lib/models/live/live_feed_index/data.dart +++ b/lib/models/live/live_feed_index/data.dart @@ -1,4 +1,4 @@ -import 'card_list.dart'; +import 'package:PiliPlus/models/live/live_feed_index/card_list.dart'; class LiveIndexData { List? cardList; diff --git a/lib/models/live/live_feed_index/live_feed_index.dart b/lib/models/live/live_feed_index/live_feed_index.dart index 7c5c8bb9..32679058 100644 --- a/lib/models/live/live_feed_index/live_feed_index.dart +++ b/lib/models/live/live_feed_index/live_feed_index.dart @@ -1,4 +1,4 @@ -import 'data.dart'; +import 'package:PiliPlus/models/live/live_feed_index/data.dart'; class LiveFeedIndex { int? code; diff --git a/lib/models/live/live_follow/data.dart b/lib/models/live/live_follow/data.dart index 678384f8..a7073b96 100644 --- a/lib/models/live/live_follow/data.dart +++ b/lib/models/live/live_follow/data.dart @@ -1,4 +1,4 @@ -import 'item.dart'; +import 'package:PiliPlus/models/live/live_follow/item.dart'; class LiveFollowData { String? title; diff --git a/lib/models/live/live_search/data.dart b/lib/models/live/live_search/data.dart index 117a78fc..48a1d3e6 100644 --- a/lib/models/live/live_search/data.dart +++ b/lib/models/live/live_search/data.dart @@ -1,5 +1,5 @@ -import 'room.dart'; -import 'user.dart'; +import 'package:PiliPlus/models/live/live_search/room.dart'; +import 'package:PiliPlus/models/live/live_search/user.dart'; class LiveSearchData { String? type; diff --git a/lib/models/live/live_search/live_search.dart b/lib/models/live/live_search/live_search.dart index 748d258b..02e4fa14 100644 --- a/lib/models/live/live_search/live_search.dart +++ b/lib/models/live/live_search/live_search.dart @@ -1,4 +1,4 @@ -import 'data.dart'; +import 'package:PiliPlus/models/live/live_search/data.dart'; class LiveSearch { int? code; diff --git a/lib/models/live/live_search/room.dart b/lib/models/live/live_search/room.dart index e52a0984..bc41218a 100644 --- a/lib/models/live/live_search/room.dart +++ b/lib/models/live/live_search/room.dart @@ -1,4 +1,4 @@ -import 'room_item.dart'; +import 'package:PiliPlus/models/live/live_search/room_item.dart'; class Room { List? list; diff --git a/lib/models/live/live_search/room_item.dart b/lib/models/live/live_search/room_item.dart index 0db21603..d38e8e33 100644 --- a/lib/models/live/live_search/room_item.dart +++ b/lib/models/live/live_search/room_item.dart @@ -1,4 +1,4 @@ -import 'watched_show.dart'; +import 'package:PiliPlus/models/live/live_search/watched_show.dart'; class LiveSearchRoomItemModel { int? roomid; diff --git a/lib/pages/whisper/widgets/item.dart b/lib/pages/whisper/widgets/item.dart index d23caa42..6fa4cd19 100644 --- a/lib/pages/whisper/widgets/item.dart +++ b/lib/pages/whisper/widgets/item.dart @@ -134,6 +134,7 @@ class WhisperSessionItem extends StatelessWidget { PBadge( isStack: false, type: PBadgeType.line_secondary, + size: PBadgeSize.small, fontSize: 10, isBold: false, text: item.sessionInfo.userLabel.style.borderedLabel.text,