Change screen transition for iPhone.

Change to detail view when note is selected.

diff --git a/iOS/Tombo/Tombo/DetailViewController.m b/iOS/Tombo/Tombo/DetailViewController.m
index 0ae33a7..5b0690d 100644 (file)
--- a/iOS/Tombo/Tombo/DetailViewController.m
+++ b/iOS/Tombo/Tombo/DetailViewController.m
@@ -24,12 +24,19 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-       // Do any additional setup after loading the view.
+    
+    NSString *note = [Storage load:self.item.path];
+    if (note == nil) {
+        self.text.text = @"";
+    } else {
+        self.text.text = note;
+    }
 }
 
 - (void)viewDidUnload
 {
     [self setText:nil];
+    [self setText:nil];
     [super viewDidUnload];
     // Release any retained subviews of the main view.
 }
@@ -53,11 +60,14 @@
     if (item.isNewItem) {
         self.text.text = @"";
     } else {
-        NSString *note = [Storage load:item.path];
-        if (note == nil) {
-            self.text.text = @"";
-        } else {
-            self.text.text = note;
+        // On iPhone and call by segue, self.text is nil because view is not loaded yet.
+        if (self.text) {
+            NSString *note = [Storage load:item.path];
+            if (note == nil) {
+                self.text.text = @"";
+            } else {
+                self.text.text = note;
+            }
         }
     }
     _item = item;

diff --git a/iOS/Tombo/Tombo/MasterViewController.m b/iOS/Tombo/Tombo/MasterViewController.m
index 3932a6d..7c12436 100644 (file)
--- a/iOS/Tombo/Tombo/MasterViewController.m
+++ b/iOS/Tombo/Tombo/MasterViewController.m
@@ -267,8 +267,6 @@
     } else {
         if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
             self.detailViewController.item = item;
-        } else {
-            [self performSegueWithIdentifier:@"editNote" sender:self];
         }
     }
 }
@@ -287,6 +285,13 @@
         FileItem *item = [_objects objectAtIndex:indexPath.row];
         edit.detailItem = item;
         edit.delegate = self;
+    } else if ([[segue identifier] isEqualToString:@"showNote"]) {
+        DetailViewController *detail = [segue destinationViewController];
+        self.detailViewController = detail;
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        FileItem *item = [_objects objectAtIndex:indexPath.row];
+        detail.item = item;
+        detail.master = self;
     }
 }
 

diff --git a/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPad.storyboard b/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPad.storyboard
index dc63205..f652f97 100644 (file)
--- a/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPad.storyboard
+++ b/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPad.storyboard
@@ -157,7 +157,7 @@
                     </connections>
                 </viewController>
             </objects>
-            <point key="canvasLocation" x="1994" y="490"/>
+            <point key="canvasLocation" x="3354" y="-494"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="50">
@@ -190,7 +190,7 @@
                     </connections>
                 </navigationController>
             </objects>
-            <point key="canvasLocation" x="1025" y="-494"/>
+            <point key="canvasLocation" x="2029" y="-494"/>
         </scene>
     </scenes>
     <classes>
@@ -218,6 +218,6 @@
         <simulatedScreenMetrics key="destination"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="Kjf-1o-2Ik"/>
+        <segue reference="pK5-mO-z6F"/>
     </inferredMetricsTieBreakers>
 </document>
\ No newline at end of file

diff --git a/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPhone.storyboard b/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPhone.storyboard
index ade9701..00a3d0d 100644 (file)
--- a/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPhone.storyboard
+++ b/iOS/Tombo/Tombo/en.lproj/MainStoryboard_iPhone.storyboard
@@ -49,6 +49,9 @@
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <connections>
+                                    <segue destination="6do-Ku-KAw" kind="push" identifier="showNote" id="DbI-0p-xOL"/>
+                                </connections>
                             </tableViewCell>
                         </prototypes>
                         <sections/>
@@ -64,13 +67,45 @@
                             </connections>
                         </barButtonItem>
                     </navigationItem>
-                    <connections>
-                        <segue destination="7bR-lH-lJ9" kind="modal" identifier="editNote" id="aht-5S-Kxw"/>
-                    </connections>
                 </tableViewController>
             </objects>
             <point key="canvasLocation" x="459" y="64"/>
         </scene>
+        <!--Detail View Controller-->
+        <scene sceneID="3lH-GX-fIb">
+            <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="cIX-zs-I45" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <viewController id="6do-Ku-KAw" customClass="DetailViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="qW1-9A-BDd">
+                        <rect key="frame" x="0.0" y="64" width="320" height="416"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="crV-57-ylY">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="416"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                <dataDetectorType key="dataDetectorTypes" link="YES"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="MC6-er-cO2">
+                        <barButtonItem key="rightBarButtonItem" systemItem="edit" id="BTM-H8-OPn">
+                            <connections>
+                                <segue destination="7bR-lH-lJ9" kind="modal" identifier="editNote" id="g14-rF-OtD"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="text" destination="crV-57-ylY" id="HD7-qX-vzI"/>
+                    </connections>
+                </viewController>
+            </objects>
+            <point key="canvasLocation" x="1005" y="-516"/>
+        </scene>
         <!--Edit View Controller-->
         <scene sceneID="bJI-fW-9UV">
             <objects>
@@ -107,7 +142,7 @@
                     </connections>
                 </viewController>
             </objects>
-            <point key="canvasLocation" x="1350" y="64"/>
+            <point key="canvasLocation" x="2021" y="64"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="a6N-vh-sA4">
@@ -125,15 +160,34 @@
                     </connections>
                 </navigationController>
             </objects>
-            <point key="canvasLocation" x="891" y="64"/>
+            <point key="canvasLocation" x="1561" y="64"/>
         </scene>
     </scenes>
+    <classes>
+        <class className="DetailViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/DetailViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="text" candidateClass="UITextView"/>
+            </relationships>
+        </class>
+        <class className="EditViewController" superclassName="UIViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/EditViewController.h"/>
+            <relationships>
+                <relationship kind="action" name="cancel:"/>
+                <relationship kind="action" name="done:"/>
+                <relationship kind="outlet" name="detailText" candidateClass="UITextView"/>
+            </relationships>
+        </class>
+        <class className="MasterViewController" superclassName="UITableViewController">
+            <source key="sourceIdentifier" type="project" relativePath="./Classes/MasterViewController.h"/>
+        </class>
+    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination"/>
     </simulatedMetricsContainer>
     <inferredMetricsTieBreakers>
-        <segue reference="aht-5S-Kxw"/>
+        <segue reference="g14-rF-OtD"/>
     </inferredMetricsTieBreakers>
-</document>
+</document>
\ No newline at end of file