From f24d33eb77fb4df9b38d0363de862d684e9509af Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel@tofvesson.se>
Date: Sat, 26 Oct 2024 19:22:35 +0200
Subject: [PATCH] Implement text on storage progress bar

---
 itemcontroller.lua | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/itemcontroller.lua b/itemcontroller.lua
index 94f9cd0..2ab6f75 100644
--- a/itemcontroller.lua
+++ b/itemcontroller.lua
@@ -20,6 +20,7 @@ local Padding = require("gfx.padding")
 local Container = require("gfx.container")
 local Element = require("gfx.element")
 local Progress = require("gfx.progress")
+local TextProgress = require("gfx.textprogress")
 local Children = require("gfx.prop.children")
 local Orientation = require("gfx.prop.orientation")
 
@@ -234,13 +235,6 @@ local PAGES = {
     end
 
 
-    local storageSatProgress = Progress:new{
-      width = state.width,
-      height = 1
-      -- Percentage of storage slots occupied
-    }
-
-
     ---- BOTTOM BAR
     local keyboardButton = Text:new{
       id = "action_keyboard",
@@ -357,6 +351,7 @@ local PAGES = {
     end
 
 
+    local storageSatProgress = TextProgress:new{}
     local aboveEntries = { storageSatProgress }
     local belowEntries = { bottomBarList }
     local entries = {}
@@ -513,14 +508,17 @@ local PAGES = {
 
       -- Enumerate inventory stats
       local emptyCount = 0
+      local totalCount = 0
       pageState.stacks = ItemGroup.collectStacks(state.controller:find(function(stack)
         if stack:isEmpty() then
           emptyCount = emptyCount + 1
           return false
         else
+          totalCount = totalCount + 1
           return matchFilter(pageState.filter, stack:getSimpleName()) or matchFilter(pageState.filter, stack:getDisplayName()) or (pageState.filter:find(":") ~= nil and matchFilter(pageState.filter, stack:getName()))
         end
       end))
+      totalCount = totalCount + emptyCount
       table.sort(pageState.stacks, SORT_MODE[pageState.sortMode])
 
       local lastPage = #pageState.stacks % groupEntryListBudget
@@ -530,7 +528,17 @@ local PAGES = {
 
       -- Set dynamic states for elements
       sortButton:setText("<"..tostring(pageState.sortMode)..">")
-      storageSatProgress:setProgress(1 - (emptyCount / #pageState.stacks))
+      local totalCountStr = tostring(totalCount)
+      local emptyCountStr = tostring(emptyCount)
+
+      storageSatProgress:setText(
+        emptyCountStr..
+        (" "):rep(math.max(0, math.floor(state.width / 2) - #emptyCountStr - 1))..
+        "/"..
+        (" "):rep(math.max(0, math.ceil(state.width / 2) - #totalCountStr))..
+        totalCountStr
+      )
+      storageSatProgress:setProgress(emptyCount / totalCount)
 
       local basePageIndex = (pageState.currentPage - 1) * groupEntryListBudget
       for i=1,groupEntryListBudget do