Various changes and some small features

Author: XorTroll

.github/workflows/main.yml

@@ -41,7 +41,7 @@ jobs:
 
     - name: Build Goldleaf
       run: |
-        python3 arc/arc.py gen_db default+Goldleaf/include/res/res_Account.rc.hpp+Goldleaf/include/res/res_ETicket.rc.hpp+Goldleaf/include/res/res_NS.rc.hpp+Goldleaf/include/res/res_Goldleaf.rc.hpp
+        python3 arc/arc.py gen_db default+Goldleaf/include/res/res_Account.rc.hpp+Goldleaf/include/res/res_ETicket.rc.hpp+Goldleaf/include/res/res_NS.rc.hpp+Goldleaf/include/res/res_NFP.rc.hpp+Goldleaf/include/res/res_Goldleaf.rc.hpp
         python3 arc/arc.py gen_cpp rc GLEAF Goldleaf/include/res/res_Generated.gen.hpp
         make build -j$(nproc)
 

.gitignore

@@ -15,3 +15,4 @@ target/
 .classpath
 .project
 *.gen.hpp
+*.zip

Goldleaf/include/cfg/cfg_Settings.hpp

@@ -24,6 +24,26 @@
 
 namespace cfg {
 
+    enum class MenuStickMoveSpeed : u32 {
+        VerySlow,
+        Slow,
+        Medium,
+        Fast,
+        VeryFast,
+
+        Count
+    };
+
+    inline u32 GetMenuStickMoveSpeedDelayMs(const MenuStickMoveSpeed speed) {
+        switch(speed) {
+            case MenuStickMoveSpeed::VerySlow:  return 300;
+            case MenuStickMoveSpeed::Slow:     return 200;
+            case MenuStickMoveSpeed::Fast:     return 50;
+            case MenuStickMoveSpeed::VeryFast:  return 25;
+            case MenuStickMoveSpeed::Medium: default: return 100;
+        }
+    }
+
     namespace json {
 
         struct GeneralSettings {
@@ -59,12 +79,14 @@ namespace cfg {
             std::optional<UiColorScheme> light_color_scheme;
             std::optional<UiColorScheme> dark_color_scheme;
             std::optional<u32> menu_item_size;
+            std::optional<u32> menu_stick_move_speed;
 
             static inline UiSettings MakeDefault() {
                 return {
                     .light_color_scheme = std::nullopt,
                     .dark_color_scheme = std::nullopt,
-                    .menu_item_size = 100
+                    .menu_item_size = 100,
+                    .menu_stick_move_speed = static_cast<u32>(MenuStickMoveSpeed::Medium)
                 };
             }
         };
@@ -146,7 +168,8 @@ namespace cfg {
 
         inline void ApplyToMenu(pu::ui::elm::Menu::Ref menu) {
             menu->SetScrollbarColor(this->GetColorScheme().scroll_bar);
-            menu->SetMoveWaitTimeMs(100);
+            const auto speed = this->json_settings.ui.value().menu_stick_move_speed.value_or(static_cast<u32>(MenuStickMoveSpeed::Medium));
+            menu->SetMoveWaitTimeMs(GetMenuStickMoveSpeedDelayMs(static_cast<MenuStickMoveSpeed>(speed)));
             menu->SetItemAlphaIncrementSteps(5);
         }
 

Goldleaf/include/hos/hos_Common.hpp

@@ -27,6 +27,7 @@ namespace hos {
     u32 GetBatteryLevel();
     bool IsCharging();
 
+    NfpDate GetCurrentDate();
     std::string GetCurrentTime(const bool use_12h_time);
 
     void LockExit();

Goldleaf/include/nfp/nfp_Amiibo.hpp

@@ -103,7 +103,7 @@ namespace nfp {
     Result Initialize();
     bool IsReady();
     Result Open();
-    Result GetAmiiboData(AmiiboData &out_data);
+    Result GetAmiiboData(AmiiboData &out_data, bool &out_has_register_info);
     std::string ExportAsVirtualAmiibo(const AmiiboData &data);
     void Close();
     void Exit();

Goldleaf/include/res/res_NFP.rc.hpp

@@ -0,0 +1,7 @@
+R_DEFINE_NAMESPACE_RESULT_MODULE(nfp, 115);
+
+namespace nfp {
+
+    R_DEFINE_ERROR_RESULT(InvalidAmiiboSettings, 120);
+
+}

Goldleaf/include/ui/ui_InstallLayout.hpp

@@ -34,7 +34,7 @@ namespace ui {
             InstallLayout();
             PU_SMART_CTOR(InstallLayout)
 
-            void StartInstall(const std::string &path, const std::string &pres_path, fs::Explorer *exp, const NcmStorageId storage_id, const bool omit_confirmation = false);
+            bool StartInstall(const std::string &path, const std::string &pres_path, fs::Explorer *exp, const NcmStorageId storage_id, const bool omit_confirmation = false, const bool skip_if_already_installed = false);
     };
 
 }

Goldleaf/include/ui/ui_OwnSettingsLayout.hpp

@@ -55,6 +55,11 @@ namespace ui {
             void ignore_required_fw_version_DefaultKey();
             void show_deletion_prompt_after_install_DefaultKey();
 
+            // UI
+            pu::ui::elm::MenuItem::Ref menu_stick_move_speed_item;
+
+            void menu_stick_move_speed_DefaultKey();
+
             void OnInput(const u64 keys_down, const u64 keys_up, const u64 keys_held, const pu::ui::TouchPoint touch_pos);
         public:
             OwnSettingsLayout();

Goldleaf/romfs/Strings/de.json

@@ -520,5 +520,14 @@
     "Unmount drive",
     "The selected drive was successfully unmounted. You can now safely remove it.",
     "An error ocurred attempting to unmount the drive.",
-    "Default"
+    "Default",
+    "Menu stick move speed",
+    "Very slow",
+    "Slow",
+    "Normal",
+    "Fast",
+    "Very fast",
+    "Please select a menu stick move speed:",
+    "Would you like to automatically skip already installed NSPs?",
+    "No new NSPs were installed."
 ]

Goldleaf/romfs/Strings/en-US.json

@@ -520,5 +520,14 @@
     "Unmount drive",
     "The selected drive was successfully unmounted. You can now safely remove it.",
     "An error ocurred attempting to unmount the drive.",
-    "Default"
+    "Default",
+    "Menu stick move speed",
+    "Very slow",
+    "Slow",
+    "Normal",
+    "Fast",
+    "Very fast",
+    "Please select a menu stick move speed:",
+    "Would you like to automatically skip already installed NSPs?",
+    "No new NSPs were installed."
 ]