make comma separated counts more consistent in chest history

Cvolton · Dec 8, 2024 · 2ca0f5a · 2ca0f5a
1 parent f1df55e
commit 2ca0f5a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/hooks/LevelInfoLayer.cpp b/src/hooks/LevelInfoLayer.cpp
@@ -87,16 +87,6 @@ class BI_DLL $modify(LevelInfoLayer) {
                 this->release();
             });
         }).detach();
-
-        /**
-         * Update download and like labels
-        */
-        /*m_downloadsLabel->setString(fmt::format(std::locale("en_US.UTF-8"), "{:L}", m_level->m_downloads).c_str());
-        m_likesLabel->setString(fmt::format(std::locale("en_US.UTF-8"), "{:L}", m_level->m_likes).c_str());
-        m_downloadsLabel->limitLabelWidth(60.f, .5f, 0.f);
-        m_likesLabel->limitLabelWidth(60.f, .5f, 0.f);
-
-        log::info("m_songIDs: {}", m_level->m_songIDs);*/
     }
 
     void onViewProfile(CCObject* sender) {

diff --git a/src/layers/RewardHistory/RewardCategoryCell.cpp b/src/layers/RewardHistory/RewardCategoryCell.cpp
@@ -51,7 +51,7 @@ void RewardCategoryCell::loadFromData(CCObject* object) {
         lastSprite->setAnchorPoint({0, 0.5f});
         this->m_mainLayer->addChild(lastSprite);
 
-        lastText = CCLabelBMFont::create(fmt::format(std::locale("en_US.UTF-8"), "{:L}", count).c_str(), "bigFont.fnt");
+        lastText = CCLabelBMFont::create(BetterInfo::numberComma(count).c_str(), "bigFont.fnt");
         lastText->setAnchorPoint({ 0.0f, 0.5f });
         lastText->setPosition({lastSprite->getPositionX() + ((lastSprite->getContentSize().width) * lastSprite->getScaleX()) + 5, rowY});
         lastText->setScale(.325f);

diff --git a/src/layers/RewardHistory/RewardCell.cpp b/src/layers/RewardHistory/RewardCell.cpp
@@ -152,7 +152,7 @@ void RewardCell::loadFromData(CCObject* object) {
         //lastSprite->setAnchorPoint({0, 0.5f});
         menu->addChild(lastSprite);
 
-        lastText = CCLabelBMFont::create(CCString::createWithFormat("%i", rewardObj->m_total)->getCString(), "bigFont.fnt");
+        lastText = CCLabelBMFont::create(BetterInfo::numberComma(rewardObj->m_total).c_str(), "bigFont.fnt");
         lastText->setAnchorPoint({ 0.f, 0.5f });
         lastText->setPosition({lastSprite->getPositionX() + (lastSprite->getScaledContentWidth() / 2) + 5, 0});
         lastText->setScale(.325f);

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -1004,6 +1004,10 @@ long long BetterInfo::strtol(std::string_view str) {
     return result;
 }
 
+std::string BetterInfo::numberComma(int number) {
+    return fmt::format(std::locale("en_US.UTF-8"), "{:L}", number);
+}
+
 static std::vector<Ref<Notification>> s_notifications;
 void BetterInfo::showUnimportantNotification(const std::string& content, NotificationIcon icon, float time) {
     if(GJBaseGameLayer::get()) return;

diff --git a/src/utils.hpp b/src/utils.hpp
@@ -94,6 +94,7 @@ namespace BetterInfo {
     BI_DLL int stoi(std::string_view str);
     BI_DLL float stof(std::string_view str);
     BI_DLL long long strtol(std::string_view str);
+    BI_DLL std::string numberComma(int number);
 
     BI_DLL void showUnimportantNotification(const std::string& content, NotificationIcon icon, float time = 5.f);
     BI_DLL void cancelUnimportantNotifications();