Merge pull request #12 from jaames/v1.1

V1.1

Author: jaames

Source/components/Button.lua

@@ -27,6 +27,7 @@ function Button:init(x, y, w, h, text)
 
   self.variant = 'default'
   self.state = 'base'
+  self.stateTimer = nil
 
   self.padLeft = 16
   self.padRight = 16
@@ -54,19 +55,31 @@ function Button:init(x, y, w, h, text)
 end
 
 function Button:focus()
+  if self.stateTimer then
+    self.stateTimer:remove()
+    self.stateTimer = nil
+  end
   self.state = 'select'
   Button.super.focus(self)
 end
 
 function Button:unfocus()
+  if self.stateTimer then
+    self.stateTimer:remove()
+    self.stateTimer = nil
+  end
   self.state = 'base'
   Button.super.unfocus(self)
 end
 
 function Button:click()
-  local lastState = self.state
+  if self.stateTimer then
+    self.stateTimer:remove()
+    self.stateTimer = nil
+  end
+  local lastState = self.state ~= 'click' and self.state or 'base'
   self.state = 'click'
-  playdate.timer.performAfterDelay(300, function ()
+  self.stateTimer = playdate.timer.performAfterDelay(300, function ()
     self.state = lastState
   end)
   Button.super.click(self)

Source/components/PageArrow.lua

@@ -0,0 +1,18 @@
+local img <const> = gfx.image.new('./gfx/icon_page_next')
+
+PageArrow = {}
+class('PageArrow').extends(ComponentBase)
+
+PageArrow.kTypeNext = 1
+PageArrow.kTypePrev = 2
+
+function PageArrow:init(x, y, type)
+  local w, h = img:getSize()
+  PageArrow.super.init(self, x, y, w, h)
+  self:setAnchor('center', 'center')
+  self:setZIndex(200)
+  self:setImage(img)
+  if type == PageArrow.kTypePrev then
+    self:setImageFlip(gfx.kImageFlippedX)
+  end
+end

Source/data/cy_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Bydd gosodiadau’n cael eu dileu",
   "SETTINGS_RESET_DONE": "Mae gosodiadau wedi’u dileu",
 
-  "ABOUT_VERSION": "Fersiwn %d",
+  "ABOUT_VERSION": "Fersiwn %s",
   "ABOUT_BUILT_BY": "Gwnaed gan %s",
 
   "CREDITS_HEADER_JAMES": "Dylunio rhyngwyneb a rhaglennu",

Source/data/de_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Alle Einstellungen werden gelöscht",
   "SETTINGS_RESET_DONE": "Einstellungen wurden gelöscht",
 
-  "ABOUT_VERSION": "Version %d",
+  "ABOUT_VERSION": "Version %s",
   "ABOUT_BUILT_BY": "Kreiert von %s",
 
   "CREDITS_HEADER_JAMES": "Programmierung und UI Design",

Source/data/en_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "All settings will be cleared",
   "SETTINGS_RESET_DONE": "Settings cleared",
 
-  "ABOUT_VERSION": "Version %d",
+  "ABOUT_VERSION": "Version %s",
   "ABOUT_BUILT_BY": "Built by %s",
 
   "CREDITS_HEADER_JAMES": "Programming and UI Design",

Source/data/es_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Cada ajuste se va a restablecer",
   "SETTINGS_RESET_DONE": "Se han restablecido los ajustes",
 
-  "ABOUT_VERSION": "Versión %d",
+  "ABOUT_VERSION": "Versión %s",
   "ABOUT_BUILT_BY": "Compilado por %s",
 
   "CREDITS_HEADER_JAMES": "Programación y Diseño de UI",

Source/data/fr_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Toutes les options seront réinitialisées",
   "SETTINGS_RESET_DONE": "Les options ont été réinitialisées",
 
-  "ABOUT_VERSION": "Version %d",
+  "ABOUT_VERSION": "Version %s",
   "ABOUT_BUILT_BY": "Créé par %s",
 
   "CREDITS_HEADER_JAMES": "Programmation et design de l’interface",

Source/data/it_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Le impostazioni verranno ripristinate",
   "SETTINGS_RESET_DONE": "Impostazioni cancellate",
 
-  "ABOUT_VERSION": "La versione %d",
+  "ABOUT_VERSION": "La versione %s",
   "ABOUT_BUILT_BY": "Costruito da %s",
 
   "CREDITS_HEADER_JAMES": "Programmatore e UI Designer",

Source/data/jp_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "すべての設定をリセットします",
   "SETTINGS_RESET_DONE": "設定のリセットが完了しました",
 
-  "ABOUT_VERSION": "Version %d",
+  "ABOUT_VERSION": "Version %s",
   "ABOUT_BUILT_BY": "開発者: %s",
 
   "CREDITS_HEADER_JAMES": "プログラム&UIデザイン",

Source/data/nl_strings.json

@@ -21,7 +21,7 @@
   "SETTINGS_RESET_CONFIRM": "Alle instellingen worden hersteld",
   "SETTINGS_RESET_DONE": "Instellingen zijn hersteld",
 
-  "ABOUT_VERSION": "Versie %d",
+  "ABOUT_VERSION": "Versie %s",
   "ABOUT_BUILT_BY": "Ontwikkeld door %s",
 
   "CREDITS_HEADER_JAMES": "Programmeren en UI Ontwerp",