From 7351204b9a51d6b9985568bf865bd62c684bbdc2 Mon Sep 17 00:00:00 2001 From: StackZ <47382115+SuperSaiyajinStackZ@users.noreply.github.com> Date: Mon, 23 Dec 2019 21:10:22 +0100 Subject: [PATCH] my latest work. --- assets/gfx/sprites.t3s | 1 + assets/gfx/sprites/arrow.png | Bin 5785 -> 9415 bytes assets/gfx/sprites/download_all.png | Bin 0 -> 723 bytes assets/gfx/sprites/search.png | Bin 456 -> 10438 bytes include/gui.hpp | 2 +- include/screens/scriptBrowse.hpp | 1 + source/gui.cpp | 33 ++++++++++++- source/keyboard.cpp | 2 +- source/screens/scriptBrowse.cpp | 33 ++++++++++--- source/screens/scriptlist.cpp | 32 ++++++------- source/screens/tinyDB.cpp | 70 ++++++++++++++-------------- 11 files changed, 114 insertions(+), 60 deletions(-) create mode 100644 assets/gfx/sprites/download_all.png diff --git a/assets/gfx/sprites.t3s b/assets/gfx/sprites.t3s index 152579a..5115888 100644 --- a/assets/gfx/sprites.t3s +++ b/assets/gfx/sprites.t3s @@ -3,6 +3,7 @@ sprites/arrow.png sprites/bottom_screen_bot.png sprites/bottom_screen_top.png +sprites/download_all.png sprites/top_screen_bot.png sprites/top_screen_top.png sprites/search.png diff --git a/assets/gfx/sprites/arrow.png b/assets/gfx/sprites/arrow.png index e7bbf053c21f03158e9204bc18cd2311e7e4d6d7..fa910f8e00ab35366153ec8b04171c9bb8f790d3 100644 GIT binary patch literal 9415 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 yX2`;DeEsX4T(5}#OIrASZD=mru literal 5785 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 X0EQ|SEDV&%00000NkvXXu0mjf1)M1H diff --git a/assets/gfx/sprites/download_all.png b/assets/gfx/sprites/download_all.png new file mode 100644 index 0000000000000000000000000000000000000000..8592c1e2fbb028f6fd631ab52375f59e2a4ce7ae GIT binary patch literal 723 zcmV;^0xbQBP)P000>X1^@s6#OZ}&0004mX+uL$Nkc;* zaB^>EX>4Tx04R}tkv&MmKpe$iQ%glE4i*$~h)|s@_=PxX6^c+H)C#RSm|Xe=O&XFE z7e~Rh;NZt%)xpJCR|i)?5c~jfadlF3krMxx6k5c3aNLh~_a1le0HIc5n$k~y#OK7LCS8#Dk?V@bZ=CZk3p_Jyrjql-VPY}g!b%IXf~gTt5l2)_r+gvp zvC4UivsS9G#y$B9Ls@-gnd>wM5yv8yAVGwJ3W_MfMwC{a6bnh(kG1g+xPFOT3b~44 z=bb{RHqo16O*}U#gFeSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{0065=L_t(Y$L*BO2}B_bgh$^NU_r02Iqu$4m<6Q+_mqc- z_`@pf!2!WY%ttaPaC9^)RZaOKnQD2yykLptrB;!iURFRv001NbAg%1!=Yfd09blEU002ovPDHLk FV1ls6F{A(h literal 0 HcmV?d00001 diff --git a/assets/gfx/sprites/search.png b/assets/gfx/sprites/search.png index 0b2a2ef6a4541f943c7c4c0eaa78c5091f08b015..6728de6970da3613a2d31ddb82ddaf47b42c5bdb 100644 GIT binary patch literal 10438 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
    +={_3ctAkXnk;;w%#oZ5{mT}jGGY%T{V;`e! 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 literal 456 zcmV;(0XP1MP)?#ptY9v{0W-C z6OfDjhF6QCO^-gLybbMWep ziH5Iui7e-B4}M47AyD)&&?3vZPc92UUoj5d7n26t*L(?ldKmZsuJr7ch6l|3mJeB| zDaOEu9E)5IFtDl^vAdWzpGyG-Qtr1DPHNy;^G1MyP0cSp25vR)1Q^)WeB(n-uVI8; zsk|6@4JSnjYb*&?g7e~pz(NGp)zVU2&%v8YDF&!u2Pies;rDbDuzx<4W>g_-udifn zwhx?PMW(D#(^}uz*Cn7GyW)|4H?Vw;`yd$td%nV>#8VWp6Ws&uu?iRKxuwbxXu7?C$h|h&MSe5(fz|9ox{}f+f=J*1B-G3@Zc3YGH0000 0 ? "_" : "")).c_str(), 400); + Gui::DrawString(180, 217, 0.8, WHITE, (string+(cursorBlink-- > 0 ? "_" : "")).c_str(), 400); if(cursorBlink < -20) cursorBlink = 20; Gui::setDraw(bottom); Gui::Draw_Rect(0, 0, 320, 240, Config::Color3); diff --git a/source/screens/scriptBrowse.cpp b/source/screens/scriptBrowse.cpp index e5b9270..6fd1f30 100644 --- a/source/screens/scriptBrowse.cpp +++ b/source/screens/scriptBrowse.cpp @@ -126,11 +126,11 @@ void ScriptBrowse::Draw(void) const { Gui::DrawStringCentered(0, 217, 0.7f, Config::TxtColor, Lang::get("FUTURE_SCRIPT"), 400); } Gui::DrawBottom(); - Gui::DrawArrow(295, 0); - Gui::DrawArrow(315, 240, 180.0); -// Gui::sprite(sprites_search_idx, -3, 0); -// Gui::DrawString(7.5, 1.5, 0.72f, BLACK, "\uE003"); - + Gui::DrawArrow(295, -3); + Gui::DrawArrow(315, 242, 180.0); +// Gui::spriteBlend(sprites_search_idx, -3, 0, Config::TxtColor); +// Gui::DrawString(7.5, 1.5, 0.72f, Config::TxtColor, "\uE003"); + Gui::spriteBlend(sprites_download_all_idx, 0, 0); Gui::DrawArrow(0, 242, 270.0); Gui::DrawStringCentered(-23, 3, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts); @@ -228,11 +228,11 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) { if (hDown & KEY_TOUCH) { if (Config::viewMode == 0) { for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { + if(touch.py > (i+1)*57 && touch.py < (i+2)*57) { if (infoJson.size() != 0) { std::string fileName = Lang::get("DOWNLOADING") + std::string(infoJson[screenPos + i]["title"]); std::string titleFix = infoJson[screenPos + i]["title"]; - for (int l = 0; i < (int)titleFix.size(); l++) { + for (int l = 0; l < (int)titleFix.size(); l++) { if (titleFix[l] == '/') { titleFix[l] = '-'; } @@ -328,4 +328,23 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) { } } } + + if (hDown & KEY_TOUCH && touching(touch, arrowPos[3])) { + if (infoJson.size() != 0) { + for (int i = 0; i < (int)infoJson.size(); i++) { + int current = i+1; + int total = infoJson.size(); + std::string fileName = Lang::get("DOWNLOADING") + std::string(infoJson[i]["title"]); + std::string titleFix = infoJson[i]["title"]; + for (int l = 0; l < (int)titleFix.size(); l++) { + if (titleFix[l] == '/') { + titleFix[l] = '-'; + } + } + DisplayMsg(fileName + " " + std::to_string(current) + " / " + std::to_string(total)); + downloadToFile(infoJson[i]["url"], Config::ScriptPath + titleFix + ".json"); + infoJson[i]["curRevision"] = infoJson[i]["revision"]; + } + } + } } \ No newline at end of file diff --git a/source/screens/scriptlist.cpp b/source/screens/scriptlist.cpp index 1a88d89..f6931bf 100644 --- a/source/screens/scriptlist.cpp +++ b/source/screens/scriptlist.cpp @@ -284,8 +284,8 @@ void ScriptList::DrawList(void) const { Gui::DrawStringCentered(0, 120, 0.6f, Config::TxtColor, std::string(fileInfo[selection].shortDesc), 400); Gui::DrawBottom(); - Gui::DrawArrow(295, 0); - Gui::DrawArrow(315, 240, 180.0); + Gui::DrawArrow(295, -3); + Gui::DrawArrow(315, 242, 180.0); Gui::DrawArrow(0, 242, 270.0); if (Config::viewMode == 0) { for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { + for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { if (dirContents[screenPos + i].isDirectory) { } else if (fileInfo.size() != 0) { if (ScriptHelper::checkIfValid(dirContents[screenPos + i].name) == true) { @@ -418,11 +418,11 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) { mode = 1; } } - } + } } } else if (Config::viewMode == 1) { - for(int i=0;i (i+1)*27 && touch.py < (i+2)*27) { + for(int i=0;i (i+1)*27 && touch.py < (i+2)*27) { if (dirContents[screenPosList + i].isDirectory) { } else if (fileInfo.size() != 0) { if (ScriptHelper::checkIfValid(dirContents[screenPosList + i].name) == true) { @@ -439,7 +439,7 @@ void ScriptList::ListSelection(u32 hDown, u32 hHeld, touchPosition touch) { mode = 1; } } - } + } } } } @@ -538,22 +538,22 @@ void ScriptList::SelectFunction(u32 hDown, u32 hHeld, touchPosition touch) { if (hDown & KEY_TOUCH) { if (Config::viewMode == 0) { - for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { + for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { if (fileInfo2.size() != 0) { choice = fileInfo2[screenPos2 + i]; runFunctions(jsonFile); } - } + } } } else if (Config::viewMode == 1) { - for(int i=0;i (i+1)*27 && touch.py < (i+2)*27) { + for(int i=0;i (i+1)*27 && touch.py < (i+2)*27) { if (fileInfo2.size() != 0) { choice = fileInfo2[screenPosList2 + i]; runFunctions(jsonFile); } - } + } } } } diff --git a/source/screens/tinyDB.cpp b/source/screens/tinyDB.cpp index b4de89a..51d08ee 100644 --- a/source/screens/tinyDB.cpp +++ b/source/screens/tinyDB.cpp @@ -73,14 +73,14 @@ std::vector tinyDBList; TinyDB::TinyDB() { DisplayMsg(Lang::get("TINYDB_DOWNLOADING")); downloadToFile("https://tinydb.eiphax.tech/api/universal-updater.json?raw=true", tinyDBFile); - tinyDBList = parseObjects(); + tinyDBList = parseObjects(); selectedOption = tinyDBList[0]; } // To-Do. void TinyDB::Draw(void) const { - std::string info; - Gui::setDraw(top); + std::string info; + Gui::setDraw(top); Gui::Draw_Rect(0, 0, 400, 25, C2D_Color32(63, 81, 181, 255)); Gui::Draw_Rect(0, 25, 400, 190, C2D_Color32(140, 140, 140, 255)); Gui::Draw_Rect(0, 215, 400, 25, C2D_Color32(63, 81, 181, 255)); @@ -93,40 +93,42 @@ void TinyDB::Draw(void) const { Gui::DrawStringCentered(0, 125, 0.6f, Config::TxtColor, Lang::get("RELEASE_ID") + std::string(tinyDBJson[selectedOption]["info"]["releaseId"]), 400); Gui::DrawStringCentered(0, 155, 0.6f, Config::TxtColor, Lang::get("TITLE_ID") + std::string(tinyDBJson[selectedOption]["info"]["titleid"]), 400); Gui::DrawStringCentered(0, 185, 0.6f, Config::TxtColor, Lang::get("FILE_SIZE") + formatBytes(int64_t(tinyDBJson[selectedOption]["info"]["fileSize"])), 400); - Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "TinyDB", 400); - std::string entryAmount = std::to_string(selection+1) + " / " + std::to_string(tinyDBList.size()); - Gui::DrawString(397-Gui::GetStringWidth(0.6f, entryAmount), 237-Gui::GetStringHeight(0.6f, entryAmount), 0.6f, Config::TxtColor, entryAmount); + Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "TinyDB", 400); + std::string entryAmount = std::to_string(selection+1) + " / " + std::to_string(tinyDBList.size()); + Gui::DrawString(397-Gui::GetStringWidth(0.6f, entryAmount), 237-Gui::GetStringHeight(0.6f, entryAmount), 0.6f, Config::TxtColor, entryAmount); - Gui::setDraw(bottom); + Gui::setDraw(bottom); Gui::Draw_Rect(0, 0, 320, 25, C2D_Color32(63, 81, 181, 255)); Gui::Draw_Rect(0, 25, 320, 190, C2D_Color32(140, 140, 140, 255)); Gui::Draw_Rect(0, 215, 320, 25, C2D_Color32(63, 81, 181, 255)); Gui::sprite(sprites_bottom_screen_top_idx, 0, 0); Gui::sprite(sprites_bottom_screen_bot_idx, 0, 215); - Gui::DrawArrow(295, 0); - Gui::DrawArrow(315, 240, 180.0); + Gui::DrawArrow(295, -3); + Gui::DrawArrow(315, 242, 180.0); Gui::DrawArrow(0, 242, 270.0); - // Search Icon. + // Search Icon. // Gui::sprite(sprites_search_idx, -3, 0); // Gui::DrawString(7.5, 1.5, 0.72f, BLACK, "\uE003"); - if (Config::viewMode == 0) { - for(int i=0;i (i+1)*57 && touch.py < (i+2)*57) { + if(touch.py > (i+1)*57 && touch.py < (i+2)*57) { selection = screenPos + i; selectedOption = tinyDBList[screenPos + i]; execute(); - } + } } } else if (Config::viewMode == 1) { for(int i=0;i (i+1)*27 && touch.py < (i+2)*27) { + if(touch.py > (i+1)*27 && touch.py < (i+2)*27) { selection = screenPosList + i; selectedOption = tinyDBList[screenPosList + i]; execute(); - } + } } } } - if (hDown & KEY_A) { - execute(); - } + if (hDown & KEY_A) { + execute(); + } } void TinyDB::execute() {