Leahnaya/JKSV
1
0
Fork 0
mirror of https://github.com/J-D-K/JKSV.git synced 2026-03-21 17:24:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

UI Tweaks.

Browse Source
This commit is contained in:
J-D-K 2025-09-25 18:56:06 -04:00
parent 2b079fb49f
commit fa7e5fac6d
7 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -39,7 +39,7 @@ INCLUDES := include ./Libraries/FsLib/Switch/FsLib/include ./Libraries/SDLLib/SD
EXEFS_SRC := exefs_src
APP_TITLE := JKSV
APP_AUTHOR := JK
APP_VERSION := 09.21.2025
APP_VERSION := 09.25.2025
ROMFS := romfs
ICON := icon.jpg

40
include/appstates/ConfirmState.hpp
View File

@ -46,6 +46,7 @@ class ConfirmState final : public BaseState
, m_yesText(strings::get_by_name(strings::names::YES_NO_OK, 0))
, m_noText(strings::get_by_name(strings::names::YES_NO_OK, 1))
, m_holdRequired(holdRequired)
, m_transition(280, 720, 280, 262, 4)
, m_function(function)
, m_taskData(taskData)
{
@ -83,13 +84,16 @@ class ConfirmState final : public BaseState
sys::Task::TaskData taskData)
{
auto newState = ConfirmState::create(query, holdRequired, function, taskData);
FadeState::create_and_push(colors::DIM_BACKGROUND, 0x00, 0x88, newState);
FadeState::create_and_push(colors::DIM_BACKGROUND, colors::ALPHA_FADE_BEGIN, colors::ALPHA_FADE_END, newState);
return newState;
}
/// @brief Just updates the ConfirmState.
void update() override
{
m_transition.update();
if (!m_transition.in_place()) { return; }
const bool aPressed = input::button_pressed(HidNpadButton_A);
const bool bPressed = input::button_pressed(HidNpadButton_B);
const bool aHeld = input::button_held(HidNpadButton_A);
@ -111,17 +115,19 @@ class ConfirmState final : public BaseState
void render() override
{
const bool hasFocus = BaseState::has_focus();
const int y = m_transition.get_y();
sm_dialog->set_y(y);
sdl::render_rect_fill(sdl::Texture::Null, 0, 0, 1280, 720, colors::DIM_BACKGROUND);
sm_dialog->render(sdl::Texture::Null, hasFocus);
sdl::text::render(sdl::Texture::Null, 312, 288, 20, 656, colors::WHITE, m_query);
sdl::text::render(sdl::Texture::Null, 312, y + 32, 20, 656, colors::WHITE, m_query);
sdl::render_line(sdl::Texture::Null, 280, 454, 999, 454, colors::DIV_COLOR);
sdl::render_line(sdl::Texture::Null, 640, 454, 640, 517, colors::DIV_COLOR);
sdl::render_line(sdl::Texture::Null, 280, y + 192, 999, y + 192, colors::DIV_COLOR);
sdl::render_line(sdl::Texture::Null, 640, y + 192, 640, y + 255, colors::DIV_COLOR);
sdl::text::render(sdl::Texture::Null, m_yesX, 476, 22, sdl::text::NO_WRAP, colors::WHITE, m_yesText);
sdl::text::render(sdl::Texture::Null, m_noX, 476, 22, sdl::text::NO_WRAP, colors::WHITE, m_noText);
sdl::text::render(sdl::Texture::Null, m_yesX, y + 214, 22, sdl::text::NO_WRAP, colors::WHITE, m_yesText);
sdl::text::render(sdl::Texture::Null, m_noX, y + 214, 22, sdl::text::NO_WRAP, colors::WHITE, m_noText);
}
private:
@ -146,9 +152,15 @@ class ConfirmState final : public BaseState
/// @brief Keep track of the ticks/time needed to confirm.
uint64_t m_startingTickCount{};
/// @brief Keeps track of which
/// @brief Keeps track of which stage the confirmation is in.
int m_stage{};
/// @brief To make the dialog pop in from bottom to be more inline with the rest of the UI.
ui::Transition m_transition{};
// Controls whether or not to close or hide the dialog.
bool m_close{};
/// @brief Function to execute if action is confirmed.
const sys::threadpool::JobFunction m_function{};
@ -161,7 +173,8 @@ class ConfirmState final : public BaseState
{
if (sm_dialog) { return; }
sm_dialog = ui::DialogBox::create(280, 262, 720, 256);
// sm_dialog = ui::DialogBox::create(280, 262, 720, 256);
sm_dialog = ui::DialogBox::create(280, 720, 720, 256);
}
// This just centers the Yes or holding text.
@ -187,7 +200,6 @@ class ConfirmState final : public BaseState
void confirmed()
{
// auto newState = std::make_shared<StateType>(m_function, m_taskData);
auto newState = StateType::create_and_push(m_function, m_taskData);
BaseState::deactivate();
}
@ -218,7 +230,7 @@ class ConfirmState final : public BaseState
void cancelled()
{
FadeState::create_and_push(colors::DIM_BACKGROUND, 0x88, 0x00, nullptr);
FadeState::create_and_push(colors::DIM_BACKGROUND, colors::ALPHA_FADE_END, colors::ALPHA_FADE_BEGIN, nullptr);
BaseState::deactivate();
}
@ -227,7 +239,13 @@ class ConfirmState final : public BaseState
m_yesText = m_holdText[index];
ConfirmState::center_yes();
}
void close_dialog()
{
m_close = true;
m_transition.set_target_y(720);
}
};
using ConfirmTask = ConfirmState<sys::Task, TaskState>;
using ConfirmProgress = ConfirmState<sys::ProgressTask, ProgressState>;
using ConfirmProgress = ConfirmState<sys::ProgressTask, ProgressState>;

