Commit since everything seems like it's working.

This commit is contained in:
J-D-K
2025-06-18 13:40:26 -04:00
parent 5cab0d505b
commit 62c5097d6d
34 changed files with 928 additions and 624 deletions

View File

@@ -13,7 +13,106 @@
#include <switch.h>
#include <vector>
// This sorts the vector alphabetically so stuff is easier to find
// Declarations here. Definitions under class.
static void create_save_data(sys::Task *task,
data::User *targetUser,
data::TitleInfo *titleInfo,
SaveCreateState *spawningState);
// This is the sorting function.
static bool compare_info(data::TitleInfo *infoA, data::TitleInfo *infoB);
SaveCreateState::SaveCreateState(data::User *user, TitleSelectCommon *titleSelect)
: m_user(user), m_titleSelect(titleSelect), m_saveMenu(8, 8, 624, 22, 720)
{
// If the panel is null, create it.
if (!sm_slidePanel)
{
// Create panel and menu.
sm_slidePanel = std::make_unique<ui::SlideOutPanel>(640, ui::SlideOutPanel::Side::Right);
}
// Get title info vector and copy titles to menu.
data::get_title_info_by_type(m_user->get_account_save_type(), m_titleInfoVector);
// Sort it by alpha
std::sort(m_titleInfoVector.begin(), m_titleInfoVector.end(), compare_info);
for (size_t i = 0; i < m_titleInfoVector.size(); i++)
{
m_saveMenu.add_option(m_titleInfoVector.at(i)->get_title());
}
}
void SaveCreateState::update(void)
{
if (m_refreshRequired)
{
// There's no other way to get the save info so...
m_user->load_user_data();
// Refresh the view.
m_titleSelect->refresh();
// No more refresh needed.
m_refreshRequired = false;
}
m_saveMenu.update(AppState::has_focus());
sm_slidePanel->update(AppState::has_focus());
if (input::button_pressed(HidNpadButton_A))
{
data::TitleInfo *targetTitle = m_titleInfoVector.at(m_saveMenu.get_selected());
JKSV::push_state(std::make_shared<TaskState>(create_save_data, m_user, targetTitle, this));
}
else if (input::button_pressed(HidNpadButton_B))
{
sm_slidePanel->close();
}
else if (sm_slidePanel->is_closed())
{
sm_slidePanel->reset();
AppState::deactivate();
}
}
void SaveCreateState::render(void)
{
// Clear slide target, render menu, render slide to frame buffer.
sm_slidePanel->clear_target();
m_saveMenu.render(sm_slidePanel->get_target(), AppState::has_focus());
sm_slidePanel->render(NULL, AppState::has_focus());
}
void SaveCreateState::data_and_view_refresh_required(void)
{
m_refreshRequired = true;
}
static void create_save_data(sys::Task *task,
data::User *targetUser,
data::TitleInfo *titleInfo,
SaveCreateState *spawningState)
{
// Set status. We'll just borrow the string from the other group.
task->set_status(strings::get_by_name(strings::names::USER_OPTION_STATUS, 0), titleInfo->get_title());
if (fs::create_save_data_for(targetUser, titleInfo))
{
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 0),
titleInfo->get_title());
}
else
{
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 1));
}
spawningState->data_and_view_refresh_required();
task->finished();
}
static bool compare_info(data::TitleInfo *infoA, data::TitleInfo *infoB)
{
// Get pointers to both titles.
@@ -47,76 +146,3 @@ static bool compare_info(data::TitleInfo *infoA, data::TitleInfo *infoB)
}
return false;
}
// Declarations here. Definitions under class.
static void create_save_data(sys::Task *task, data::User *targetUser, data::TitleInfo *titleInfo);
SaveCreateState::SaveCreateState(data::User *targetUser, TitleSelectCommon *titleSelect)
: m_user(targetUser), m_titleSelect(titleSelect), m_saveMenu(8, 8, 624, 22, 720)
{
// If the panel is null, create it.
if (!sm_slidePanel)
{
// Create panel and menu.
sm_slidePanel = std::make_unique<ui::SlideOutPanel>(640, ui::SlideOutPanel::Side::Right);
}
// Get title info vector and copy titles to menu.
data::get_title_info_by_type(m_user->get_account_save_type(), m_titleInfoVector);
// Sort it by alpha
std::sort(m_titleInfoVector.begin(), m_titleInfoVector.end(), compare_info);
for (size_t i = 0; i < m_titleInfoVector.size(); i++)
{
m_saveMenu.add_option(m_titleInfoVector.at(i)->get_title());
}
}
void SaveCreateState::update(void)
{
m_saveMenu.update(AppState::has_focus());
sm_slidePanel->update(AppState::has_focus());
if (input::button_pressed(HidNpadButton_A))
{
data::TitleInfo *targetTitle = m_titleInfoVector.at(m_saveMenu.get_selected());
JKSV::push_state(std::make_shared<TaskState>(create_save_data, m_user, targetTitle));
}
else if (input::button_pressed(HidNpadButton_B))
{
sm_slidePanel->close();
}
else if (sm_slidePanel->is_closed())
{
sm_slidePanel->reset();
AppState::deactivate();
}
}
void SaveCreateState::render(void)
{
// Clear slide target, render menu, render slide to frame buffer.
sm_slidePanel->clear_target();
m_saveMenu.render(sm_slidePanel->get_target(), AppState::has_focus());
sm_slidePanel->render(NULL, AppState::has_focus());
}
static void create_save_data(sys::Task *task, data::User *targetUser, data::TitleInfo *titleInfo)
{
// Set status. We'll just borrow the string from the other group.
task->set_status(strings::get_by_name(strings::names::USER_OPTION_STATUS, 0), titleInfo->get_title());
if (fs::create_save_data_for(targetUser, titleInfo))
{
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 0),
titleInfo->get_title());
}
else
{
ui::PopMessageManager::push_message(ui::PopMessageManager::DEFAULT_MESSAGE_TICKS,
strings::get_by_name(strings::names::POP_MESSAGES_SAVE_CREATE, 1));
}
task->finished();
}