Change screen transition for iPhone.

[tombo/Tombo.git] / iOS / Tombo / Tombo / DetailViewController.m

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;