17
include/appstates/MessageState.hpp
View File

@ -4,6 +4,7 @@
#include "appstates/FadeState.hpp"
#include "graphics/colors.hpp"
#include "ui/DialogBox.hpp"
#include "ui/Transition.hpp"
#include <memory>
#include <string>
@ -30,10 +31,11 @@ class MessageState final : public BaseState
}
/// @brief Same as above, but creates and pushes a transition fade in between.
static inline std::shared_ptr<MessageState> create_and_push_fade(std::string_view message)
static inline std::shared_ptr<MessageState> create_push_fade(std::string_view message)
{
auto newState = MessageState::create(message);
auto fadeState = FadeState::create_and_push(colors::DIM_BACKGROUND, 0x00, 0x88, newState);
auto newState = MessageState::create(message);
auto fadeState =
FadeState::create_and_push(colors::DIM_BACKGROUND, colors::ALPHA_FADE_BEGIN, colors::ALPHA_FADE_END, newState);
return newState;
}
@ -50,6 +52,12 @@ class MessageState final : public BaseState
/// @brief Prevents the state from auto triggering from a previous frame.
bool m_triggerGuard{};
/// @brief Transition.
ui::Transition m_transition{};
/// @brief Bool to signal to close.
bool m_close{};
/// @brief This is the OK string.
static inline const char *sm_okText{};
@ -62,6 +70,9 @@ class MessageState final : public BaseState
/// @brief Allocates and ensures ^
void initialize_static_members();
/// @brief Closes and "hides" the dialog.
void close_dialog();
/// @brief Pushes and empty fade in and marks the stage for purging.
void deactivate_state();
};

4
include/graphics/colors.hpp
View File

