Merge branch 'develop' into 43-infinity-scroll

druid/extended/checkbox.lua

@@ -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)

druid/extended/component.template.lua

@@ -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
 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
 

druid/extended/dynamic_grid.lua

@@ -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 = {

druid/extended/input.lua

@@ -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
@@ -139,11 +108,16 @@ end
 
 
 -- @tparam node click_node Button node to enabled input component
--- @tparam node text_node Text node what will be changed on user input
+-- @tparam node|druid.text text_node Text node what will be changed on user input. You can pass text component instead of text node name
 -- @tparam[opt] number keyboard_type Gui keyboard type for input field
 function Input.init(self, click_node, text_node, keyboard_type)
 	self.druid = self:get_druid(self)
-	self.text = self.druid:new_text(text_node)
+
+	if type(text_node) == const.TABLE then
+		self.text = text_node
+	else
+		self.text = self.druid:new_text(text_node)
+	end
 
 	self.is_selected = false
 	self.value = self.text.last_value
@@ -161,9 +135,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 +189,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 +214,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 +270,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:set_input_priority(const.PRIORITY_INPUT_MAX)
+		self.button:set_input_priority(const.PRIORITY_INPUT_MAX)
+		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 +346,7 @@ end
 -- @tparam Input self
 function Input.reset_changes(self)
 	self:set_text(self.previous_value)
-	unselect(self)
+	self:unselect()
 end
 
 

druid/extended/lang_text.lua

@@ -12,17 +12,16 @@
 
 
 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
 -- @tparam LangText self
 -- @tparam node node The text node
--- @tparam string locale_id Default locale id
+-- @tparam string locale_id Default locale id, optional
 -- @tparam bool no_adjust If true, will not correct text size
 function LangText.init(self, node, locale_id, no_adjust)
 	self.druid = self:get_druid()
@@ -31,7 +30,9 @@ function LangText.init(self, node, locale_id, no_adjust)
 
 	self.on_change = Event()
 
-	self:translate(locale_id)
+	if locale_id then
+		self:translate(locale_id)
+	end
 
 	return self
 end
@@ -60,7 +61,7 @@ end
 function LangText.translate(self, locale_id, ...)
 	self.last_locale_args = {...}
 	self.last_locale = locale_id or self.last_locale
-	self.text:set_to(settings.get_text(self.last_locale, ...))
+	self.text:set_to(settings.get_text(self.last_locale, ...) or "")
 end
 
 

druid/extended/progress.lua

@@ -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)

druid/extended/slider.lua

@@ -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, component.ON_LAYOUT_CHANGE }, const.PRIORITY_INPUT_HIGH)
 
 
 local function on_change_value(self)

druid/extended/timer.lua

@@ -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