Compare commits

...

5 Commits

Author SHA1 Message Date
Jay 98ea58ce13 colour fixes 2020-04-24 23:19:34 +01:00
Jay f372771de9 Debounce fix feed 2020-04-24 22:56:54 +01:00
Jay e2ea779051 Hide develop tab on iPhone 2020-04-24 22:52:45 +01:00
Jay 0f6af4a587 Splash screen 2020-04-24 21:55:28 +01:00
teverse 62b6aad1e7 Basic progress bar on updator. 2020-04-24 17:12:21 +01:00
4 changed files with 59 additions and 25 deletions

View File

@ -1,2 +1,17 @@
local loadingText = teverse.construct("guiTextBox", {
parent = teverse.interface,
size = guiCoord(2, 0, 2, 0),
position = guiCoord(-0.5, 0, -0.5, 0),
backgroundColour = colour.black(),
textColour = colour.white(),
text = "teverse",
textAlign = "middle",
textSize = 38,
textFont = "tevurl:fonts/moskUltraBold.ttf",
zIndex = 2000
})
local ui = require("tevgit:core/dashboard/ui.lua") local ui = require("tevgit:core/dashboard/ui.lua")
ui.setup() ui.setup()
loadingText:destroy()

View File

@ -61,7 +61,6 @@ return {
iconId = "sliders-h", iconId = "sliders-h",
iconType = "faSolid", iconType = "faSolid",
setup = function(page) setup = function(page)
page.backgroundAlpha = 1.0
local feed = teverse.construct("guiScrollView", { local feed = teverse.construct("guiScrollView", {
parent = page, parent = page,
@ -270,7 +269,7 @@ return {
local feedItems = teverse.construct("guiFrame", { local feedItems = teverse.construct("guiFrame", {
parent = feed, parent = feed,
backgroundAlpha = 1, backgroundAlpha = 0,
clip = true clip = true
}) })
@ -309,30 +308,34 @@ return {
if code == 200 then if code == 200 then
lastRefresh = os.clock() lastRefresh = os.clock()
local json = teverse.json:decode(body) local json = teverse.json:decode(body)
if json[1].id == newestFeed then if #json > 0 then
-- no change from last refresh if json[1].id == newestFeed then
return nil -- no change from last refresh
else return nil
-- may require refactoring else
for _,v in pairs(feedItems.children) do -- may require refactoring
if v.name == "feedItem" then for _,v in pairs(feedItems.children) do
v:destroy() if v.name == "feedItem" then
v:destroy()
end
end end
end end
end newestFeed = json[1].id
newestFeed = json[1].id local y = 50
local y = 50 for _,v in pairs(json) do
for _,v in pairs(json) do local date = os.date("%d/%m/%Y %H:%M", os.parseISO8601(v.postedAt))
local date = os.date("%d/%m/%Y %H:%M", os.parseISO8601(v.postedAt)) local item = newFeedItem("tevurl:asset/user/" .. v.postedBy.id, v.postedBy.username, date, v.message)
local item = newFeedItem("tevurl:asset/user/" .. v.postedBy.id, v.postedBy.username, date, v.message) item.parent = feedItems
item.parent = feedItems local dy = item:child("body").textDimensions.y
local dy = item:child("body").textDimensions.y item.size = guiCoord(1, -20, 0, dy + 28)
item.size = guiCoord(1, -20, 0, dy + 28) item.position = guiCoord(0, 10, 0, y)
item.position = guiCoord(0, 10, 0, y) y = y + dy + 28
y = y + dy + 28 end
end
feed.canvasSize = guiCoord(1, 0, 0, feedItems.absolutePosition.y + y + 100) feed.canvasSize = guiCoord(1, 0, 0, feedItems.absolutePosition.y + y + 100)
else
feed.canvasSize = guiCoord(1, 0, 0, 0)
end
end end
end) end)
end end
@ -352,6 +355,7 @@ return {
input.text = "" input.text = ""
input.textEditable = true input.textEditable = true
input.textAlpha = 1.0 input.textAlpha = 1.0
submitting = false
end) end)
end end
end) end)

View File

@ -137,7 +137,10 @@ controller.setup = function()
end end
setupPage(require("tevgit:core/dashboard/pages/home.lua")) setupPage(require("tevgit:core/dashboard/pages/home.lua"))
setupPage(require("tevgit:core/dashboard/pages/apps.lua")) setupPage(require("tevgit:core/dashboard/pages/apps.lua"))
setupPage(require("tevgit:core/dashboard/pages/develop.lua"))
if _DEVICE:sub(0,6) ~= "iPhone" then
setupPage(require("tevgit:core/dashboard/pages/develop.lua"))
end
end end
return controller return controller

View File

@ -50,6 +50,13 @@ local gui = teverse.construct("guiTextBox", {
textColour = colour.rgb(61, 66, 71) textColour = colour.rgb(61, 66, 71)
}) })
local progressBar = teverse.construct("guiFrame", {
parent = dialog,
size = guiCoord(0, 0, 0, 5),
position = guiCoord(0, 0, 1, -5),
backgroundColour = colour.rgb(74, 140, 122)
})
if _OS == "OSX" or _OS == "IOS" then if _OS == "OSX" or _OS == "IOS" then
-- We distribute updates via the app store on iOS/OSX -- We distribute updates via the app store on iOS/OSX
gui.text = "A new version is available, please check the App Store." gui.text = "A new version is available, please check the App Store."
@ -58,4 +65,9 @@ end
teverse.networking:on("_update", function(message) teverse.networking:on("_update", function(message)
print('got ', message) print('got ', message)
gui.text = message gui.text = message
end)
teverse.networking:on("_downloadProgress", function(str)
local pcnt = tonumber(str)
progressBar.size = guiCoord(pcnt/100, 0, 0, 5)
end) end)