(currently non-functional) UPDATE ALL BUTTON!!!!!

This commit is contained in:
HJfod 2024-03-27 12:09:32 +02:00
parent aa032a9d8d
commit bd95800fd2
3 changed files with 101 additions and 16 deletions

View file

@ -10,6 +10,7 @@ $execute {
ColorProvider::get()->define("mod-list-restart-required-label"_spr, ccc3(153, 245, 245)); ColorProvider::get()->define("mod-list-restart-required-label"_spr, ccc3(153, 245, 245));
ColorProvider::get()->define("mod-list-restart-required-label-bg"_spr, ccc3(123, 156, 163)); ColorProvider::get()->define("mod-list-restart-required-label-bg"_spr, ccc3(123, 156, 163));
ColorProvider::get()->define("mod-list-search-bg"_spr, { 83, 65, 109, 255 }); ColorProvider::get()->define("mod-list-search-bg"_spr, { 83, 65, 109, 255 });
ColorProvider::get()->define("mod-list-updates-available-bg"_spr, { 68, 61, 255, 255 });
ColorProvider::get()->define("mod-list-tab-selected-bg"_spr, { 168, 147, 185, 255 }); ColorProvider::get()->define("mod-list-tab-selected-bg"_spr, { 168, 147, 185, 255 });
ColorProvider::get()->define("mod-list-tab-selected-bg-alt"_spr, { 147, 163, 185, 255 }); ColorProvider::get()->define("mod-list-tab-selected-bg-alt"_spr, { 147, 163, 185, 255 });
ColorProvider::get()->define("mod-list-featured-color"_spr, { 255, 255, 120, 255 }); ColorProvider::get()->define("mod-list-featured-color"_spr, { 255, 255, 120, 255 });

View file

@ -2,6 +2,7 @@
#include <Geode/utils/ColorProvider.hpp> #include <Geode/utils/ColorProvider.hpp>
#include "../popups/TagsPopup.hpp" #include "../popups/TagsPopup.hpp"
#include "../GeodeStyle.hpp" #include "../GeodeStyle.hpp"
#include "../ModsLayer.hpp"
bool ModList::init(ModListSource* src, CCSize const& size) { bool ModList::init(ModListSource* src, CCSize const& size) {
if (!CCNode::init()) if (!CCNode::init())
@ -23,10 +24,14 @@ bool ModList::init(ModListSource* src, CCSize const& size) {
); );
this->addChildAtPosition(m_list, Anchor::Bottom, ccp(-m_list->getScaledContentWidth() / 2, 0)); this->addChildAtPosition(m_list, Anchor::Bottom, ccp(-m_list->getScaledContentWidth() / 2, 0));
m_topContainer = CCNode::create();
m_topContainer->ignoreAnchorPointForPosition(false);
m_topContainer->setContentWidth(size.width);
m_topContainer->setAnchorPoint({ .5f, 1.f });
m_searchMenu = CCNode::create(); m_searchMenu = CCNode::create();
m_searchMenu->ignoreAnchorPointForPosition(false); m_searchMenu->ignoreAnchorPointForPosition(false);
m_searchMenu->setContentSize({ size.width, 30 }); m_searchMenu->setContentSize({ size.width, 30 });
m_searchMenu->setAnchorPoint({ .5f, 1.f });
auto searchBG = CCLayerColor::create(ColorProvider::get()->color("mod-list-search-bg"_spr)); auto searchBG = CCLayerColor::create(ColorProvider::get()->color("mod-list-search-bg"_spr));
searchBG->setContentSize(m_searchMenu->getContentSize()); searchBG->setContentSize(m_searchMenu->getContentSize());
@ -87,12 +92,72 @@ bool ModList::init(ModListSource* src, CCSize const& size) {
); );
m_searchMenu->addChildAtPosition(searchFiltersMenu, Anchor::Right, ccp(-10, 0)); m_searchMenu->addChildAtPosition(searchFiltersMenu, Anchor::Right, ccp(-10, 0));
// Do not add search menu; that's handled by onSearch m_topContainer->addChild(m_searchMenu);
// Check for updates on installed mods, and show an update all button if there are some
if (m_source->isInstalledMods()) { if (m_source->isInstalledMods()) {
// todo m_checkUpdatesListener.bind(this, &ModList::onCheckUpdates);
m_checkUpdatesListener.setFilter(ModsLayer::checkInstalledModsForUpdates().listen());
m_updateAllMenu = CCNode::create();
m_updateAllMenu->ignoreAnchorPointForPosition(false);
m_updateAllMenu->setContentSize({ size.width, 30 });
m_updateAllMenu->setVisible(false);
auto updateAllBG = CCLayerColor::create(ColorProvider::get()->color("mod-list-updates-available-bg"_spr));
updateAllBG->setContentSize(m_updateAllMenu->getContentSize());
updateAllBG->ignoreAnchorPointForPosition(false);
m_updateAllMenu->addChildAtPosition(updateAllBG, Anchor::Center);
m_updateCountLabel = TextArea::create("", "bigFont.fnt", .35f, size.width / 2 - 30, ccp(0, 1), 12.f, false);
m_updateAllMenu->addChildAtPosition(m_updateCountLabel, Anchor::Left, ccp(10, 0), ccp(0, 0));
auto updateAllMenu = CCMenu::create();
updateAllMenu->setContentWidth(size.width / 2);
updateAllMenu->setAnchorPoint({ 1, .5f });
auto showUpdatesSpr = createGeodeButton(
CCSprite::createWithSpriteFrameName("GJ_filterIcon_001.png"),
"Show Updates", "GE_button_01.png"_spr
);
auto hideUpdatesSpr = createGeodeButton(
CCSprite::createWithSpriteFrameName("GJ_filterIcon_001.png"),
"Hide Updates", "GE_button_05.png"_spr
);
auto viewUpdatesBtn = CCMenuItemToggler::create(
showUpdatesSpr, hideUpdatesSpr, this, nullptr
);
updateAllMenu->addChild(viewUpdatesBtn);
auto updateAllSpr = createGeodeButton(
CCSprite::createWithSpriteFrameName("update.png"_spr),
"Update All", "GE_button_01.png"_spr
);
auto updateAllBtn = CCMenuItemSpriteExtra::create(
updateAllSpr, this, nullptr
);
updateAllMenu->addChild(updateAllBtn);
updateAllMenu->setLayout(
RowLayout::create()
->setAxisAlignment(AxisAlignment::End)
->setDefaultScaleLimits(.1f, 1.f)
);
m_updateAllMenu->addChildAtPosition(updateAllMenu, Anchor::Right, ccp(-10, 0));
m_topContainer->addChild(m_updateAllMenu);
} }
m_topContainer->setLayout(
ColumnLayout::create()
->setGap(0)
->setAxisReverse(true)
->setAutoGrowAxis(0.f)
);
m_topContainer->getLayout()->ignoreInvisibleChildren(true);
this->addChildAtPosition(m_topContainer, Anchor::Top);
// Paging // Paging
auto pageLeftMenu = CCMenu::create(); auto pageLeftMenu = CCMenu::create();
@ -176,6 +241,7 @@ bool ModList::init(ModListSource* src, CCSize const& size) {
m_listener.bind(this, &ModList::onPromise); m_listener.bind(this, &ModList::onPromise);
this->gotoPage(0); this->gotoPage(0);
this->updateTopContainer();
return true; return true;
} }
@ -254,16 +320,28 @@ void ModList::onShowStatusDetails(CCObject*) {
m_statusContainer->updateLayout(); m_statusContainer->updateLayout();
} }
void ModList::activateSearch(bool activate) { void ModList::onCheckUpdates(PromiseEvent<std::vector<std::string>, server::ServerError>* event) {
// Add the menu or remove it depending on new state if (auto mods = event->getResolve(); mods && mods->size() > 0) {
if (activate) { std::string fmt;
if (!m_searchMenu->getParent()) { if (mods->size() == 1) {
this->addChildAtPosition(m_searchMenu, Anchor::Top); fmt = fmt::format("There is <cg>{}</c> update available!", mods->size());
} }
else {
fmt = fmt::format("There are <cg>{}</c> updates available!", mods->size());
}
m_updateCountLabel->setString(fmt.c_str());
m_updateAllMenu->setVisible(true);
this->updateTopContainer();
} }
else { }
m_searchMenu->removeFromParent();
} void ModList::activateSearch(bool activate) {
m_searchMenu->setVisible(activate);
this->updateTopContainer();
}
void ModList::updateTopContainer() {
m_topContainer->updateLayout();
// Store old relative scroll position (ensuring no divide by zero happens) // Store old relative scroll position (ensuring no divide by zero happens)
auto oldPositionArea = m_list->m_contentLayer->getContentHeight() - m_list->getContentHeight(); auto oldPositionArea = m_list->m_contentLayer->getContentHeight() - m_list->getContentHeight();
@ -271,11 +349,11 @@ void ModList::activateSearch(bool activate) {
m_list->m_contentLayer->getPositionY() / oldPositionArea : m_list->m_contentLayer->getPositionY() / oldPositionArea :
-1.f; -1.f;
// Update list size to account for the search menu // Update list size to account for the top menu
// (giving a little bit of extra padding for it, the same size as gap) // (giving a little bit of extra padding for it, the same size as gap)
m_list->setContentHeight( m_list->setContentHeight(
activate ? m_topContainer->getContentHeight() > 0.f ?
this->getContentHeight() - m_searchMenu->getContentHeight() - this->getContentHeight() - m_topContainer->getContentHeight() -
static_cast<AxisLayout*>(m_list->m_contentLayer->getLayout())->getGap() : static_cast<AxisLayout*>(m_list->m_contentLayer->getLayout())->getGap() :
this->getContentHeight() this->getContentHeight()
); );

View file

@ -30,15 +30,21 @@ protected:
ModListSource::PageLoadEventListener m_listener; ModListSource::PageLoadEventListener m_listener;
CCMenuItemSpriteExtra* m_pagePrevBtn; CCMenuItemSpriteExtra* m_pagePrevBtn;
CCMenuItemSpriteExtra* m_pageNextBtn; CCMenuItemSpriteExtra* m_pageNextBtn;
Ref<CCNode> m_searchMenu; CCNode* m_topContainer;
Ref<CCNode> m_viewUpdatesMenu; CCNode* m_searchMenu;
CCNode* m_updateAllMenu = nullptr;
TextArea* m_updateCountLabel = nullptr;
TextInput* m_searchInput; TextInput* m_searchInput;
EventListener<UpdateModListStateFilter> m_updateStateListener; EventListener<UpdateModListStateFilter> m_updateStateListener;
EventListener<PromiseEventFilter<std::vector<std::string>, server::ServerError>> m_checkUpdatesListener;
bool m_bigSize = false; bool m_bigSize = false;
std::atomic<size_t> m_searchInputThreads = 0; std::atomic<size_t> m_searchInputThreads = 0;
bool init(ModListSource* src, CCSize const& size); bool init(ModListSource* src, CCSize const& size);
void updateTopContainer();
void onCheckUpdates(PromiseEvent<std::vector<std::string>, server::ServerError>* event);
void onPromise(ModListSource::PageLoadEvent* event); void onPromise(ModListSource::PageLoadEvent* event);
void onPage(CCObject*); void onPage(CCObject*);
void onShowStatusDetails(CCObject*); void onShowStatusDetails(CCObject*);