Partydeck/Extension-Druid
3
0
Fork 0
mirror of https://github.com/Insality/druid.git synced 2025-06-27 18:37:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #109 from Insality/fix/several-improvements

Browse Source 
Fix/several improvements
This commit is contained in:
Maxim Tuprikov 2020-11-07 17:29:15 +03:00 committed by GitHub
commit 4e65895966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 180 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
druid/base/back_handler.lua
View File

@ -14,7 +14,7 @@ local Event = require("druid.event")
local const = require("druid.const")
local component = require("druid.component")
local BackHandler = component.create("back_handler", { const.ON_INPUT })
local BackHandler = component.create("back_handler", { component.ON_INPUT })
--- Component init function

2
druid/base/blocker.lua
View File

@ -10,7 +10,7 @@
local const = require("druid.const")
local component = require("druid.component")
local Blocker = component.create("blocker", { const.ON_INPUT })
local Blocker = component.create("blocker", { component.ON_INPUT })
--- Component init function

2
druid/base/button.lua
View File

@ -51,7 +51,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Button = component.create("button", { const.ON_INPUT })
local Button = component.create("button", { component.ON_INPUT })
local function is_input_match(self, action_id)

2
druid/base/drag.lua
View File

@ -48,7 +48,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Drag = component.create("drag", { const.ON_INPUT_HIGH })
local Drag = component.create("drag", { component.ON_INPUT_HIGH })
local function start_touch(self, touch)

2
druid/base/hover.lua
View File

@ -15,7 +15,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Hover = component.create("hover", { const.ON_INPUT })
local Hover = component.create("hover", { component.ON_INPUT })
--- Component init function

3
druid/base/scroll.lua
View File

@ -54,11 +54,10 @@
local Event = require("druid.event")
local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Scroll = component.create("scroll", { const.ON_UPDATE, const.ON_LAYOUT_CHANGE })
local Scroll = component.create("scroll", { component.ON_UPDATE, component.ON_LAYOUT_CHANGE })
local function inverse_lerp(min, max, current)

2
druid/base/static_grid.lua
View File

@ -46,7 +46,7 @@ local Event = require("druid.event")
local helper = require("druid.helper")
local component = require("druid.component")
local StaticGrid = component.create("static_grid", { const.ON_LAYOUT_CHANGE })
local StaticGrid = component.create("static_grid", { component.ON_LAYOUT_CHANGE })
--- Component init function

2
druid/base/swipe.lua
View File

@ -20,7 +20,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Swipe = component.create("swipe", { const.ON_INPUT })
local Swipe = component.create("swipe", { component.ON_INPUT })
local function start_swipe(self, action)

2
druid/base/text.lua
View File

@ -43,7 +43,7 @@ local Event = require("druid.event")
local const = require("druid.const")
local component = require("druid.component")
local Text = component.create("text", { const.ON_LAYOUT_CHANGE })
local Text = component.create("text", { component.ON_LAYOUT_CHANGE })
local function update_text_size(self)

41
druid/component.lua
View File

@ -6,9 +6,50 @@
local const = require("druid.const")
local class = require("druid.system.middleclass")
local BaseComponent = class("druid.component")
--- Component Interests
BaseComponent.ALL = const.ALL
BaseComponent.ON_INPUT = const.ON_INPUT
BaseComponent.ON_UPDATE = const.ON_UPDATE
BaseComponent.ON_MESSAGE = const.ON_MESSAGE
BaseComponent.ON_INPUT_HIGH = const.ON_INPUT_HIGH
BaseComponent.ON_FOCUS_LOST = const.ON_FOCUS_LOST
BaseComponent.ON_FOCUS_GAINED = const.ON_FOCUS_GAINED
BaseComponent.ON_LAYOUT_CHANGE = const.ON_LAYOUT_CHANGE
BaseComponent.ON_LANGUAGE_CHANGE = const.ON_LANGUAGE_CHANGE
BaseComponent.ALL_INTERESTS = {
BaseComponent.ALL,
BaseComponent.ON_INPUT,
BaseComponent.ON_UPDATE,
BaseComponent.ON_MESSAGE,
BaseComponent.ON_FOCUS_LOST,
BaseComponent.ON_INPUT_HIGH,
BaseComponent.ON_FOCUS_GAINED,
BaseComponent.ON_LAYOUT_CHANGE,
BaseComponent.ON_LANGUAGE_CHANGE,
}
-- Value is method name of component
BaseComponent.SPECIFIC_UI_MESSAGES = {
[BaseComponent.ON_FOCUS_LOST] = "on_focus_lost",
[BaseComponent.ON_FOCUS_GAINED] = "on_focus_gained",
[BaseComponent.ON_LAYOUT_CHANGE] = "on_layout_change",
[BaseComponent.ON_LANGUAGE_CHANGE] = "on_language_change",
}
BaseComponent.UI_INPUT = {
[BaseComponent.ON_INPUT_HIGH] = true,
[BaseComponent.ON_INPUT] = true
}
--- Set current component style table.
-- Invoke `on_style_change` on component, if exist. BaseComponent should handle
-- their style changing and store all style params

