diff --git a/ios/README.md b/ios/README.md index a20fae0..d25d200 100644 --- a/ios/README.md +++ b/ios/README.md @@ -186,6 +186,11 @@ mainWindow. isAnyWindowOpen(); ## Changelog +* v1.1.0 + * iOS7 support + * Titanium minimum SDK changed to 3.1.3.GA + * iOS min-sdk is now 5.0 + * v1.0.3 * Fixed issue with setShowShadow(bool) that prevented it from working. Exposed property 'showShadow' (true/false) in 'createDrawer' function. diff --git a/ios/dist/dk.napp.drawer-iphone-1.1.0.zip b/ios/dist/dk.napp.drawer-iphone-1.1.0.zip new file mode 100644 index 0000000..af08ba9 Binary files /dev/null and b/ios/dist/dk.napp.drawer-iphone-1.1.0.zip differ diff --git a/ios/example/app.js b/ios/example/app.js index e735584..8bb8a05 100644 --- a/ios/example/app.js +++ b/ios/example/app.js @@ -6,7 +6,9 @@ function createAPIExampleWindow(){ var data = [ {title: "Toggle shadow"}, {title: "Toggle stretch drawer"}, - {title: "Close"} + {title: "Close Drawer"}, + {title: "New Window"}, + {title: "Default Window"} ]; var tableView = Ti.UI.createTableView({ @@ -25,10 +27,16 @@ function createAPIExampleWindow(){ case 2: drawer.toggleLeftWindow(); break; + case 3: + var newWin = openNewNavWindow(); + drawer.setCenterWindow(newWin); + drawer.toggleLeftWindow(); + break; + case 4: + drawer.setCenterWindow(createCenterNavWindow()); + drawer.toggleLeftWindow(); + break; } - setTimeout(function(){ - Ti.API.info("isLeftWindowOpen: " + drawer.isLeftWindowOpen()); - }, 500); }); win.add(tableView); @@ -36,6 +44,50 @@ function createAPIExampleWindow(){ } +function openNewNavWindow(){ + var leftBtn = Ti.UI.createButton({title:"Left"}); + leftBtn.addEventListener("click", function(){ + drawer.toggleLeftWindow(); + }); + var win = Ti.UI.createWindow({ + backgroundColor:'#222', + translucent:true, + extendEdges:[Ti.UI.EXTEND_EDGE_TOP], + title:"New Nav Window", + barColor:"#FFA", + tintColor:"yellow", + leftNavButton:leftBtn + }); + + var scrollView = Ti.UI.createScrollView({ + layout:"vertical", + left:0, + right:0, + contentHeight:'auto', + contentWidth:"100%", + showVerticalScrollIndicator: true, + showHorizontalScrollIndicator: false + }); + + for(var i=0; i<20; i++){ + var label = Ti.UI.createLabel({ + top:30, + text:"iOS7 is the new black", + color:"#FFF", + font:{ + fontSize:20 + } + }); + scrollView.add(label); + } + win.add(scrollView); + var navController = Ti.UI.iOS.createNavigationWindow({ + window : win + }); + return navController; +} + + function createCenterNavWindow(){ var leftBtn = Ti.UI.createButton({title:"Left"}); leftBtn.addEventListener("click", function(){ @@ -48,23 +100,14 @@ function createCenterNavWindow(){ var win = Ti.UI.createWindow({ backgroundColor:'#eee', - title:"Drawer Controller", - barColor:"#000", + translucent:false, + title:"NappDrawer", + barColor:"#F9A", + tintColor:"purple", leftNavButton: leftBtn, rightNavButton: rightBtn }); - var bounceBtn = Ti.UI.createButton({ - top:20, - width:300, - title:"Bounce Right Window" - }); - bounceBtn.addEventListener("click", function(){ - drawer.bounceRightWindow(); - }); - win.add(bounceBtn); - - var closeGestureMode = 1; var closeGestureModeBtn = Ti.UI.createButton({ title:"closeGestureMode: ALL", @@ -156,22 +199,23 @@ function createCenterNavWindow(){ win.add(label); win.add(slider); - // NAV controller - var navController = Ti.UI.iPhone.createNavigationGroup({ + var navController = Ti.UI.iOS.createNavigationWindow({ window : win }); return navController; } +var mainWindow = createCenterNavWindow(); var drawer = NappDrawerModule.createDrawer({ leftWindow: createAPIExampleWindow(), - centerWindow: createCenterNavWindow(), - //rightWindow: Ti.UI.createWindow({backgroundColor:"blue"}), + centerWindow: mainWindow, + rightWindow: Ti.UI.createWindow({backgroundColor:"#FFF"}), closeDrawerGestureMode: NappDrawerModule.CLOSE_MODE_ALL, openDrawerGestureMode: NappDrawerModule.OPEN_MODE_ALL, + showShadow: false, //no shadow in iOS7 leftDrawerWidth: 200, - //rightDrawerWidth: 220 + rightDrawerWidth: 120 }); drawer.open();