Skip to content

Commit

Permalink
Merge pull request #10 from nathanb95/feature/openfoldersegue
Browse files Browse the repository at this point in the history
Segue to Folder completed
  • Loading branch information
okrek6 committed Oct 13, 2018
2 parents a2884de + 8bd1ec3 commit 2970231
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 23 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,14 @@
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SplitNote/homeViewController.swift"
timestampString = "561163635.608651"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "99"
endingLineNumber = "99"
landmarkName = "newNote(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "SplitNote/homeViewController.swift"
timestampString = "561163635.609233"
timestampString = "561165748.664871"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "35"
Expand Down
11 changes: 5 additions & 6 deletions SplitNote/homeViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class homeViewController: UIViewController, UITableViewDataSource, UITableViewDe
open.setTitleColor(UIColor(displayP3Red: 115/255, green: 75/255, blue: 109/255, alpha: 1.0), for: [])
open.backgroundColor = UIColor.white
open.layer.cornerRadius = 25
open.addTarget(self, action: #selector(openNotes(_:)), for: .touchUpInside)
open.addTarget(self, action: #selector(openFolders(_:)), for: .touchUpInside)

view.addSubview(homeView)
view.addSubview(new)
Expand All @@ -97,18 +97,17 @@ class homeViewController: UIViewController, UITableViewDataSource, UITableViewDe

@IBAction func newNote(_ sender: Any?) {
print("New Recording Started")
self.present(NewNoteViewController(), animated: true, completion: nil)
self.present(UINavigationController(rootViewController: NewNoteViewController()), animated: true, completion: nil)

}

// override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// let destination = segue.destination as! NewNoteViewController
// }

@IBAction func openNotes(_ sender: Any?) {



@IBAction func openFolders(_ sender: Any?) {
print("Opening Folders")
self.present(UINavigationController(rootViewController: FolderViewController()), animated: true, completion: nil)
}

func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
Expand Down

0 comments on commit 2970231

Please sign in to comment.