Pārlūkot izejas kodu

Got rid of the slider menu

Inigo Valentin 10 gadi atpakaļ
vecāks
revīzija
a4d8628f21

+ 0 - 4
Gasteizko Margolariak.xcodeproj/project.pbxproj

@@ -15,7 +15,6 @@
 		9328AF711D6616C700E6B0E2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9328AF701D6616C700E6B0E2 /* Assets.xcassets */; };
 		9338BE0D1D6B840D00D2735B /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9338BE0C1D6B840D00D2735B /* MainViewController.swift */; };
 		9338BE0F1D6B84D700D2735B /* SlideMenuController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9338BE0E1D6B84D700D2735B /* SlideMenuController.swift */; };
-		9338BE121D6B8D9A00D2735B /* LeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9338BE101D6B8D9A00D2735B /* LeftViewController.swift */; };
 		9338BE151D6B8E3000D2735B /* ImageHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9338BE141D6B8E3000D2735B /* ImageHeaderView.swift */; };
 		93A692EA1D6CB2F700594BA0 /* Preferences.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93A692E81D6CB2F700594BA0 /* Preferences.xcdatamodeld */; };
 		93A692ED1D6CB3BB00594BA0 /* Database.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 93A692EB1D6CB3BB00594BA0 /* Database.xcdatamodeld */; };
@@ -66,7 +65,6 @@
 		9328AF8B1D6616C700E6B0E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		9338BE0C1D6B840D00D2735B /* MainViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
 		9338BE0E1D6B84D700D2735B /* SlideMenuController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlideMenuController.swift; sourceTree = "<group>"; };
-		9338BE101D6B8D9A00D2735B /* LeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LeftViewController.swift; sourceTree = "<group>"; };
 		9338BE141D6B8E3000D2735B /* ImageHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageHeaderView.swift; sourceTree = "<group>"; };
 		93A692E41D6CB11400594BA0 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
 		93A692E61D6CB14000594BA0 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
@@ -161,7 +159,6 @@
 				93B2BE7F1D6B8F05007CBED3 /* BaseTableViewCell.swift */,
 				9338BE141D6B8E3000D2735B /* ImageHeaderView.swift */,
 				9328AF691D6616C700E6B0E2 /* AppDelegate.swift */,
-				9338BE101D6B8D9A00D2735B /* LeftViewController.swift */,
 				9328AF6B1D6616C700E6B0E2 /* ViewController.swift */,
 				9338BE0C1D6B840D00D2735B /* MainViewController.swift */,
 				93B05E361D6BA33600D909F9 /* GalleryViewController.swift */,
@@ -298,7 +295,6 @@
 				9328AF6A1D6616C700E6B0E2 /* AppDelegate.swift in Sources */,
 				93B05E291D6BA1EF00D909F9 /* HomeViewController.swift in Sources */,
 				93B2BEA01D6B8F9D007CBED3 /* UIColor.swift in Sources */,
-				9338BE121D6B8D9A00D2735B /* LeftViewController.swift in Sources */,
 				93B05E2D1D6BA27200D909F9 /* LablancaViewController.swift in Sources */,
 				93B2BEA51D6B8F9D007CBED3 /* UIViewController.swift in Sources */,
 				93A692EA1D6CB2F700594BA0 /* Preferences.xcdatamodeld in Sources */,

+ 2 - 2
Gasteizko Margolariak/AppDelegate.swift

@@ -22,7 +22,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let storyboard = UIStoryboard(name: "Main", bundle: nil)
         
         let mainViewController = storyboard.instantiateViewControllerWithIdentifier("MainViewController") as! MainViewController
-        let leftViewController = storyboard.instantiateViewControllerWithIdentifier("LeftViewController") as! LeftViewController
+        //let leftViewController = storyboard.instantiateViewControllerWithIdentifier("LeftViewController") as! LeftViewController
         
         let nvc: UINavigationController = UINavigationController(rootViewController: mainViewController)
 		
@@ -31,7 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		
         //leftViewController.mainViewController = nvc
         