30
druid/const.lua
View File

@ -24,10 +24,10 @@ M.PRESSED = "pressed"
M.STRING = "string"
M.TABLE = "table"
M.ZERO = "0"
M.ALL = "all"
--- Component Interests
M.ALL = "all"
M.ON_INPUT = hash("on_input")
M.ON_UPDATE = hash("on_update")
M.ON_MESSAGE = hash("on_message")
@ -38,19 +38,6 @@ M.ON_LAYOUT_CHANGE = hash("layout_changed")
M.ON_LANGUAGE_CHANGE = hash("on_language_change")
M.ALL_INTERESTS = {
M.ALL,
M.ON_INPUT,
M.ON_UPDATE,
M.ON_MESSAGE,
M.ON_FOCUS_LOST,
M.ON_INPUT_HIGH,
M.ON_FOCUS_GAINED,
M.ON_LAYOUT_CHANGE,
M.ON_LANGUAGE_CHANGE,
}
M.PIVOTS = {
[gui.PIVOT_CENTER] = vmath.vector3(0),
[gui.PIVOT_N] = vmath.vector3(0, 0.5, 0),
@ -64,21 +51,6 @@ M.PIVOTS = {
}
-- Value is method name of component
M.SPECIFIC_UI_MESSAGES = {
[M.ON_FOCUS_LOST] = "on_focus_lost",
[M.ON_FOCUS_GAINED] = "on_focus_gained",
[M.ON_LAYOUT_CHANGE] = "on_layout_change",
[M.ON_LANGUAGE_CHANGE] = "on_language_change",
}
M.UI_INPUT = {
[M.ON_INPUT_HIGH] = true,
[M.ON_INPUT] = true
}
M.OS = {
ANDROID = "Android",
IOS = "iPhone OS",

11
druid/druid.lua
View File

@ -15,8 +15,9 @@
-- @module druid
local const = require("druid.const")
local druid_instance = require("druid.system.druid_instance")
local base_component = require("druid.component")
local settings = require("druid.system.settings")
local druid_instance = require("druid.system.druid_instance")
local default_style = require("druid.styles.default.style")
@ -105,13 +106,13 @@ function M.on_window_callback(event)
if event == window.WINDOW_EVENT_FOCUS_LOST then
for i = 1, #instances do
msg.post(instances[i].url, const.ON_FOCUS_LOST)
msg.post(instances[i].url, base_component.ON_FOCUS_LOST)
end
end
if event == window.WINDOW_EVENT_FOCUS_GAINED then
for i = 1, #instances do
msg.post(instances[i].url, const.ON_FOCUS_GAINED)
msg.post(instances[i].url, base_component.ON_FOCUS_GAINED)
end
end
end
@ -123,7 +124,7 @@ function M.on_layout_change()
local instances = get_druid_instances()
for i = 1, #instances do
msg.post(instances[i].url, const.ON_LAYOUT_CHANGE)
msg.post(instances[i].url, base_component.ON_LAYOUT_CHANGE)
end
end
@ -135,7 +136,7 @@ function M.on_language_change()
local instances = get_druid_instances()
for i = 1, #instances do
msg.post(instances[i].url, const.ON_LANGUAGE_CHANGE)
msg.post(instances[i].url, base_component.ON_LANGUAGE_CHANGE)
end
end

3
druid/extended/checkbox.lua
View File

@ -16,11 +16,10 @@
-- @tfield Button button
local const = require("druid.const")
local Event = require("druid.event")
local component = require("druid.component")
local Checkbox = component.create("checkbox", { const.ON_LAYOUT_CHANGE })
local Checkbox = component.create("checkbox", { component.ON_LAYOUT_CHANGE })
local function on_click(self)

9
druid/extended/component.template.lua
View File

@ -1,10 +1,9 @@
--- Druid component template
-- @module druid.component
-- @local
local const = require("druid.const")
local component = require("druid.component")
local Component = component.create("my_component_name", { const.ON_UPDATE })
local Component = component.create("my_component_name", { component.ON_UPDATE })
-- Component constructor
@ -12,12 +11,12 @@ function Component:init(...)
end
-- Call only if exist interest: const.ON_UPDATE
-- Call only if exist interest: component.ON_UPDATE
function Component:update(dt)
end
-- Call only if exist interest: const.ON_INPUT or const.ON_INPUT_HIGH
-- Call only if exist interest: component.ON_INPUT or component.ON_INPUT_HIGH
function Component:on_input(action_id, action)
return false
end
@ -28,7 +27,7 @@ function Component:on_style_change(style)
end
-- Call only if exist interest: const.ON_MESSAGE
-- Call only if exist interest: component.ON_MESSAGE
function Component:on_message(message_id, message, sender)
end

2
druid/extended/dynamic_grid.lua
View File

@ -42,7 +42,7 @@ local Event = require("druid.event")
local helper = require("druid.helper")
local component = require("druid.component")
local DynamicGrid = component.create("dynamic_grid", { const.ON_LAYOUT_CHANGE })
local DynamicGrid = component.create("dynamic_grid", { component.ON_LAYOUT_CHANGE })
local SIDE_VECTORS = {

96
druid/extended/input.lua
View File

@ -50,7 +50,7 @@ local const = require("druid.const")
local component = require("druid.component")
local utf8 = require("druid.system.utf8")
local Input = component.create("input", { const.ON_INPUT, const.ON_FOCUS_LOST })
local Input = component.create("input", { component.ON_INPUT, component.ON_FOCUS_LOST })
--- Mask text by replacing every character with a mask character
@ -68,45 +68,12 @@ local function mask_text(text, mask)
end
local function select(self)
gui.reset_keyboard()
self.marked_value = ""
if not self.is_selected then
self:increase_input_priority()
self.button:increase_input_priority()
self.previous_value = self.value
self.is_selected = true
gui.show_keyboard(self.keyboard_type, false)
self.on_input_select:trigger(self:get_context())
self.style.on_select(self, self.button.node)
end
end
local function unselect(self)
gui.reset_keyboard()
self.marked_value = ""
if self.is_selected then
self:reset_input_priority()
self.button:reset_input_priority()
self.is_selected = false
gui.hide_keyboard()
self.on_input_unselect:trigger(self:get_context())
self.style.on_unselect(self, self.button.node)
end
end
local function clear_and_select(self)
if self.style.IS_LONGTAP_ERASE then
self:set_text("")
end
select(self)
self:select()
end
@ -116,6 +83,7 @@ end
-- @table style
-- @tfield[opt=false] bool IS_LONGTAP_ERASE Is long tap will erase current input data
-- @tfield[opt=*] string MASK_DEFAULT_CHAR Default character mask for password input
-- @tfield[opt=false] bool IS_UNSELECT_ON_RESELECT If true, call unselect on select selected input
-- @tfield function on_select (self, button_node) Callback on input field selecting
-- @tfield function on_unselect (self, button_node) Callback on input field unselecting
-- @tfield function on_input_wrong (self, button_node) Callback on wrong user input
@ -125,6 +93,7 @@ function Input.on_style_change(self, style)
self.style.IS_LONGTAP_ERASE = style.IS_LONGTAP_ERASE or false
self.style.MASK_DEFAULT_CHAR = style.MASK_DEFAULT_CHAR or "*"
self.style.IS_UNSELECT_ON_RESELECT = style.IS_UNSELECT_ON_RESELECT or false
self.style.on_select = style.on_select or function(_, button_node) end
self.style.on_unselect = style.on_unselect or function(_, button_node) end
@ -161,9 +130,9 @@ function Input.init(self, click_node, text_node, keyboard_type)
self.keyboard_type = keyboard_type or gui.KEYBOARD_TYPE_DEFAULT
self.button = self.druid:new_button(click_node, select)
self.button = self.druid:new_button(click_node, self.select)
self.button:set_style(self.button_style)
self.button.on_click_outside:subscribe(unselect)
self.button.on_click_outside:subscribe(self.unselect)
self.button.on_long_click:subscribe(clear_and_select)
self.on_input_select = Event()
@ -215,17 +184,17 @@ function Input.on_input(self, action_id, action)
end
if action_id == const.ACTION_ENTER and action.released then
unselect(self)
self:unselect()
return true
end
if action_id == const.ACTION_BACK and action.released then
unselect(self)
self:unselect()
return true
end
if action_id == const.ACTION_ESC and action.released then
unselect(self)
self:unselect()
return true
end
@ -240,12 +209,12 @@ end
function Input.on_focus_lost(self)
unselect(self)
self:unselect()
end
function Input.on_input_interrupt(self)
-- unselect(self)
-- self:unselect()
end
@ -296,6 +265,47 @@ function Input.set_text(self, input_text)
end
--- Select input field. It will show the keyboard and trigger on_select events
-- @tparam Input self
function Input.select(self)
gui.reset_keyboard()
self.marked_value = ""
if not self.is_selected then
self:increase_input_priority()
self.button:increase_input_priority()
self.previous_value = self.value
self.is_selected = true
gui.show_keyboard(self.keyboard_type, false)
self.on_input_select:trigger(self:get_context())
self.style.on_select(self, self.button.node)
else
if self.style.IS_UNSELECT_ON_RESELECT then
self:unselect(self)
end
end
end
--- Remove selection from input. It will hide the keyboard and trigger on_unselect events
-- @tparam Input self
function Input.unselect(self)
gui.reset_keyboard()
self.marked_value = ""
if self.is_selected then
self:reset_input_priority()
self.button:reset_input_priority()
self.is_selected = false
gui.hide_keyboard()
self.on_input_unselect:trigger(self:get_context())
self.style.on_unselect(self, self.button.node)
end
end
--- Return current input field text
-- @tparam Input self
-- @treturn string The current input field text
@ -331,7 +341,7 @@ end
-- @tparam Input self
function Input.reset_changes(self)
self:set_text(self.previous_value)
unselect(self)
self:unselect()
end

3
druid/extended/lang_text.lua
View File

@ -12,11 +12,10 @@
local Event = require("druid.event")
local const = require("druid.const")
local settings = require("druid.system.settings")
local component = require("druid.component")
local LangText = component.create("lang_text", { const.ON_LANGUAGE_CHANGE })
local LangText = component.create("lang_text", { component.ON_LANGUAGE_CHANGE })
--- Component init function

2
druid/extended/progress.lua
View File

@ -31,7 +31,7 @@ local const = require("druid.const")
local helper = require("druid.helper")
local component = require("druid.component")
local Progress = component.create("progress", { const.ON_UPDATE, const.ON_LAYOUT_CHANGE })
local Progress = component.create("progress", { component.ON_UPDATE, component.ON_LAYOUT_CHANGE })
local function check_steps(self, from, to, exactly)

2
druid/extended/slider.lua
View File

@ -37,7 +37,7 @@ local helper = require("druid.helper")
local const = require("druid.const")
local component = require("druid.component")
local Slider = component.create("slider", { const.ON_INPUT_HIGH, const.ON_LAYOUT_CHANGE })
local Slider = component.create("slider", { component.ON_INPUT_HIGH, component.ON_LAYOUT_CHANGE })
local function on_change_value(self)

3
druid/extended/timer.lua
View File

@ -28,12 +28,11 @@
local Event = require("druid.event")
local const = require("druid.const")
local formats = require("druid.helper.formats")
local helper = require("druid.helper")
local component = require("druid.component")
local Timer = component.create("timer", { const.ON_UPDATE })
local Timer = component.create("timer", { component.ON_UPDATE })
--- Component init function

68
druid/helper.lua
View File

@ -28,6 +28,11 @@ local function get_icon_width(icon_node)
end
local function get_width(node)
return gui.get_text(node) and get_text_width(node) or get_icon_width(node)
end
--- Center two nodes.
-- Nodes will be center around 0 x position
-- text_node will be first (at left side)
@ -36,22 +41,7 @@ end
-- @tparam[opt] box icon_node Gui box node
-- @tparam number margin Offset between nodes
function M.centrate_text_with_icon(text_node, icon_node, margin)
margin = margin or 0
local text_width = get_text_width(text_node)
local icon_width = get_icon_width(icon_node)
local width = text_width + icon_width
if text_node then
local pos = gui.get_position(text_node)
pos.x = -width/2 + text_width - margin/2
gui.set_position(text_node, pos)
end
if icon_node then
local icon_pos = gui.get_position(icon_node)
icon_pos.x = width/2 - icon_width + margin/2
gui.set_position(icon_node, icon_pos)
end
M.centrate_nodes(margin, text_node, icon_node)
end
@ -63,21 +53,43 @@ end
-- @tparam[opt] text text_node Gui text node
-- @tparam[opt=0] number margin Offset between nodes
function M.centrate_icon_with_text(icon_node, text_node, margin)
margin = margin or 0
local icon_width = get_icon_width(icon_node)
local text_width = get_text_width(text_node)
local width = text_width + icon_width
M.centrate_nodes(margin, icon_node, text_node)
end
if text_node then
local pos = gui.get_position(text_node)
pos.x = width/2 - text_width + margin/2
gui.set_position(text_node, pos)
--- Center several nodes nodes.
-- Nodes will be center around 0 x position
-- @function helper.centrate_nodes
-- @tparam[opt=0] number margin Offset between nodes
-- @tparam[opt] Node ... Any count of gui Node
function M.centrate_nodes(margin, ...)
margin = margin or 0
local width = 0
local count = select("#", ...)
local node_widths = {}
-- We need to get total width
for i = 1, count do
local node = select(i, ...)
node_widths[i] = get_width(node)
width = width + node_widths[i]
end
if icon_node then
local icon_pos = gui.get_position(icon_node)
icon_pos.x = -width/2 + icon_width - margin/2
gui.set_position(icon_node, icon_pos)
-- Posing all elements
local pos_x = 0
for i = 1, count do
local node = select(i, ...)
local node_width = node_widths[i]
local pos = gui.get_position(node)
pos_x = pos_x + node_width/2 -- made offset for single item
local pivot_offset = M.get_pivot_offset(gui.get_pivot(node))
pos.x = pos_x - width/2 + pivot_offset.x * node_width -- centrate node
gui.set_position(node, pos)
pos_x = pos_x + node_widths[i]/2 + margin -- add second part of offset
end
end

3
druid/styles/default/style.lua
View File

@ -95,8 +95,9 @@ M["swipe"] = {
M["input"] = {
IS_LONGTAP_ERASE = true,
BUTTON_SELECT_INCREASE = 1.1,
BUTTON_SELECT_INCREASE = 1.06,
MASK_DEFAULT_CHAR = "*",
IS_UNSELECT_ON_RESELECT = false,
on_select = function(self, button_node)
local target_scale = self.button.start_scale

36
druid/system/druid_instance.lua
View File

@ -28,11 +28,11 @@
-- @see Drag
-- @see Hover
local const = require("druid.const")
local helper = require("druid.helper")
local druid_input = require("druid.helper.druid_input")
local settings = require("druid.system.settings")
local class = require("druid.system.middleclass")
local settings = require("druid.system.settings")
local base_component = require("druid.component")
local druid_input = require("druid.helper.druid_input")
local back_handler = require("druid.base.back_handler")
local blocker = require("druid.base.blocker")
@ -87,14 +87,14 @@ local function create(self, instance_class)
local instance = instance_class()
instance:setup_component(self, self._context, self._style)
table.insert(self.components[const.ALL], instance)
table.insert(self.components[base_component.ALL], instance)
local register_to = instance:__get_interests()
for i = 1, #register_to do
local interest = register_to[i]
table.insert(self.components[interest], instance)
if const.UI_INPUT[interest] then
if base_component.UI_INPUT[interest] then
input_init(self)
end
end
@ -155,8 +155,8 @@ function DruidInstance.initialize(self, context, style)
self.url = msg.url()
self.components = {}
for i = 1, #const.ALL_INTERESTS do
self.components[const.ALL_INTERESTS[i]] = {}
for i = 1, #base_component.ALL_INTERESTS do
self.components[base_component.ALL_INTERESTS[i]] = {}
end
end
@ -180,7 +180,7 @@ end
-- on all druid components
-- @tparam DruidInstance self
function DruidInstance.final(self)
local components = self.components[const.ALL]
local components = self.components[base_component.ALL]
for i = #components, 1, -1 do
if components[i].on_remove then
@ -215,7 +215,7 @@ function DruidInstance.remove(self, component)
end
component._meta.children = {}
local all_components = self.components[const.ALL]
local all_components = self.components[base_component.ALL]
for i = #all_components, 1, -1 do
if all_components[i] == component then
if component.on_remove then
@ -242,7 +242,7 @@ end
-- @tparam DruidInstance self
-- @tparam number dt Delta time
function DruidInstance.update(self, dt)
local components = self.components[const.ON_UPDATE]
local components = self.components[base_component.ON_UPDATE]
for i = 1, #components do
components[i]:update(dt)
end
@ -259,10 +259,10 @@ function DruidInstance.on_input(self, action_id, action)
local is_input_consumed = false
is_input_consumed = process_input(action_id, action,
self.components[const.ON_INPUT_HIGH], is_input_consumed)
self.components[base_component.ON_INPUT_HIGH], is_input_consumed)
is_input_consumed = process_input(action_id, action,
self.components[const.ON_INPUT], is_input_consumed)
self.components[base_component.ON_INPUT], is_input_consumed)
self._is_input_processing = false
@ -283,7 +283,7 @@ end
-- @tparam table message Message from on_message
-- @tparam hash sender Sender from on_message
function DruidInstance.on_message(self, message_id, message, sender)
local specific_ui_message = const.SPECIFIC_UI_MESSAGES[message_id]
local specific_ui_message = base_component.SPECIFIC_UI_MESSAGES[message_id]
if specific_ui_message then
local components = self.components[message_id]
@ -294,7 +294,7 @@ function DruidInstance.on_message(self, message_id, message, sender)
end
end
else
local components = self.components[const.ON_MESSAGE]
local components = self.components[base_component.ON_MESSAGE]
for i = 1, #components do
components[i]:on_message(message_id, message, sender)
end
@ -306,7 +306,7 @@ end
-- This one called by on_window_callback by global window listener
-- @tparam DruidInstance self
function DruidInstance.on_focus_lost(self)
local components = self.components[const.ON_FOCUS_LOST]
local components = self.components[base_component.ON_FOCUS_LOST]
for i = 1, #components do
components[i]:on_focus_lost()
end
@ -317,7 +317,7 @@ end
-- This one called by on_window_callback by global window listener
-- @tparam DruidInstance self
function DruidInstance.on_focus_gained(self)
local components = self.components[const.ON_FOCUS_GAINED]
local components = self.components[base_component.ON_FOCUS_GAINED]
for i = 1, #components do
components[i]:on_focus_gained()
end
@ -328,7 +328,7 @@ end
-- Called on update gui layout
-- @tparam DruidInstance self
function DruidInstance.on_layout_change(self)
local components = self.components[const.ON_LAYOUT_CHANGE]
local components = self.components[base_component.ON_LAYOUT_CHANGE]
for i = 1, #components do
components[i]:on_layout_change()
end
@ -340,7 +340,7 @@ end
-- call manualy to update all translations
-- @function druid.on_language_change
function DruidInstance.on_language_change(self)
local components = self.components[const.ON_LANGUAGE_CHANGE]
local components = self.components[base_component.ON_LANGUAGE_CHANGE]
for i = 1, #components do
components[i]:on_language_change()
end