From 3c52809a99b63dd1bbec4324af3f1f7c30d79e36 Mon Sep 17 00:00:00 2001
From: jz709u <jz709u@gmail.com>
Date: Tue, 21 Feb 2017 23:24:20 +0900
Subject: [PATCH] Mark Down View
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- need to manage observers now because with tab view controllers they
don’t fully load the view controller into memory when they are in the
tabs that’s not yet displayed so when de init could be executed without
initial adding of observers.
- added external library for converting to mark down text
- tested various memory leaks, since adding tab bar as the base.
- mark down view
---
 standardnotes.xcodeproj/project.pbxproj    | 16 ++++
 standardnotes/Base.lproj/Main.storyboard   | 87 ++++++++++++++++++----
 standardnotes/ComposeViewController.swift  | 56 +++++++++++---
 standardnotes/MarkDownViewController.swift | 87 ++++++++++++++++++++++
 standardnotes/Note+CoreDataClass.swift     |  1 -
 standardnotes/NotesViewController.swift    | 11 ++-
 6 files changed, 228 insertions(+), 30 deletions(-)
 create mode 100644 standardnotes/MarkDownViewController.swift

diff --git a/standardnotes.xcodeproj/project.pbxproj b/standardnotes.xcodeproj/project.pbxproj
index 4e815b6..d533973 100644
--- a/standardnotes.xcodeproj/project.pbxproj
+++ b/standardnotes.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		6928F05B1E45F7A300A05DB9 /* SyncController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6928F05A1E45F7A300A05DB9 /* SyncController.swift */; };
+		69462FFE1E5C53A30097EBE8 /* Markdown.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69462FFD1E5C53A30097EBE8 /* Markdown.swift */; };
+		694630141E5C59060097EBE8 /* MarkDownViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 694630131E5C59060097EBE8 /* MarkDownViewController.swift */; };
 		B8046A731E2A8074006A5F03 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8046A721E2A8074006A5F03 /* Theme.swift */; };
 		B809F2B81E0B5164007D5700 /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B809F2B71E0B5164007D5700 /* ComposeViewController.swift */; };
 		B82B6DFB1E08AA660025C3EC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82B6DFA1E08AA660025C3EC /* AppDelegate.swift */; };
