Refactor lock question set - lock switch code

sekodev · Jan 18, 2024 · ca834aa · ca834aa
1 parent 62c7ddc
commit ca834aa
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 123 deletions.
diff --git a/libs/commonMethods.lua b/libs/commonMethods.lua
@@ -282,7 +282,7 @@ function commonMethods.useLock(infoGroup, tableTimers, locksAvailable, textNumLo
 end
 
 -- Show number of locks available to use
-function commonMethods.showLocksAvailable(targetGroup, yTopInfoBox, locksAvailable)
+local function showLocksAvailable(targetGroup, yTopInfoBox, locksAvailable)
  local fontLogo = composer.getVariable( "fontLogo" )
 
  local colorTextDefault = themeData.colorTextDefault
@@ -306,6 +306,72 @@ function commonMethods.showLocksAvailable(targetGroup, yTopInfoBox, locksAvailab
  targetGroup:insert(imageLock.textNumAvailable)
 end
 
+-- Change lock state and show information based on taps/clicks
+function commonMethods.switchLock(buttonLock, infoGroup, locksAvailable, soundLock, fontLockUsed)
+ local lockInfoAvailable = composer.getVariable( "lockInfoAvailable" )
+ local colorPadlock = themeData.colorPadlock
+
+ -- Only change the flag as activated
+ -- This change will be used later on button press("Play") and scene change
+ if (buttonLock.isActivated) then
+ buttonLock.isActivated = false
+ buttonLock.alpha = buttonLock.alphaInactive
+ buttonLock:setFillColor( unpack(colorPadlock) )
+ else
+ audio.play( soundLock, {channel = 2} )
+
+ -- Check to see if information about lock system will be shown
+ -- If player discarded the message and chose "Don't show again", don't show info box
+ if (lockInfoAvailable) then
+ if (locksAvailable > 0) then
+ buttonLock.isActivated = true
+ buttonLock.alpha = 1
+ end
+
+ local infoText
+ local isPromptAvailable = true
+ if (locksAvailable > 0) then
+ infoText = sozluk.getString("lockInformation")
+ else
+ infoText = sozluk.getString("lockInformationNA")
+ isPromptAvailable = false
+ end
+
+ -- Declare options for information box creation
+ local optionsInfoBox = {
+ infoFont = fontLockUsed,
+ infoText = infoText,
+ isPromptAvailable = isPromptAvailable,
+ stringPromptPreference = "lockInfoAvailable",
+ }
+ yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
+ showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
+ else
+ if (locksAvailable > 0) then
+ buttonLock.isActivated = true
+ buttonLock.alpha = 1
+ else
+ local infoText
+ local isPromptAvailable = true
+ if (locksAvailable <= 0) then
+ infoText = sozluk.getString("lockInformationNA")
+ isPromptAvailable = false
+ end
+
+ -- Declare options for information box creation
+ local optionsInfoBox = {
+ infoFont = fontLockUsed,
+ infoText = infoText,
+ isPromptAvailable = isPromptAvailable,
+ stringPromptPreference = "lockInfoAvailable",
+ }
+ yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
+ showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
+ end
+ end
+ end
+end
+
 -- Handle touch events for navigation buttons
 -- Calls assigned function when corresponding option is selected
 local function handleNavigationTouch(event)

diff --git a/screens/endScreen.lua b/screens/endScreen.lua
@@ -201,67 +201,8 @@ function handleTouch(event)
  if (event.target.id == "shareSocial") then
  event.target:setFillColor( unpack(themeData.colorButtonDefault) )
  elseif (event.target.id == "lockQuestionSet") then
- local lockInfoAvailable = composer.getVariable( "lockInfoAvailable" )
-
- -- Only change the flag as activated
- -- This change will be used later on button press("Play") and scene change
- if (event.target.isActivated) then
- event.target.isActivated = false
- event.target.alpha = event.target.alphaInactive
- event.target:setFillColor( unpack(themeData.colorPadlock) )
- else
- audio.play( tableSoundFiles["lockQuestionSet"], {channel = 2} )
-
- -- Check to see if information about lock system will be shown
- -- If player discarded the message and chose "Don't show again", don't show info box
- if (lockInfoAvailable) then
- if (locksAvailable > 0) then
- event.target.isActivated = true
- event.target.alpha = 1
- end
-
- local infoText
- local isPromptAvailable = true
- if (locksAvailable > 0) then
- infoText = sozluk.getString("lockInformation")
- else
- infoText = sozluk.getString("lockInformationNA")
- isPromptAvailable = false
- end
-
- -- Declare options for information box creation
- local optionsInfoBox = {
- infoFont = fontLogo,
- infoText = infoText,
- isPromptAvailable = isPromptAvailable,
- stringPromptPreference = "lockInfoAvailable",
- }
- yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
- commonMethods.showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
- else
- if (locksAvailable > 0) then
- event.target.isActivated = true
- event.target.alpha = 1
- else
- local infoText
- local isPromptAvailable = true
- if (locksAvailable <= 0) then
- infoText = sozluk.getString("lockInformationNA")
- isPromptAvailable = false
- end
-
- -- Declare options for information box creation
- local optionsInfoBox = {
- infoFont = fontLogo,
- infoText = infoText,
- isPromptAvailable = isPromptAvailable,
- stringPromptPreference = "lockInfoAvailable",
- }
- yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
- commonMethods.showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
- end
- end
- end
+ commonMethods.switchLock(event.target, infoGroup, locksAvailable, 
+ tableSoundFiles["lockQuestionSet"], fontLogo)
  end
  end
  end

diff --git a/screens/menuScreen.lua b/screens/menuScreen.lua
@@ -250,67 +250,8 @@ function handleTouch(event)
  if (event.target.id == "shareSocial" or "rateGame" == event.target.id) then
  event.target:setFillColor( unpack(themeData.colorButtonDefault) )
  elseif (event.target.id == "lockQuestionSet") then
- local lockInfoAvailable = composer.getVariable( "lockInfoAvailable" )
-
- -- Only change the flag as activated
- -- This change will be used later on button press("Play") and scene change
- if (event.target.isActivated) then
- event.target.isActivated = false
- event.target.alpha = event.target.alphaInactive
- event.target:setFillColor( unpack(themeData.colorPadlock) )
- else
- audio.play( tableSoundFiles["lockQuestionSet"], {channel = 2} )
-
- -- Check to see if information about lock system will be shown
- -- If player discarded the message and chose "Don't show again", don't show info box
- if (lockInfoAvailable) then
- if (locksAvailable > 0) then
- event.target.isActivated = true
- event.target.alpha = 1
- end
-
- local infoText
- local isPromptAvailable = true
- if (locksAvailable > 0) then
- infoText = sozluk.getString("lockInformation")
- else
- infoText = sozluk.getString("lockInformationNA")
- isPromptAvailable = false
- end
-
- -- Declare options for information box creation
- local optionsInfoBox = {
- infoFont = fontLogo,
- infoText = infoText,
- isPromptAvailable = isPromptAvailable,
- stringPromptPreference = "lockInfoAvailable",
- }
- yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
- commonMethods.showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
- else
- if (locksAvailable > 0) then
- event.target.isActivated = true
- event.target.alpha = 1
- else
- local infoText
- local isPromptAvailable = true
- if (locksAvailable <= 0) then
- infoText = sozluk.getString("lockInformationNA")
- isPromptAvailable = false
- end
-
- -- Declare options for information box creation
- local optionsInfoBox = {
- infoFont = fontLogo,
- infoText = infoText,
- isPromptAvailable = isPromptAvailable,
- stringPromptPreference = "lockInfoAvailable",
- }
- yTopFrame = utils.showInformationBox(infoGroup, optionsInfoBox)
- commonMethods.showLocksAvailable(infoGroup, yTopFrame, locksAvailable)
- end
- end
- end
+ commonMethods.switchLock(event.target, infoGroup, locksAvailable, 
+ tableSoundFiles["lockQuestionSet"], fontLogo)
  end
  end
  end