Add queue system with background downloading and much more (#73)
* Do not build here until it is merged. * WIP: Queue System. Right now crashes randomly for whatever reason.. * Animate queue spinner more slowly * Use LightLocks to prevent crashing in the queue (I hope it's fixed at least) * Build nightlies in queue-system * Use version.h for version and specify 7 digits * Remove unneeded $(CURDIR) I put that these for testing, but it's not needed * Multiple Changes, see desc for more. 1.) Theme Implementation. 2.) Show Battery + Time. 3.) Some more work on Queue-System (might still be broke). 4.) Update Copyright to 2021. 5.) Add `%FIRM%` to regex. 6.) Mass Add to Queue. 7.) Search with AND / OR filter. * Gaaah, not again... * Remove DoNothing, some LightLock changes, etc aka Further improvements to overall system stability and other minor adjustments have been made to enhance the user experience. * See desc for more. - Current Queue Entry can now be canceled. - Fix installed list. - Display Download Speed. - BYE BYE Queue LightLock! * Various adjustments to the queue menu - Make cancel button slightly smaller - Right align "Steps: ..." text - Remove "Current Operation:" text - Change KB/MB/GB to KiB/MiB/GiB - Lots of little positioning tweaks - Fix bug where you could get stuck in the prompt - Make spinny thing have a ! when action is needed - Make extracting file increment at the start instead of the end - Delete dumb VS Code file and gitignore it * Change to hollow full charge plugged in icon * Fix the settings positions a bit * Fix custom font download not having prompt Also tweak the text positions, I forgot to change them Co-authored-by: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com>
This commit is contained in:
Pk11
GitHub
parent
e52bd33905
commit
60e29ddb90
92 changed files with 2566 additions and 1189 deletions
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* This file is part of Universal-Updater
|
||||
* Copyright (C) 2019-2020 Universal-Team
|
||||
* Copyright (C) 2019-2021 Universal-Team
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -26,23 +26,49 @@
|
|||
|
||||
#include "common.hpp"
|
||||
#include "gfx.hpp"
|
||||
#include "stringutils.hpp"
|
||||
#include <ctime>
|
||||
|
||||
/*
|
||||
Draw the base top screen.
|
||||
*/
|
||||
int GFX::SelectedTheme = 0;
|
||||
|
||||
/* All available Themes here inside that vector. */
|
||||
std::vector<UITheme> GFX::Themes = {
|
||||
/* Default Theme. */
|
||||
{
|
||||
C2D_Color32(50, 73, 98, 255), // Bar.
|
||||
C2D_Color32(38, 44, 77, 255), // BG.
|
||||
C2D_Color32(25, 30, 53, 255), // Bar Outline.
|
||||
WHITE, // Text.
|
||||
C2D_Color32(50, 73, 98, 255), // Entry bar.
|
||||
C2D_Color32(25, 30, 53, 255), // Entry Outline.
|
||||
C2D_Color32(28, 33, 58, 255), // Box Inside.
|
||||
C2D_Color32(108, 130, 155, 255), // Box Outside.
|
||||
BLACK, // Box Unselected.
|
||||
C2D_Color32(28, 33, 58, 255), // Progressbar Out.
|
||||
C2D_Color32(77, 101, 128, 255), // Progressbar In.
|
||||
C2D_Color32(51, 75, 102, 255), // Searchbar.
|
||||
C2D_Color32(25, 30, 53, 255), // Searchbar Outline.
|
||||
C2D_Color32(108, 130, 155, 255), // Sidebar Selected.
|
||||
C2D_Color32(77, 101, 128, 255), // Sidebar Unselected.
|
||||
C2D_Color32(77, 101, 128, 255), // Mark Selected.
|
||||
C2D_Color32(28, 33, 58, 255), // Mark Unselected.
|
||||
C2D_Color32(28, 33, 58, 255), // Downlist Preview (Top).
|
||||
C2D_Color32(173, 204, 239, 255) // SideBar Icon Color.
|
||||
}
|
||||
};
|
||||
|
||||
/* Draw the base top screen. */
|
||||
void GFX::DrawTop(void) {
|
||||
Gui::ScreenDraw(Top);
|
||||
Gui::Draw_Rect(0, 0, 400, 25, BAR_COLOR);
|
||||
Gui::Draw_Rect(0, 26, 400, 214, BG_COLOR);
|
||||
Gui::Draw_Rect(0, 25, 400, 1, BAR_OUTL_COLOR);
|
||||
Gui::Draw_Rect(0, 0, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
||||
Gui::Draw_Rect(0, 26, 400, 214, GFX::Themes[GFX::SelectedTheme].BGColor);
|
||||
Gui::Draw_Rect(0, 25, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
||||
}
|
||||
|
||||
/*
|
||||
Draw the base bottom screen.
|
||||
*/
|
||||
/* Draw the base bottom screen. */
|
||||
void GFX::DrawBottom() {
|
||||
Gui::ScreenDraw(Bottom);
|
||||
Gui::Draw_Rect(0, 0, 320, 240, BG_COLOR);
|
||||
Gui::Draw_Rect(0, 0, 320, 240, GFX::Themes[GFX::SelectedTheme].BGColor);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -56,15 +82,15 @@ void GFX::DrawBottom() {
|
|||
uint32_t clr: (Optional) The color of the inside of the box.
|
||||
*/
|
||||
void GFX::DrawBox(float xPos, float yPos, float width, float height, bool selected, uint32_t clr) {
|
||||
Gui::Draw_Rect(xPos, yPos, width, height, BOX_INSIDE_COLOR); // Draw middle BG.
|
||||
Gui::Draw_Rect(xPos, yPos, width, height, GFX::Themes[GFX::SelectedTheme].BoxInside); // Draw middle BG.
|
||||
|
||||
if (selected) {
|
||||
static constexpr int depth = 2;
|
||||
|
||||
Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, BOX_SELECTED_COLOR); // Top.
|
||||
Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, BOX_SELECTED_COLOR); // Left.
|
||||
Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, BOX_SELECTED_COLOR); // Right.
|
||||
Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, BOX_SELECTED_COLOR); // Bottom.
|
||||
Gui::Draw_Rect(xPos - depth, yPos - depth, width + depth * 2, depth, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Top.
|
||||
Gui::Draw_Rect(xPos - depth, yPos - depth, depth, height + depth * 2, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Left.
|
||||
Gui::Draw_Rect(xPos + width, yPos - depth, depth, height + depth * 2, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Right.
|
||||
Gui::Draw_Rect(xPos - depth, yPos + height, width + depth * 2, depth, GFX::Themes[GFX::SelectedTheme].BoxSelected); // Bottom.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -103,4 +129,71 @@ void GFX::DrawCheckbox(float xPos, float yPos, bool selected) {
|
|||
*/
|
||||
void GFX::DrawToggle(float xPos, float yPos, bool toggled) {
|
||||
GFX::DrawSprite((toggled ? sprites_toggle_on_idx : sprites_toggle_off_idx), xPos, yPos);
|
||||
}
|
||||
|
||||
void GFX::DrawTime() {
|
||||
time_t unixTime = time(nullptr);
|
||||
struct tm *timeStruct = gmtime((const time_t *)&unixTime);
|
||||
const std::string str = StringUtils::format("%02i:%02i", timeStruct->tm_hour, timeStruct->tm_min); // <Hour>:<Minute>.
|
||||
|
||||
Gui::DrawString(11, 5, 0.5f, GFX::Themes[GFX::SelectedTheme].TextColor, str, 0, 0, font);
|
||||
}
|
||||
|
||||
static int blinkDelay = 40;
|
||||
static bool blinkState = true, batteryLow = false;
|
||||
void GFX::DrawBattery() {
|
||||
u8 chargeState = false, level = 0;
|
||||
PTMU_GetBatteryChargeState(&chargeState); // Get Charge state.
|
||||
PTMU_GetBatteryLevel(&level); // Get Battery Level.
|
||||
|
||||
if (chargeState) {
|
||||
GFX::DrawSprite((level < 5 ? sprites_battery_charge_idx : sprites_battery_charge_full_idx), 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're charging.
|
||||
|
||||
} else {
|
||||
switch(level) {
|
||||
case 0: // Blinky.
|
||||
GFX::DrawSprite((blinkState ? sprites_battery_blink_idx : sprites_battery_0_idx), 366, 1);
|
||||
if (!batteryLow) batteryLow = true;
|
||||
break;
|
||||
|
||||
case 1: // Red.
|
||||
GFX::DrawSprite(sprites_battery_0_idx, 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're not low.
|
||||
break;
|
||||
|
||||
case 2: // One.
|
||||
GFX::DrawSprite(sprites_battery_1_idx, 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're not low.
|
||||
break;
|
||||
|
||||
case 3: // Two.
|
||||
GFX::DrawSprite(sprites_battery_2_idx, 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're not low.
|
||||
break;
|
||||
|
||||
case 4: // Three.
|
||||
GFX::DrawSprite(sprites_battery_3_idx, 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're not low.
|
||||
break;
|
||||
|
||||
case 5: // Full.
|
||||
GFX::DrawSprite(sprites_battery_4_idx, 366, 1);
|
||||
if (batteryLow) batteryLow = false; // Cause we're not low.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void GFX::HandleBattery() {
|
||||
if (batteryLow) {
|
||||
if (blinkDelay > 0) {
|
||||
blinkDelay--;
|
||||
|
||||
if (blinkDelay == 0) {
|
||||
blinkState = !blinkState;
|
||||
blinkDelay = 40;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/*
|
||||
* This file is part of Universal-Updater
|
||||
* Copyright (C) 2019-2020 Universal-Team
|
||||
* Copyright (C) 2019-2021 Universal-Team
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -39,7 +39,7 @@ void Msg::DisplayMsg(const std::string &Text) {
|
|||
C2D_TargetClear(Bottom, TRANSPARENT);
|
||||
|
||||
GFX::DrawTop();
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, TEXT_COLOR, Text, 395, 0, font);
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, Text)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Text, 395, 0, font);
|
||||
GFX::DrawBottom();
|
||||
C3D_FrameEnd(0);
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@ void Msg::DisplayWarnMsg(const std::string &Text) {
|
|||
C2D_TargetClear(Bottom, TRANSPARENT);
|
||||
|
||||
GFX::DrawTop();
|
||||
Gui::DrawStringCentered(0, 1, 0.6f, TEXT_COLOR, Text, 390, 0, font);
|
||||
Gui::DrawStringCentered(0, 1, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Text, 390, 0, font);
|
||||
|
||||
GFX::DrawBottom();
|
||||
C3D_FrameEnd(0);
|
||||
|
|
@ -78,11 +78,11 @@ bool Msg::promptMsg(const std::string &promptMsg) {
|
|||
C2D_TargetClear(Bottom, TRANSPARENT);
|
||||
|
||||
GFX::DrawTop();
|
||||
Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR);
|
||||
Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR);
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, TEXT_COLOR, promptMsg, 395, 0, font);
|
||||
Gui::Draw_Rect(0, 215, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
||||
Gui::Draw_Rect(0, 214, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, promptMsg)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, promptMsg, 395, 0, font);
|
||||
|
||||
Gui::DrawStringCentered(0, 218, 0.6f, TEXT_COLOR, Lang::get("CONFIRM_OR_CANCEL"), 390, 0, font);
|
||||
Gui::DrawStringCentered(0, 218, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("CONFIRM_OR_CANCEL"), 390, 0, font);
|
||||
GFX::DrawBottom();
|
||||
C3D_FrameEnd(0);
|
||||
|
||||
|
|
@ -110,10 +110,10 @@ void Msg::waitMsg(const std::string &msg) {
|
|||
C2D_TargetClear(Bottom, TRANSPARENT);
|
||||
|
||||
GFX::DrawTop();
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, TEXT_COLOR, msg, 395, 0, font);
|
||||
Gui::Draw_Rect(0, 215, 400, 25, BAR_COLOR);
|
||||
Gui::Draw_Rect(0, 214, 400, 1, BAR_OUTL_COLOR);
|
||||
Gui::DrawStringCentered(0, 218, 0.6f, TEXT_COLOR, Lang::get("KEY_CONTINUE"), 390, 0, font);
|
||||
Gui::DrawStringCentered(0, (240 - Gui::GetStringHeight(0.6f, msg)) / 2, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, msg, 395, 0, font);
|
||||
Gui::Draw_Rect(0, 215, 400, 25, GFX::Themes[GFX::SelectedTheme].BarColor);
|
||||
Gui::Draw_Rect(0, 214, 400, 1, GFX::Themes[GFX::SelectedTheme].BarOutline);
|
||||
Gui::DrawStringCentered(0, 218, 0.6f, GFX::Themes[GFX::SelectedTheme].TextColor, Lang::get("KEY_CONTINUE"), 390, 0, font);
|
||||
GFX::DrawBottom();
|
||||
C3D_FrameEnd(0);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue