Refactoring header files to reduce build time (#269)

* Reduce the use of borealis.hpp and mpv_core.hpp

* Change code column limit to 120

.clang-format

@@ -1,6 +1,7 @@
 ---
 AlignConsecutiveAssignments: true
 BasedOnStyle: Google
+ColumnLimit: 120
 AccessModifierOffset: -4
 IndentWidth: 4
 BreakBeforeBraces: Attach

README.md

@@ -312,12 +312,7 @@ sudo dkp-pacman -U \
     $base_url/switch-ffmpeg-6.1-4-any.pkg.tar.zst \
     $base_url/switch-libmpv-0.36.0-1-any.pkg.tar.zst
 
-# 4. 可选：安装依赖库 nspmini：https://github.com/StarDustCFW/nspmini
-# (1). 在resources 目录下放置：nsp_forwarder.nsp (如何生成nsp见: scripts/switch-forwarder)
-# (2). cmake 构建参数添加 -DBUILTIN_NSP=ON
-# 按上述配置后，从相册打开wiliwili时会增加一个安装NSP Forwarder的按钮
-
-# 5. build
+# 4. build
 cmake -B cmake-build-switch -DPLATFORM_SWITCH=ON
 make -C cmake-build-switch wiliwili.nro -j$(nproc)
 ```

wiliwili/include/activity/dlna_activity.hpp

@@ -7,8 +7,7 @@
 #include <borealis/core/activity.hpp>
 #include <libpdr.h>
 
-#include "view/mpv_core.hpp"
-
+#include "utils/event_helper.hpp"
 
 class VideoView;
 class DLNAActivity : public brls::Activity {

wiliwili/include/activity/gallery_activity.hpp

@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
 
 class GalleryView;
 class GalleryActivity : public brls::Activity {

wiliwili/include/activity/hint_activity.hpp

@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include "borealis.hpp"
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
 
 class GalleryView;
 

wiliwili/include/activity/live_player_activity.hpp

@@ -3,10 +3,12 @@
 //
 
 #pragma once
-#include "view/mpv_core.hpp"
-#include "presenter/live_data.hpp"
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
+
+#include "utils/event_helper.hpp"
+#include "presenter/live_data.hpp"
 
 class VideoView;
 
@@ -15,8 +17,7 @@ class LiveActivity : public brls::Activity, public LiveDataRequest {
     // Declare that the content of this activity is the given XML file
     CONTENT_FROM_XML_RES("activity/video_activity.xml");
 
-    explicit LiveActivity(int roomid, const std::string& name = "",
-                          const std::string& views = "");
+    explicit LiveActivity(int roomid, const std::string& name = "", const std::string& views = "");
 
     void setCommonData();
 
@@ -28,12 +29,10 @@ class LiveActivity : public brls::Activity, public LiveDataRequest {
 
     void onError(const std::string& error) override;
 
-    void onNeedPay(const std::string& msg, const std::string& link,
-                   const std::string& startTime,
+    void onNeedPay(const std::string& msg, const std::string& link, const std::string& startTime,
                    const std::string& endTime) override;
 
-    void onDanmakuInfo(int roomid,
-                       const bilibili::LiveDanmakuinfo& info) override;
+    void onDanmakuInfo(int roomid, const bilibili::LiveDanmakuinfo& info) override;
 
     std::vector<std::string> getQualityDescriptionList();
     int getCurrentQualityIndex();
@@ -55,5 +54,5 @@ class LiveActivity : public brls::Activity, public LiveDataRequest {
     //更新timeLabel
     MPVEvent::Subscription tl_event_id;
     //视频清晰度
-    MPVCustomEvent::Subscription event_id;
+    CustomEvent::Subscription event_id;
 };

wiliwili/include/activity/main_activity.hpp

@@ -16,7 +16,8 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
 
 class CustomButton;
 class AutoTabFrame;

wiliwili/include/activity/pgc_index_activity.hpp

@@ -5,7 +5,9 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
+
 #include "presenter/pgc_index.hpp"
 
 typedef brls::Event<UserRequestData> IndexChangeEvent;

wiliwili/include/activity/player_activity.hpp

@@ -5,13 +5,12 @@
 #pragma once
 
 #include <chrono>
-#include <borealis.hpp>
 #include "presenter/video_detail.hpp"
 
 #include "view/video_comment.hpp"
 #include "view/recycling_grid.hpp"
 #include "view/auto_tab_frame.hpp"
-#include "view/mpv_core.hpp"
+#include "utils/event_helper.hpp"
 
 class VideoView;
 class UserInfoView;
@@ -38,14 +37,12 @@ class BasePlayerActivity : public brls::Activity, public VideoDetail {
     void onContentAvailable() override;
 
     void onVideoPlayUrl(const bilibili::VideoUrlResult& result) override;
-    void onCommentInfo(
-        const bilibili::VideoCommentResultWrapper& result) override;
+    void onCommentInfo(const bilibili::VideoCommentResultWrapper& result) override;
     void onError(const std::string& error) override;
     void onRequestCommentError(const std::string& error) override;
     void onVideoOnlineCount(const bilibili::VideoOnlineTotal& count) override;
     void onVideoRelationInfo(const bilibili::VideoRelation& result) override;
-    void onHighlightProgress(
-        const bilibili::VideoHighlightProgress& result) override;
+    void onHighlightProgress(const bilibili::VideoHighlightProgress& result) override;
 
     // 初始化设置 播放界面通用内容
     void setCommonData();
@@ -135,7 +132,7 @@ class BasePlayerActivity : public brls::Activity, public VideoDetail {
 
     // 监控mpv事件
     MPVEvent::Subscription eventSubscribeID;
-    MPVCustomEvent::Subscription customEventSubscribeID;
+    CustomEvent::Subscription customEventSubscribeID;
 
     // 在软件自动切换分集时，传递当前跳转的索引值给列表用于更新ui
     ChangeIndexEvent changeIndexEvent;
@@ -147,8 +144,7 @@ class BasePlayerActivity : public brls::Activity, public VideoDetail {
 
 class PlayerActivity : public BasePlayerActivity {
 public:
-    PlayerActivity(const std::string& bvid, unsigned int cid = 0,
-                   int progress = -1);
+    PlayerActivity(const std::string& bvid, unsigned int cid = 0, int progress = -1);
 
     void setProgress(int p) override;
     int getProgress() override;
@@ -159,13 +155,10 @@ class PlayerActivity : public BasePlayerActivity {
 
     void onVideoInfo(const bilibili::VideoDetailResult& result) override;
     void onUpInfo(const bilibili::UserDetailResultWrapper& result) override;
-    void onVideoPageListInfo(
-        const bilibili::VideoDetailPageListResult& result) override;
+    void onVideoPageListInfo(const bilibili::VideoDetailPageListResult& result) override;
     void onUGCSeasonInfo(const bilibili::UGCSeason& result) override;
-    void onUploadedVideos(
-        const bilibili::UserUploadedVideoResultWrapper& result) override;
-    void onRelatedVideoList(
-        const bilibili::VideoDetailListResult& result) override;
+    void onUploadedVideos(const bilibili::UserUploadedVideoResultWrapper& result) override;
+    void onRelatedVideoList(const bilibili::VideoDetailListResult& result) override;
     void onRedirectToEp(const std::string& url) override;
     void onCastPlayUrl(const bilibili::VideoUrlResult& result) override;
     size_t getAid() override;
@@ -181,9 +174,7 @@ class PlayerActivity : public BasePlayerActivity {
 
 class PlayerSeasonActivity : public BasePlayerActivity {
 public:
-    PlayerSeasonActivity(const unsigned int id,
-                         PGC_ID_TYPE type = PGC_ID_TYPE::SEASON_ID,
-                         int progress     = -1);
+    PlayerSeasonActivity(const unsigned int id, PGC_ID_TYPE type = PGC_ID_TYPE::SEASON_ID, int progress = -1);
 
     ~PlayerSeasonActivity() override;
 
@@ -195,18 +186,15 @@ class PlayerSeasonActivity : public BasePlayerActivity {
 
     void onContentAvailable() override;
 
-    void onSeasonVideoInfo(
-        const bilibili::SeasonResultWrapper& result) override;
+    void onSeasonVideoInfo(const bilibili::SeasonResultWrapper& result) override;
 
     void onSeasonSeriesInfo(const bilibili::SeasonSeries& result) override;
 
-    void onSeasonRecommend(
-        const bilibili::SeasonRecommendWrapper& result) override;
+    void onSeasonRecommend(const bilibili::SeasonRecommendWrapper& result) override;
 
     void onSeasonStatus(const bilibili::SeasonStatusResult& result) override;
 
-    void onSeasonEpisodeInfo(
-        const bilibili::SeasonEpisodeResult& result) override;
+    void onSeasonEpisodeInfo(const bilibili::SeasonEpisodeResult& result) override;
 
     void onIndexChange(size_t index) override;
 

wiliwili/include/activity/search_activity.hpp

@@ -4,8 +4,13 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
 
+namespace brls {
+class Label;
+class Box;
+}  // namespace brls
 class SearchTab;
 
 typedef brls::Event<std::string> UpdateSearchEvent;

wiliwili/include/activity/search_activity_tv.hpp

@@ -4,9 +4,14 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
+
 #include "presenter/presenter.h"
 
+namespace brls {
+class Label;
+}
 class RecyclingGrid;
 class SearchHots;
 class SearchHistory;

wiliwili/include/activity/setting_activity.hpp

@@ -4,7 +4,15 @@
 
 #pragma once
 
-#include <borealis.hpp>
+#include <borealis/core/activity.hpp>
+#include <borealis/core/bind.hpp>
+
+namespace brls {
+class RadioCell;
+class BooleanCell;
+class InputCell;
+class Label;
+}  // namespace brls
 
 class TextBox;
 class SelectorCell;
@@ -22,8 +30,7 @@ class SettingActivity : public brls::Activity {
 
 private:
     BRLS_BIND(brls::RadioCell, btnTutorialOpenApp, "tools/tutorial_open");
-    BRLS_BIND(brls::RadioCell, btnTutorialOpenVideoIntro,
-              "tools/tutorial_video_intro");
+    BRLS_BIND(brls::RadioCell, btnTutorialOpenVideoIntro, "tools/tutorial_video_intro");
     BRLS_BIND(brls::RadioCell, btnTutorialWiki, "tools/tutorial_wiki");
     BRLS_BIND(brls::RadioCell, btnTutorialError, "tools/tutorial_error");
     BRLS_BIND(brls::RadioCell, btnTutorialFont, "tools/tutorial_font");