milo better notifications

milo/MiloRemote.lua

@@ -95,6 +95,9 @@ local page = UI.Page {
       help = displayModes[context.state.displayMode].help,
     },
   },
+  notification = UI.Notification {
+    anchor = 'top',
+  },
   accelerators = {
     r = 'refresh',
     [ 'control-r' ] = 'refresh',
@@ -176,6 +179,7 @@ function page:eventHandler(event)
     Util.merge(self.statusBar.depositToggle, depositMode[context.state.deposit])
     self.statusBar:draw()
     context:setStatus(depositMode[context.state.deposit].help)
+    context:notifyInfo(depositMode[context.state.deposit].help)
     Config.update('miloRemote', context.state)
 
   elseif event.type == 'focus_change' then
@@ -208,7 +212,7 @@ function page:eventHandler(event)
       self:transfer(item, count, 'requesting ' .. count .. ' ...')
     else
       Sound.play('entity.villager.no')
-      context:setStatus('nope ...')
+      context:notify('nope ...')
     end
 
   elseif event.type == 'plugin' then
@@ -236,6 +240,7 @@ function page:eventHandler(event)
     event.button:draw()
     self:applyFilter()
     context:setStatus(event.button.help)
+    context:notifyInfo(event.button.help)
     self.grid:draw()
     Config.update('miloRemote', context.state)
 
@@ -340,10 +345,23 @@ context.page = page
 
 function context:setStatus(status)
   page.menuBar.infoBar.values = status
-  --if page.menuBar.infoBar.enabled then
+  page.menuBar.infoBar:draw()
-    page.menuBar.infoBar:draw()
+  page:sync()
-    page:sync()
+end
-  --end
+
+function context:notifySuccess(status)
+  page.notification:success(status)
+  page:sync()
+end
+
+function context:notifyInfo(status)
+  page.notification:info(status)
+  page:sync()
+end
+
+function context:notifyError(status)
+  page.notification:error(status)
+  page:sync()
 end
 
 local function processMessages(s)
@@ -359,26 +377,26 @@ local function processMessages(s)
         h(response)
       end
       if response.msg then
-        context:setStatus(response.msg)
+        context:notifyInfo(response.msg)
       end
     until not s.connected
 
     s:close()
     s = nil
-    context:setStatus('disconnected ...')
+    context:notifyError('disconnected ...')
     Sound.play('entity.villager.no')
   end)
 end
 
 function context:sendRequest(data, statusMsg)
   if not context.state.server then
-    self:setStatus('Invalid configuration')
+    self:notifyError('Invalid configuration')
     return
   end
 
   local player = getPlayerName()
   if not player then
-    self:setStatus('Missing neural or introspection')
+    self:notifyError('Missing neural or introspection')
     return
   end
 
@@ -387,13 +405,13 @@ function context:sendRequest(data, statusMsg)
     local msg
     for _ = 1, 2 do
       if not context.socket or not context.socket.connected then
-        self:setStatus('connecting ...')
+        self:notifyInfo('connecting ...')
         context.socket, msg = Socket.connect(context.state.server, 4242)
         if context.socket then
           context.socket:write(player)
           local r = context.socket:read(2)
           if r and not r.msg then
-            self:setStatus('connected ...')
+            self:notifySuccess('connected ...')
             processMessages(context.socket)
           else
             msg = r and r.msg or 'Timed out'
@@ -404,10 +422,7 @@ function context:sendRequest(data, statusMsg)
       end
       if context.socket then
         if statusMsg then
-          self:setStatus(statusMsg)
+          self:notifyInfo(statusMsg)
-          Event.onTimeout(2, function()
-            self:setStatus('')
-          end)
         end
         if context.socket:write(data) then
           success = true
@@ -417,7 +432,7 @@ function context:sendRequest(data, statusMsg)
         context.socket = nil
       end
     end
-    self:setStatus(msg or 'Failed to connect')
+    self:notifyError(msg or 'Failed to connect')
   end)
 
   return success
@@ -467,12 +482,12 @@ context.responseHandlers['transfer'] = function(response)
   end
   if response.craft then
     if response.craft > 0 then
-      context:setStatus(response.craft .. ' crafting ...')
+      context:notifyInfo(response.craft .. ' crafting ...')
     elseif response.craft + response.count < response.requested then
       if response.craft + response.count == 0 then
         Sound.play('entity.villager.no')
       end
-      context:setStatus((response.craft + response.count) .. ' available ...')
+      context:notifyInfo((response.craft + response.count) .. ' available ...')
     end
   end
 end

milo/core/listing.lua

@@ -88,7 +88,9 @@ local page = UI.Page {
       help = displayModes[displayMode].help,
     },
   },
-  notification = UI.Notification(),
+  notification = UI.Notification {
+    anchor = 'top',
+  },
   throttle = UI.Throttle {
     textColor = colors.yellow,
     borderColor = colors.gray,
@@ -180,6 +182,18 @@ function page:eject(amount)
         self.grid.values[self.grid.sorted[self.grid.index]] = item
         local request = Milo:craftAndEject(item, amount)
         item.count = request.current - request.count
+
+        if request.craft then
+          if request.craft > 0 then
+            self:notifyInfo(request.craft .. ' crafting ...')
+          elseif request.craft + request.count < request.requested then
+            if request.craft + request.count == 0 then
+              Sound.play('entity.villager.no')
+            end
+            self:notifyInfo((request.craft + request.count) .. ' available ...')
+          end
+        end
+
         if request.count + request.craft > 0 then
           self.grid:draw()
           return true
@@ -271,6 +285,18 @@ function page:eventHandler(event)
   return true
 end
 
+function page:notifySuccess(status)
+  self.notification:success(status)
+end
+
+function page:notifyInfo(status)
+  self.notification:info(status)
+end
+
+function page:notifyError(status)
+  self.notification:error(status)
+end
+
 function page:enable(args)
   local function updateStatus()
     self.statusBar.storageStatus.value =