mirror of https://github.com/teverse/teverse
Compare commits
5 Commits
2dfc1f6dd5
...
98ea58ce13
Author | SHA1 | Date |
---|---|---|
Jay | 98ea58ce13 | |
Jay | f372771de9 | |
Jay | e2ea779051 | |
Jay | 0f6af4a587 | |
teverse | 62b6aad1e7 |
|
@ -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")
|
||||
ui.setup()
|
||||
|
||||
loadingText:destroy()
|
|
@ -61,7 +61,6 @@ return {
|
|||
iconId = "sliders-h",
|
||||
iconType = "faSolid",
|
||||
setup = function(page)
|
||||
page.backgroundAlpha = 1.0
|
||||
|
||||
local feed = teverse.construct("guiScrollView", {
|
||||
parent = page,
|
||||
|
@ -270,7 +269,7 @@ return {
|
|||
|
||||
local feedItems = teverse.construct("guiFrame", {
|
||||
parent = feed,
|
||||
backgroundAlpha = 1,
|
||||
backgroundAlpha = 0,
|
||||
clip = true
|
||||
})
|
||||
|
||||
|
@ -309,30 +308,34 @@ return {
|
|||
if code == 200 then
|
||||
lastRefresh = os.clock()
|
||||
local json = teverse.json:decode(body)
|
||||
if json[1].id == newestFeed then
|
||||
-- no change from last refresh
|
||||
return nil
|
||||
else
|
||||
-- may require refactoring
|
||||
for _,v in pairs(feedItems.children) do
|
||||
if v.name == "feedItem" then
|
||||
v:destroy()
|
||||
if #json > 0 then
|
||||
if json[1].id == newestFeed then
|
||||
-- no change from last refresh
|
||||
return nil
|
||||
else
|
||||
-- may require refactoring
|
||||
for _,v in pairs(feedItems.children) do
|
||||
if v.name == "feedItem" then
|
||||
v:destroy()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
newestFeed = json[1].id
|
||||
local y = 50
|
||||
for _,v in pairs(json) do
|
||||
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)
|
||||
item.parent = feedItems
|
||||
local dy = item:child("body").textDimensions.y
|
||||
item.size = guiCoord(1, -20, 0, dy + 28)
|
||||
item.position = guiCoord(0, 10, 0, y)
|
||||
y = y + dy + 28
|
||||
end
|
||||
newestFeed = json[1].id
|
||||
local y = 50
|
||||
for _,v in pairs(json) do
|
||||
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)
|
||||
item.parent = feedItems
|
||||
local dy = item:child("body").textDimensions.y
|
||||
item.size = guiCoord(1, -20, 0, dy + 28)
|
||||
item.position = guiCoord(0, 10, 0, y)
|
||||
y = y + dy + 28
|
||||
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
|
||||
|
@ -352,6 +355,7 @@ return {
|
|||
input.text = ""
|
||||
input.textEditable = true
|
||||
input.textAlpha = 1.0
|
||||
submitting = false
|
||||
end)
|
||||
end
|
||||
end)
|
||||
|
|
|
@ -137,7 +137,10 @@ controller.setup = function()
|
|||
end
|
||||
setupPage(require("tevgit:core/dashboard/pages/home.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
|
||||
|
||||
return controller
|
|
@ -50,6 +50,13 @@ local gui = teverse.construct("guiTextBox", {
|
|||
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
|
||||
-- We distribute updates via the app store on iOS/OSX
|
||||
gui.text = "A new version is available, please check the App Store."
|
||||
|
@ -59,3 +66,8 @@ teverse.networking:on("_update", function(message)
|
|||
print('got ', message)
|
||||
gui.text = message
|
||||
end)
|
||||
|
||||
teverse.networking:on("_downloadProgress", function(str)
|
||||
local pcnt = tonumber(str)
|
||||
progressBar.size = guiCoord(pcnt/100, 0, 0, 5)
|
||||
end)
|
Loading…
Reference in New Issue