@ -16,7 +16,7 @@ namespace colors
inline constexpr sdl::Color CLEAR_PANEL = {0x0D0D0DFF};
inline constexpr sdl::Color DIALOG_DARK = {0x505050FF};
inline constexpr sdl::Color DIALOG_LIGHT = {0xDCDCDCFF};
inline constexpr sdl::Color DIM_BACKGROUND = {0x00000088};
inline constexpr sdl::Color DIM_BACKGROUND = {0x00061180};
inline constexpr sdl::Color TRANSPARENT = {0x00000000};
inline constexpr sdl::Color SLIDE_PANEL_CLEAR = {0x000000CC};
inline constexpr sdl::Color DIV_COLOR = {0x707070FF};
@ -24,5 +24,5 @@ namespace colors
inline constexpr sdl::Color BAR_GREEN = {0x11CC33FF};
inline constexpr uint8_t ALPHA_FADE_BEGIN = 0x00;
inline constexpr uint8_t ALPHA_FADE_END = 0x88;
inline constexpr uint8_t ALPHA_FADE_END = 0x80;
} // namespace colors

2
source/JKSV.cpp
View File

@ -32,7 +32,7 @@ namespace
/// @brief Build month.
constexpr uint8_t BUILD_MON = 9;
/// @brief Build day.
constexpr uint8_t BUILD_DAY = 21;
constexpr uint8_t BUILD_DAY = 25;
/// @brief Year.
constexpr uint16_t BUILD_YEAR = 2025;

21
source/appstates/MessageState.cpp
View File

@ -8,29 +8,36 @@
MessageState::MessageState(std::string_view message)
: m_message(message)
, m_transition(280, 720, 280, 262, 4)
{
MessageState::initialize_static_members();
}
void MessageState::update()
{
m_transition.update();
if (!m_transition.in_place()) { return; }
// To do: I only use this in one place right now. I'm not sure this guards correctly here?
const bool aPressed = input::button_pressed(HidNpadButton_A);
m_triggerGuard = m_triggerGuard || (aPressed && !m_triggerGuard);
const bool finished = m_triggerGuard && aPressed;
if (finished) { MessageState::deactivate_state(); }
if (finished) { MessageState::close_dialog(); }
else if (m_close && m_transition.in_place()) { MessageState::deactivate_state(); }
}
void MessageState::render()
{
const bool hasFocus = BaseState::has_focus();
const int y = m_transition.get_y();
sm_dialog->set_y(y);
sdl::render_rect_fill(sdl::Texture::Null, 0, 0, 1280, 720, colors::DIM_BACKGROUND);
sm_dialog->render(sdl::Texture::Null, hasFocus);
sdl::text::render(sdl::Texture::Null, 312, 288, 20, 656, colors::WHITE, m_message);
sdl::render_line(sdl::Texture::Null, 280, 454, 999, 454, colors::DIV_COLOR);
sdl::text::render(sdl::Texture::Null, sm_okX, 476, 22, sdl::text::NO_WRAP, colors::WHITE, sm_okText);
sdl::text::render(sdl::Texture::Null, 312, y + 32, 20, 656, colors::WHITE, m_message);
sdl::render_line(sdl::Texture::Null, 280, y + 192, 999, y + 192, colors::DIV_COLOR);
sdl::text::render(sdl::Texture::Null, sm_okX, y + 214, 22, sdl::text::NO_WRAP, colors::WHITE, sm_okText);
}
void MessageState::initialize_static_members()
@ -43,6 +50,12 @@ void MessageState::initialize_static_members()
sm_dialog = ui::DialogBox::create(280, 262, 720, 256);
}
void MessageState::close_dialog()
{
m_close = true;
m_transition.set_target_y(720);
}
void MessageState::deactivate_state()
{
FadeState::create_and_push(colors::DIM_BACKGROUND, colors::ALPHA_FADE_END, colors::ALPHA_FADE_BEGIN, nullptr);

2
source/appstates/SettingsState.cpp
View File

@ -232,7 +232,7 @@ void SettingsState::create_push_description_message()
const int selected = m_settingsMenu->get_selected();
const char *description = strings::get_by_name(strings::names::SETTINGS_DESCRIPTIONS, selected);
MessageState::create_and_push_fade(description);
MessageState::create_push_fade(description);
}
void SettingsState::cycle_zip_level()