Mirror/TinWoo
1
0
Fork 0
mirror of https://github.com/hax4dazy/TinWoo.git synced 2025-02-09 19:25:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

theme download progress bar added

Browse Source
This commit is contained in:
mrdude2478 2023-09-24 04:57:15 +01:00
parent 0b580f31f2
commit c6b1583a51
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/ThemeInstPage.hpp
View File

@ -10,6 +10,8 @@ namespace inst::ui {
PU_SMART_CTOR(ThemeInstPage)
void startNetwork();
void onInput(u64 Down, u64 Up, u64 Held, pu::ui::TouchPoint touch_pos);
static void setInstBarPerc(double ourPercent);
pu::ui::elm::ProgressBar::Ref installBar;
TextBlock::Ref pageInfoText;
private:
std::vector<std::string> ourUrls;

24
source/ui/ThemeInstPage.cpp
View File

@ -9,6 +9,7 @@
#include "util/lang.hpp"
#include "ThemeInstall.hpp"
#include "util/unzip.hpp"
#include "ui/instPage.hpp"
#include <sstream>
#include <cstring>
@ -62,6 +63,10 @@ namespace inst::ui {
this->Add(this->pageInfoText);
this->Add(this->menu);
this->Add(this->infoImage);
this->installBar = pu::ui::elm::ProgressBar::New(10, 675, 1260, 35, 100.0f);
this->installBar->SetBackgroundColor(COLOR("#000000FF"));
this->installBar->SetProgressColor(COLOR("#00FF00FF"));
this->Add(this->installBar);
}
void ThemeInstPage::drawMenuItems_withext(bool clearItems) {
@ -84,6 +89,8 @@ namespace inst::ui {
}
this->menu->AddItem(ourEntry);
this->menu->SetSelectedIndex(myindex); //jump to the index we saved from above
mainApp->ThemeinstPage->installBar->SetProgress(0);
mainApp->ThemeinstPage->installBar->SetVisible(false);
}
}
@ -115,6 +122,12 @@ namespace inst::ui {
}
}
void ThemeInstPage::setInstBarPerc(double ourPercent) {
mainApp->ThemeinstPage->installBar->SetVisible(true);
mainApp->ThemeinstPage->installBar->SetProgress(ourPercent);
mainApp->CallForRender();
}
void ThemeInstPage::startNetwork() {
this->butText->SetText("inst.net.please_wait"_lang);
this->menu->SetVisible(false);
@ -122,6 +135,7 @@ namespace inst::ui {
this->infoImage->SetVisible(true);
mainApp->LoadLayout(mainApp->ThemeinstPage);
this->ourUrls = ThemeInstStuff::OnSelected();
mainApp->ThemeinstPage->installBar->SetVisible(false);
if (!this->ourUrls.size()) {
mainApp->LoadLayout(mainApp->optionspage);
@ -147,6 +161,7 @@ namespace inst::ui {
if (installing != 1) {
for (long unsigned int i = 0; i < this->selectedUrls.size(); i++) {
inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Downloading theme, Please wait!");
inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0);
ourPath = inst::config::appDir + "/temp_download.zip";
installing = 1;
bool didDownload = inst::curl::downloadFile(selectedUrls[0], ourPath.c_str(), 0, true);
@ -163,14 +178,17 @@ namespace inst::ui {
else {
inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Downloading failed - try again?");
installing = 0;
inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0);
mainApp->ThemeinstPage->installBar->SetVisible(false);
inst::ui::mainApp->CreateShowDialog("inst.net.theme_error"_lang, "inst.net.theme_error_info"_lang, { "common.ok"_lang }, true, "romfs:/images/icons/fail.png");
return;
}
std::filesystem::remove(ourPath);
if (didExtract) {
inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Theme Extracted, restart Tinwoo to see the changes");
installing = 0;
int close = inst::ui::mainApp->CreateShowDialog("Theme installed", "Restart Tinwoo to see the changes", { "sig.later"_lang, "sig.restart"_lang }, false, "romfs:/images/icons/good.png");
inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0);
mainApp->ThemeinstPage->installBar->SetVisible(false);
if (close != 0) {
mainApp->FadeOut();
mainApp->Close();
@ -179,11 +197,15 @@ namespace inst::ui {
else {
inst::ui::mainApp->ThemeinstPage->pageInfoText->SetText("Theme Extracted failed, try again?");
installing = 0;
inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0);
mainApp->ThemeinstPage->installBar->SetVisible(false);
inst::ui::mainApp->CreateShowDialog("Extraction failed", "Ooops", { "common.ok"_lang }, true, "romfs:/images/icons/fail.png");
return;
}
installing = 0;
inst::ui::mainApp->ThemeinstPage->setInstBarPerc(0);
mainApp->ThemeinstPage->installBar->SetVisible(false);
return;
}
}

4
source/util/curl.cpp
View File

@ -8,6 +8,8 @@
#include "util/config.hpp"
#include "util/error.hpp"
#include "ui/instPage.hpp"
//
#include "ui/ThemeinstPage.hpp"
static size_t writeDataFile(void* ptr, size_t size, size_t nmemb, void* stream) {
size_t written = fwrite(ptr, size, nmemb, (FILE*)stream);
@ -25,10 +27,12 @@ int progress_callback(void* clientp, curl_off_t dltotal, curl_off_t dlnow, curl_
if (ultotal) {
int uploadProgress = (int)(((double)ulnow / (double)ultotal) * 100.0);
inst::ui::instPage::setInstBarPerc(uploadProgress);
inst::ui::ThemeInstPage::setInstBarPerc(uploadProgress);
}
else if (dltotal) {
int downloadProgress = (int)(((double)dlnow / (double)dltotal) * 100.0);
inst::ui::instPage::setInstBarPerc(downloadProgress);
inst::ui::ThemeInstPage::setInstBarPerc(downloadProgress);
}
return 0;
}