@@ -113,6 +115,8 @@
 
 /* Begin PBXFileReference section */
 		6928F05A1E45F7A300A05DB9 /* SyncController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncController.swift; sourceTree = "<group>"; };
+		69462FFD1E5C53A30097EBE8 /* Markdown.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Markdown.swift; path = ../../standardNotes/standardnotes/Markdown.swift; sourceTree = "<group>"; };
+		694630131E5C59060097EBE8 /* MarkDownViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarkDownViewController.swift; sourceTree = "<group>"; };
 		B8046A721E2A8074006A5F03 /* Theme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		B809F2B71E0B5164007D5700 /* ComposeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposeViewController.swift; sourceTree = "<group>"; };
 		B82B6DF71E08AA660025C3EC /* standardnotes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = standardnotes.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -158,6 +162,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		6946300B1E5C58D80097EBE8 /* Markdown */ = {
+			isa = PBXGroup;
+			children = (
+				694630131E5C59060097EBE8 /* MarkDownViewController.swift */,
+			);
+			name = Markdown;
+			sourceTree = "<group>";
+		};
 		B80140921E12FFA00046082C /* Compose */ = {
 			isa = PBXGroup;
 			children = (
@@ -173,6 +185,7 @@
 				B89178E51E0DBDC800163EA7 /* Notes */,
 				B89178E61E0DC80600163EA7 /* Tags */,
 				B80140921E12FFA00046082C /* Compose */,
+				6946300B1E5C58D80097EBE8 /* Markdown */,
 				B89178E11E0D86D500163EA7 /* TabBarViewController.swift */,
 				B89178DD1E0D7D8300163EA7 /* AccountViewController.swift */,
 			);
@@ -290,6 +303,7 @@
 		CDAAB6421E0DE4DE0033487A /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				69462FFD1E5C53A30097EBE8 /* Markdown.swift */,
 				B872EC871E08D00400CC7656 /* standardnotes-Bridging-Header.h */,
 				B82B6E041E08AA660025C3EC /* Assets.xcassets */,
 				B82B6E061E08AA660025C3EC /* LaunchScreen.storyboard */,
@@ -438,6 +452,8 @@
 				B89178DE1E0D7D8300163EA7 /* AccountViewController.swift in Sources */,
 				B8046A731E2A8074006A5F03 /* Theme.swift in Sources */,
 				B89178DA1E0C9B9D00163EA7 /* Tag+CoreDataProperties.swift in Sources */,
+				69462FFE1E5C53A30097EBE8 /* Markdown.swift in Sources */,
+				694630141E5C59060097EBE8 /* MarkDownViewController.swift in Sources */,
 				B89178E81E0DC81500163EA7 /* TagTableViewCell.swift in Sources */,
 				B89178CE1E0C9A4D00163EA7 /* Tag+CoreDataClass.swift in Sources */,
 				B82B6E181E08AC8C0025C3EC /* ApiController.swift in Sources */,
diff --git a/standardnotes/Base.lproj/Main.storyboard b/standardnotes/Base.lproj/Main.storyboard
index 7659ce5..697f7c3 100644
--- a/standardnotes/Base.lproj/Main.storyboard
+++ b/standardnotes/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="kP2-Xk-3i1">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="kP2-Xk-3i1">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -102,6 +102,59 @@
             </objects>
             <point key="canvasLocation" x="-1226.4000000000001" y="277.51124437781112"/>
         </scene>
+        <!--Mark Down-->
+        <scene sceneID="FmZ-u4-TXh">
+            <objects>
+                <viewController title="Mark Down" automaticallyAdjustsScrollViewInsets="NO" id="THq-0m-LG0" customClass="MarkDownViewController" customModule="standardnotes" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="xDD-DI-6Gb"/>
+                        <viewControllerLayoutGuide type="bottom" id="T6q-Qq-yAd"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="WYH-0x-H6y">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <webView contentMode="scaleToFill" scalesPageToFit="YES" translatesAutoresizingMaskIntoConstraints="NO" id="D92-YA-LEF">
+                                <rect key="frame" x="0.0" y="20" width="375" height="598"/>
+                                <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </webView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailingMargin" secondItem="D92-YA-LEF" secondAttribute="trailing" constant="-16" id="6BU-Ju-9Ad"/>
+                            <constraint firstItem="D92-YA-LEF" firstAttribute="top" secondItem="xDD-DI-6Gb" secondAttribute="bottom" id="NnY-Ic-yWN"/>
+                            <constraint firstItem="D92-YA-LEF" firstAttribute="leading" secondItem="WYH-0x-H6y" secondAttribute="leadingMargin" constant="-16" id="aYF-R9-gUE"/>
+                            <constraint firstItem="T6q-Qq-yAd" firstAttribute="top" secondItem="D92-YA-LEF" secondAttribute="bottom" id="dhj-yd-AfS"/>
+                        </constraints>
+                    </view>
+                    <tabBarItem key="tabBarItem" title="Item" id="3Fz-4k-sM2"/>
+                    <connections>
+                        <outlet property="webView" destination="D92-YA-LEF" id="D77-je-n5E"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="W5w-ya-J3H" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="249" y="1678"/>
+        </scene>
+        <!--Tab Bar Controller-->
+        <scene sceneID="PMK-BA-JMv">
+            <objects>
+                <tabBarController storyboardIdentifier="Compose" automaticallyAdjustsScrollViewInsets="NO" id="SWs-11-ara" sceneMemberID="viewController">
+                    <extendedEdge key="edgesForExtendedLayout" top="YES"/>
+                    <tabBar key="tabBar" hidden="YES" contentMode="scaleToFill" id="n4h-GI-JiN">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="nsi-ga-c3H" kind="relationship" relationship="viewControllers" id="AhZ-Mq-BHz"/>
+                        <segue destination="THq-0m-LG0" kind="relationship" relationship="viewControllers" id="nfq-1f-g95"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="fC2-PY-RGC" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-551" y="1223"/>
+        </scene>
         <!--Notes-->
         <scene sceneID="2jz-CM-Jsd">
             <objects>
@@ -123,7 +176,7 @@
         <!--Compose-->
         <scene sceneID="pOC-Hj-w5t">
             <objects>
-                <viewController storyboardIdentifier="Compose" autoresizesArchivedViewToFullSize="NO" title="Compose" hidesBottomBarWhenPushed="YES" id="nsi-ga-c3H" customClass="ComposeViewController" customModule="standardnotes" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController autoresizesArchivedViewToFullSize="NO" title="Compose" automaticallyAdjustsScrollViewInsets="NO" hidesBottomBarWhenPushed="YES" id="nsi-ga-c3H" customClass="ComposeViewController" customModule="standardnotes" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="EoA-eV-qfT"/>
                         <viewControllerLayoutGuide type="bottom" id="Oq1-bZ-ZPw"/>
@@ -177,6 +230,7 @@
                             <constraint firstItem="Xox-GZ-1Iy" firstAttribute="leading" secondItem="Pdu-3j-fWh" secondAttribute="leading" id="zB8-Vs-Tji"/>
                         </constraints>
                     </view>
+                    <tabBarItem key="tabBarItem" title="Item" id="g1w-4l-UWJ"/>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <nil key="simulatedBottomBarMetrics"/>
                     <connections>
@@ -186,7 +240,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Mo1-6L-ygt" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-70" y="1160"/>
+            <point key="canvasLocation" x="250" y="943"/>
         </scene>
         <!--Tags-->
         <scene sceneID="Lv6-AF-XbD">
@@ -213,7 +267,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9VV-zC-Aes">
-                                                    <rect key="frame" x="312" y="8" width="50.5" height="31"/>
+                                                    <rect key="frame" x="311.5" y="8" width="50.5" height="31"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
                                                     <color key="onTintColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <connections>
@@ -221,7 +275,7 @@
                                                     </connections>
                                                 </switch>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lHM-da-Oxj">
-                                                    <rect key="frame" x="16" y="14" width="279.5" height="21"/>
+                                                    <rect key="frame" x="16" y="14" width="279" height="21"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                     <nil key="textColor"/>
@@ -251,12 +305,13 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="b5T-sH-hjL" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-906" y="1160"/>
+            <point key="canvasLocation" x="-1415" y="1074"/>
         </scene>
         <!--Tab Bar View Controller-->
         <scene sceneID="XEx-FQ-YvN">
             <objects>
                 <tabBarController id="kP2-Xk-3i1" customClass="TabBarViewController" customModule="standardnotes" customModuleProvider="target" sceneMemberID="viewController">
+                    <extendedEdge key="edgesForExtendedLayout" top="YES"/>
                     <simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
                     <tabBar key="tabBar" contentMode="scaleToFill" id="C5t-Qy-mEZ">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="49"/>
@@ -292,7 +347,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Server" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="eJP-c0-5od">
-                                                    <rect key="frame" x="14" y="8" width="344" height="30"/>
+                                                    <rect key="frame" x="12.5" y="8" width="345.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -309,7 +364,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Email" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PNC-Rq-c3h">
-                                                    <rect key="frame" x="14" y="7" width="344" height="30"/>
+                                                    <rect key="frame" x="12.5" y="7" width="345.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -326,7 +381,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Password" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="w6l-WK-oMt">
-                                                    <rect key="frame" x="14" y="7" width="344" height="30"/>
+                                                    <rect key="frame" x="12.5" y="7" width="345.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -343,7 +398,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mUj-wU-LM9">
-                                                    <rect key="frame" x="6.5" y="6" width="359" height="30"/>
+                                                    <rect key="frame" x="5" y="6" width="360" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Sign In"/>
                                                     <connections>
@@ -361,7 +416,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OJ-B6-sG1">
-                                                    <rect key="frame" x="14" y="8" width="344" height="30"/>
+                                                    <rect key="frame" x="12.5" y="8" width="345.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Register"/>
                                                     <connections>
@@ -383,7 +438,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dcV-vg-Cwa">
-                                                    <rect key="frame" x="10" y="7" width="348" height="30"/>
+                                                    <rect key="frame" x="9.5" y="7" width="348.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Sign out"/>
                                                     <connections>
@@ -401,7 +456,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3UO-h9-zXQ">
-                                                    <rect key="frame" x="10" y="7" width="348" height="30"/>
+                                                    <rect key="frame" x="9.5" y="7" width="348.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Export Data"/>
                                                     <connections>
@@ -419,7 +474,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wxk-kk-Vwl">
-                                                    <rect key="frame" x="10" y="7" width="348" height="30"/>
+                                                    <rect key="frame" x="9.5" y="7" width="348.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Enable TouchID"/>
                                                     <state key="selected" title="Disable TouchID"/>
@@ -442,7 +497,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GY6-tE-1zN">
-                                                    <rect key="frame" x="10" y="7" width="348" height="30"/>
+                                                    <rect key="frame" x="9.5" y="7" width="348.5" height="30"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <state key="normal" title="Feedback"/>
                                                     <connections>
diff --git a/standardnotes/ComposeViewController.swift b/standardnotes/ComposeViewController.swift
index 5be7f25..5470867 100644
--- a/standardnotes/ComposeViewController.swift
+++ b/standardnotes/ComposeViewController.swift
@@ -16,6 +16,7 @@ class ComposeViewController: UIViewController {
     var note: Note!
     var saving: Bool = false
     var saved: Bool = false
+    fileprivate var observsersAdded = false
     var saveTimer: Timer!
         
     override func viewDidLoad() {
@@ -32,8 +33,21 @@ class ComposeViewController: UIViewController {
         titleTextField.text = self.note?.safeTitle()
         textView.text = self.note?.safeText()
         
-        self.note.addObserver(self, forKeyPath: "text", options: [.new], context: nil)
-        self.note.addObserver(self, forKeyPath: "title", options: [.new], context: nil)
+        addObservers()
+    }
+    
+    func addObservers() {
+        guard !observsersAdded else { return }
+        observsersAdded = true
+        note.addObserver(self, forKeyPath: "text", options: [.new], context: nil)
+        note.addObserver(self, forKeyPath: "title", options: [.new], context: nil)
+    }
+    
+    func removeObservsers() {
+        guard observsersAdded else { return }
+        observsersAdded = false
+        note.removeObserver(self, forKeyPath: "text")
+        note.removeObserver(self, forKeyPath: "title")
     }
     
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
@@ -45,8 +59,7 @@ class ComposeViewController: UIViewController {
     }
     
     deinit {
-        self.note.removeObserver(self, forKeyPath: "text")
-        self.note.removeObserver(self, forKeyPath: "title")
+        removeObservsers()
     }
     
     func configureKeyboardNotifications() {
@@ -82,14 +95,30 @@ class ComposeViewController: UIViewController {
     
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        configureNavBar()
     }
     
     func configureNavBar() {
         let tagsTitle = note.tags!.count > 0 ? "Tags (\(note.tags!.count))" : "Tags"
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: tagsTitle, style: .plain, target: self, action: #selector(tagsPressed))
+        
+        tabBarController?.navigationItem.rightBarButtonItem = UIBarButtonItem(title: tagsTitle, style: .plain, target: self, action: #selector(tagsPressed))
+        
+        guard let tabBarController = tabBarController, tabBarController.selectedIndex == 0 else { return }
+        let title = "Compose"
+        let size = title.size(attributes: navigationController?.navigationBar.titleTextAttributes)
+        let rectForTitleLabel = CGRect(origin: CGPoint.zero, size: size)
+        let titleLabel = UILabel(frame: rectForTitleLabel)
+        titleLabel.attributedText = NSAttributedString(string: title, attributes: navigationController?.navigationBar.titleTextAttributes)
+        titleLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(navBarTitleTapped(tapGesture:))))
+        titleLabel.isUserInteractionEnabled = true
+        tabBarController.navigationItem.titleView = titleLabel
     }
     
+    
+    
     func reloadTitle(offline: Bool) {
+        // make sure this VC is the one presented before modifying the title because it could be that the markdown view is presented
+        guard let tabBarController = tabBarController, tabBarController.selectedIndex == 0 else { return }
         let titleString = NSMutableAttributedString(string: "Compose" + (saving || saved ? "\n" : ""), attributes: [NSFontAttributeName: UIFont.boldSystemFont(ofSize: 17.0)])
         
         if saving || saved {
@@ -103,7 +132,9 @@ class ComposeViewController: UIViewController {
         label.numberOfLines = 0
         label.textAlignment = NSTextAlignment.center
         label.attributedText = titleString
-        self.navigationItem.titleView = label
+        label.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(navBarTitleTapped(tapGesture:))))
+        label.isUserInteractionEnabled = true
+        tabBarController.navigationItem.titleView = label
     }
     
     let NoteTitlePlaceholder = ""
@@ -120,10 +151,10 @@ class ComposeViewController: UIViewController {
     func tagsPressed() {
         let tags = self.storyboard?.instantiateViewController(withIdentifier: "Tags") as! TagsViewController
         tags.setInitialSelectedTags(tags: self.note.tags?.allObjects as! [Tag])
-        tags.selectionCompletion = { tags in
-            self.note.replaceTags(withTags: tags)
-            self.configureNavBar()
-            self.save()
+        tags.selectionCompletion = { [weak self] tags in
+            self?.note.replaceTags(withTags: tags)
+            self?.configureNavBar()
+            self?.save()
         }
 
         self.navigationController?.pushViewController(tags, animated: true)
@@ -163,6 +194,11 @@ class ComposeViewController: UIViewController {
         beginSaveTimer()
     }
     
+    func navBarTitleTapped(tapGesture: UITapGestureRecognizer) {
+        tabBarController?.selectedIndex = 1
+    }
+ 
+    
 }
 
 extension ComposeViewController : NSLayoutManagerDelegate {
diff --git a/standardnotes/MarkDownViewController.swift b/standardnotes/MarkDownViewController.swift
new file mode 100644
index 0000000..0178a39
--- /dev/null
+++ b/standardnotes/MarkDownViewController.swift
@@ -0,0 +1,87 @@
+//
+//  MarkDownViewController.swift
+//  standardnotes
+//
+//  Created by Jay Zisch on 2017/02/21.
+//  Copyright © 2017 Standard Notes. All rights reserved.
+//
+
+import UIKit
+
+class MarkDownViewController: UIViewController {
+    
+    fileprivate var markDown = Markdown()
+    weak var note: Note?
+    fileprivate var changesOccuredToNote = false
+    fileprivate var observsersAdded = false
+    
+    @IBOutlet weak var webView: UIWebView!
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        load(note: note)
+        addObservers()
+    }
+    
+    func addObservers() {
+        guard !observsersAdded else { return }
+        observsersAdded = true
+        note?.addObserver(self, forKeyPath: "text", options: [.new], context: nil)
+        note?.addObserver(self, forKeyPath: "title", options: [.new], context: nil)
+    }
+    
+    func removeObservsers() {
+        guard observsersAdded else { return }
+        observsersAdded = false
+        note?.removeObserver(self, forKeyPath: "text")
+        note?.removeObserver(self, forKeyPath: "title")
+    }
+    
+    fileprivate func configureNavBar() {
+        if let title = title{
+            let size = title.size(attributes: navigationController?.navigationBar.titleTextAttributes)
+            let rectForTitleLabel = CGRect(origin: CGPoint.zero, size: size)
+            let titleLabel = UILabel(frame: rectForTitleLabel)
+            titleLabel.attributedText = NSAttributedString(string: title, attributes: navigationController?.navigationBar.titleTextAttributes)
+            titleLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(navBarTitleTapped(tapGesture:))))
+            titleLabel.isUserInteractionEnabled = true
+            tabBarController?.navigationItem.titleView = titleLabel
+        }
+    }
+    
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        if keyPath == "text" || keyPath == "title" {
+            changesOccuredToNote = true
+        }
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        load(note: note)
+        
+    }
+    
+    override func viewDidAppear(_ animated: Bool) {
+        configureNavBar()
+    }
+    
+    func load(note: Note?) {
+        guard let note = note else { return }
+        let safeTitle = note.safeTitle()
+        let safeText = note.safeText()
+        var markDownTextWithTitle = note.safeText()
+        if safeTitle != "" {
+            markDownTextWithTitle = "#\(safeTitle)\n\n\(safeText)"
+        }
+        let html = markDown.transform(markDownTextWithTitle)
+        webView.loadHTMLString(html, baseURL: nil)
+        changesOccuredToNote = false
+    }
+    
+    deinit {
+        removeObservsers()
+    }
+    
+    func navBarTitleTapped(tapGesture: UITapGestureRecognizer) {
+        tabBarController?.selectedIndex = 0
+    }
+}
diff --git a/standardnotes/Note+CoreDataClass.swift b/standardnotes/Note+CoreDataClass.swift
index a222ad2..5acf086 100644
--- a/standardnotes/Note+CoreDataClass.swift
+++ b/standardnotes/Note+CoreDataClass.swift
@@ -52,7 +52,6 @@ public class Note: Item {
         for newTag in tags {
             newTag.dirty = true
         }
-        
         self.removeFromTags(self.tags!)
         self.addToTags(NSSet(array: tags))
     }
diff --git a/standardnotes/NotesViewController.swift b/standardnotes/NotesViewController.swift
index 596ff4c..c3c4f86 100644
--- a/standardnotes/NotesViewController.swift
+++ b/standardnotes/NotesViewController.swift
@@ -119,9 +119,14 @@ class NotesViewController: UIViewController {
     }
     
     func presentComposer(note: Note?) {
-        let compose = self.storyboard?.instantiateViewController(withIdentifier: "Compose") as! ComposeViewController
-        compose.note = note        
-        self.navigationController?.pushViewController(compose, animated: true)
+        let tabBar = self.storyboard?.instantiateViewController(withIdentifier: "Compose") as! UITabBarController
+        if let compose = tabBar.viewControllers?[0] as? ComposeViewController {
+            compose.note = note
+        }
+        if let markDown = tabBar.viewControllers?[1] as? MarkDownViewController {
+            markDown.note = note
+        }
+        self.navigationController?.pushViewController(tabBar, animated: true)
     }
     
     func reloadResults() {