-        let slideMenuController = ExSlideMenuController(mainViewController:nvc, leftMenuViewController: leftViewController)
+        let slideMenuController = ExSlideMenuController(mainViewController:nvc)
         slideMenuController.automaticallyAdjustsScrollViewInsets = true
         slideMenuController.delegate = mainViewController
         //self.window?.backgroundColor = UIColor(red: 236.0, green: 238.0, blue: 241.0, alpha: 1.0)

+ 0 - 169
Gasteizko Margolariak/LeftViewController.swift

@@ -1,169 +0,0 @@
-//
-//  LeftViewController.swift
-//  Gasteizko Margolariak
-//
-//  Created by Inigo Valentin on 2016-08-23
-//  Copyright © 2016 Inigo Valentin. All rights reserved.
-//
-//  Based on the work of Yuji Hato.
-//
-
-import UIKit
-
-enum LeftMenu: Int {
-    case Home = 0
-    case Location
-    case Lablanca
-    case Schedule
-    case Gmschedule
-    case Activities
-    case Blog
-    case Gallery
-    case Settings
-}
-
-protocol LeftMenuProtocol : class {
-    func changeViewController(menu: LeftMenu)
-}
-
-class LeftViewController : UIViewController, LeftMenuProtocol {
-    
-    @IBOutlet weak var tableView: UITableView!
-    var menus = ["Home", "Localizacion", "La Blanca", "Programa de Fiestas", "Programa Margolari", "Actividades", "Blog", "Galeria", "Ajustes"]
-    var homeViewController: UIViewController!
-    var locationViewController: UIViewController!
-    var lablancaViewController: UIViewController!
-    var scheduleViewController: UIViewController!
-    var gmscheduleViewController: UIViewController!
-    var activitiesViewController: UIViewController!
-    var blogViewController: UIViewController!
-    var galleryViewController: UIViewController!
-    var settingsViewController: UIViewController!
-    
-   // var imageHeaderView: ImageHeaderView!
-    
-    required init?(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-   
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        //self.tableView.separatorColor = UIColor(red: 0, green: 0, blue: 0, alpha: 1.0)
-        
-        let storyboard = UIStoryboard(name: "Main", bundle: nil)
-        
-        let homeViewController = storyboard.instantiateViewControllerWithIdentifier("HomeViewController") as! HomeViewController
-        self.homeViewController = UINavigationController(rootViewController: homeViewController)
-        
-        let locationViewController = storyboard.instantiateViewControllerWithIdentifier("LocationViewController") as! LocationViewController
-        self.locationViewController = UINavigationController(rootViewController: locationViewController)
-		
-		let lablancaViewController = storyboard.instantiateViewControllerWithIdentifier("LablancaViewController") as! LablancaViewController
-		self.lablancaViewController = UINavigationController(rootViewController: lablancaViewController)
-		
-		let scheduleViewController = storyboard.instantiateViewControllerWithIdentifier("ScheduleViewController") as! ScheduleViewController
-		self.scheduleViewController = UINavigationController(rootViewController: scheduleViewController)
-		
-		let gmscheduleViewController = storyboard.instantiateViewControllerWithIdentifier("GmscheduleViewController") as! GmscheduleViewController
-		self.gmscheduleViewController = UINavigationController(rootViewController: gmscheduleViewController)
-		
-		let activitiesViewController = storyboard.instantiateViewControllerWithIdentifier("ActivitiesViewController") as! ActivitiesViewController
-		self.activitiesViewController = UINavigationController(rootViewController: activitiesViewController)
-		
-		let blogViewController = storyboard.instantiateViewControllerWithIdentifier("BlogViewController") as! BlogViewController
-		self.blogViewController = UINavigationController(rootViewController: blogViewController)
-		
-		let galleryViewController = storyboard.instantiateViewControllerWithIdentifier("GalleryViewController") as! GalleryViewController
-		self.galleryViewController = UINavigationController(rootViewController: galleryViewController)
-		
-		let settingsViewController = storyboard.instantiateViewControllerWithIdentifier("SettingsViewController") as! SettingsViewController
-		self.settingsViewController = UINavigationController(rootViewController: settingsViewController)
-		
-        self.tableView.registerCellClass(BaseTableViewCell.self)
-        
-        //self.imageHeaderView = ImageHeaderView.loadNib()
-        //self.view.addSubview(self.imageHeaderView)
-    }
-    
-    override func viewDidAppear(animated: Bool) {
-        super.viewDidAppear(animated)
-    }
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        //self.imageHeaderView.frame = CGRect(x: 0, y: 0, width: self.view.frame.width, height: 160)
-        self.view.layoutIfNeeded()
-    }
-    
-    func changeViewController(menu: LeftMenu) {
-		print("Selected item: \(menu)")
-        switch menu {
-			case .Home:
-				self.slideMenuController()?.changeMainViewController(self.homeViewController, close: true)
-			case .Location:
-				self.slideMenuController()?.changeMainViewController(self.locationViewController, close: true)
-			case .Lablanca:
-				self.slideMenuController()?.changeMainViewController(self.lablancaViewController, close: true)
-			case .Schedule:
-				self.slideMenuController()?.changeMainViewController(self.scheduleViewController, close: true)
-			case .Gmschedule:
-				self.slideMenuController()?.changeMainViewController(self.gmscheduleViewController, close: true)
-			case .Activities:
-				self.slideMenuController()?.changeMainViewController(self.activitiesViewController, close: true)
-			case .Blog:
-				self.slideMenuController()?.changeMainViewController(self.blogViewController, close: true)
-			case .Gallery:
-				self.slideMenuController()?.changeMainViewController(self.galleryViewController, close: true)
-			case .Settings:
-				self.slideMenuController()?.changeMainViewController(self.settingsViewController, close: true)
-        }
-    }
-}
-
-extension LeftViewController : UITableViewDelegate {
-    func tableView(tableView: UITableView, heightForRowAtIndexPath indexPath: NSIndexPath) -> CGFloat {
-        if let menu = LeftMenu(rawValue: indexPath.item) {
-            switch menu {
-            case .Home, .Location, .Lablanca, .Schedule, .Gmschedule, .Activities, .Blog, .Gallery, .Settings:
-                return BaseTableViewCell.height()
-            }
-        }
-        return 0
-    }
-}
-
-extension LeftViewController : UITableViewDataSource {
-    
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return menus.count
-    }
-
-    func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
-        
-        if let menu = LeftMenu(rawValue: indexPath.item) {
-            switch menu {
-            case .Home, .Location, .Lablanca, .Schedule, .Gmschedule, .Activities, .Blog, .Gallery, .Settings:
-                let cell = BaseTableViewCell(style: UITableViewCellStyle.Subtitle, reuseIdentifier: BaseTableViewCell.identifier)
-                cell.setData(menus[indexPath.row])
-                return cell
-            }
-        }
-        return UITableViewCell()
-    }
-    
-    func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
-        if let menu = LeftMenu(rawValue: indexPath.item) {
-            self.changeViewController(menu)
-        }
-    }
-}
-
-extension LeftViewController: UIScrollViewDelegate {
-    
-    
-    func scrollViewDidScroll(scrollView: UIScrollView) {
-        if self.tableView == scrollView {
-            
-        }
-    }
-}

+ 3 - 3
Gasteizko Margolariak/SlideMenuController.swift

@@ -90,10 +90,10 @@ public class SlideMenuController: UIViewController, UIGestureRecognizerDelegate
         super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
     }
     
-    public convenience init(mainViewController: UIViewController, leftMenuViewController: UIViewController) {
+    public convenience init(mainViewController: UIViewController) {
         self.init()
         self.mainViewController = mainViewController
-        leftViewController = leftMenuViewController
+        //leftViewController = leftMenuViewController
         initView()
     }
     
@@ -1048,4 +1048,4 @@ extension UIViewController {
             targetScrollView.panGestureRecognizer.requireGestureRecognizerToFail(recognizer)
         }
     }
-}
+}