From 78434b13cdd25496306baef2ec89354a8aed7fa2 Mon Sep 17 00:00:00 2001 From: Jarno Elonen Date: Wed, 21 Oct 2015 20:33:24 +0300 Subject: [PATCH] Rudimentary Storyboard -> Composer migration --- button.lua | 12 ++++++------ main.lua | 7 +++---- picker.lua | 12 ++++++------ progressView.lua | 12 ++++++------ scrollView.lua | 12 ++++++------ searchField.lua | 12 ++++++------ segmentedControl.lua | 12 ++++++------ slider.lua | 12 ++++++------ spinner.lua | 14 +++++++------- stepper.lua | 12 ++++++------ switch.lua | 12 ++++++------ tabBar.lua | 12 ++++++------ tableView.lua | 12 ++++++------ templates/unit_test_template.lua | 10 +++++----- unitTestListing.lua | 12 ++++++------ 15 files changed, 87 insertions(+), 88 deletions(-) diff --git a/button.lua b/button.lua index d2ad225..ff1296c 100755 --- a/button.lua +++ b/button.lua @@ -2,8 +2,8 @@ -- File: newButton unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -55,7 +55,7 @@ function scene:createScene( event ) labelAlign = "center", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -314,10 +314,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/main.lua b/main.lua index ec1319b..8f4a9e8 100644 --- a/main.lua +++ b/main.lua @@ -44,7 +44,6 @@ io.output():setvbuf( "no" ) -- Hide the status bar display.setStatusBar( display.HiddenStatusBar ) -local storyboard = require( "storyboard" ) -storyboard.gotoScene( "unitTestListing" ) - ---storyboard.gotoScene( "tableView" ) +local composer = require( "composer" ) +composer.gotoScene( "unitTestListing" ) +--composer.gotoScene( "tableView" ) diff --git a/picker.lua b/picker.lua index 2a0d8a5..d27dcd3 100755 --- a/picker.lua +++ b/picker.lua @@ -2,8 +2,8 @@ -- File: newPickerWheel unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -49,7 +49,7 @@ function scene:createScene( event ) top = backButtonPosition, label = "Exit", width = 200, height = backButtonSize, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -145,10 +145,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/progressView.lua b/progressView.lua index 234a357..525871e 100644 --- a/progressView.lua +++ b/progressView.lua @@ -2,8 +2,8 @@ -- File: newProgressView unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -53,7 +53,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -124,10 +124,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/scrollView.lua b/scrollView.lua index d6e6aa0..9e34278 100644 --- a/scrollView.lua +++ b/scrollView.lua @@ -2,8 +2,8 @@ -- File: newScrollView unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() --Forward reference for test function timer local testTimer = nil @@ -55,7 +55,7 @@ function scene:createScene( event ) labelAlign = "center", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -598,10 +598,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/searchField.lua b/searchField.lua index bdc7bda..5bc0420 100644 --- a/searchField.lua +++ b/searchField.lua @@ -2,8 +2,8 @@ -- File: newSearchField unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local USE_ANDROID_THEME = false local USE_IOS7_THEME = true @@ -68,7 +68,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -128,10 +128,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/segmentedControl.lua b/segmentedControl.lua index 2c8a2de..a969d39 100644 --- a/segmentedControl.lua +++ b/segmentedControl.lua @@ -2,8 +2,8 @@ -- File: newSegmentedControl unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -53,7 +53,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -120,10 +120,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/slider.lua b/slider.lua index a2dfe85..989f57d 100644 --- a/slider.lua +++ b/slider.lua @@ -2,8 +2,8 @@ -- File: newSlider unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -54,7 +54,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -130,10 +130,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/spinner.lua b/spinner.lua index b27bf8d..0c8e3aa 100644 --- a/spinner.lua +++ b/spinner.lua @@ -2,8 +2,8 @@ -- File: newSpinner unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -55,7 +55,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -204,7 +204,7 @@ function scene:exitScene( event ) testTimer = nil end - --storyboard.purgeAll() + --composer.purgeAll() end function scene:didExitScene( event ) @@ -214,10 +214,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/stepper.lua b/stepper.lua index cccbe70..2374a72 100644 --- a/stepper.lua +++ b/stepper.lua @@ -2,8 +2,8 @@ -- File: newStepper unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local USE_IOS7_THEME = true local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -55,7 +55,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } group:insert( returnToListing ) @@ -133,10 +133,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/switch.lua b/switch.lua index 28b5fa8..fa4e01a 100644 --- a/switch.lua +++ b/switch.lua @@ -2,8 +2,8 @@ -- File: newSwitch unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -55,7 +55,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -274,10 +274,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/tabBar.lua b/tabBar.lua index 70918da..9d06699 100644 --- a/tabBar.lua +++ b/tabBar.lua @@ -2,8 +2,8 @@ -- File: newTabBar unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local USE_IOS7_THEME = false local isGraphicsV1 = ( 1 == display.getDefault( "graphicsCompatibility" ) ) @@ -55,7 +55,7 @@ function scene:createScene( event ) label = "Exit", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -288,10 +288,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/tableView.lua b/tableView.lua index af756f0..5b599d8 100644 --- a/tableView.lua +++ b/tableView.lua @@ -2,8 +2,8 @@ -- File: newTableView unit test. local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() --Forward reference for test function timer local testTimer = nil @@ -67,7 +67,7 @@ function scene:createScene( event ) labelAlign = "center", width = 200, height = backButtonSize, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } returnToListing.x = display.contentCenterX group:insert( returnToListing ) @@ -349,10 +349,10 @@ function scene:didExitScene( event ) testTimer = nil end - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene diff --git a/templates/unit_test_template.lua b/templates/unit_test_template.lua index ab8348f..da9d539 100644 --- a/templates/unit_test_template.lua +++ b/templates/unit_test_template.lua @@ -20,8 +20,8 @@ package.preload.widget = nil ------------------------------------------------------------------------------------------------- local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() function scene:createScene( event ) local group = self.view @@ -38,7 +38,7 @@ function scene:createScene( event ) label = "Return To Menu", width = 200, height = 52, cornerRadius = 8, - onRelease = function() storyboard.gotoScene( "unitTestListing" ) end; + onRelease = function() composer.gotoScene( "unitTestListing" ) end; } group:insert( returnToListing ) @@ -72,10 +72,10 @@ function scene:createScene( event ) end function scene:exitScene( event ) - storyboard.purgeAll() + composer.purgeAll() end -scene:addEventListener( "createScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) scene:addEventListener( "exitScene", scene ) return scene diff --git a/unitTestListing.lua b/unitTestListing.lua index 50f3fc7..ba4e22b 100755 --- a/unitTestListing.lua +++ b/unitTestListing.lua @@ -2,8 +2,8 @@ local widget = require( "widget" ) -local storyboard = require( "storyboard" ) -local scene = storyboard.newScene() +local composer = require( "composer" ) +local scene = composer.newScene() local USE_IOS_THEME = false local USE_IOS7_THEME = false @@ -101,7 +101,7 @@ function scene:createScene( event ) if "ended" == phase then local targetScene = event.target.id - storyboard.gotoScene( targetScene ) + composer.gotoScene( targetScene ) end return true @@ -271,10 +271,10 @@ function scene:createScene( event ) end function scene:didExitScene( event ) - storyboard.removeAll() + composer.removeAll() end -scene:addEventListener( "createScene", scene ) -scene:addEventListener( "didExitScene", scene ) +scene:addEventListener( "create", function(event) scene:createScene(event) end ) +scene:addEventListener( "hide", function(event) print("hide"); if event.phase == 'did' then scene:didExitScene(event) end end ) return scene