lanekit 0.3.5 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBjMDYxZWZiNDI0NmIzNGNkODNlMjhhNzRjZmUyYTU3MzU2MjM1Mg==
+    ZTU2MzMwNGYzZDE3YWVjZTI4MWVkZTNiZjg3ZGNiMDI4NmFiZDgyNQ==
   data.tar.gz: !binary |-
-    ZTdiNGU4NGQxMTFhNjg3OTA0MTc3MjI0YzI5MTU5N2Q1OGI1NjE3Nw==
+    MWI2ZGUxZjc5YzEyYTc3MTYwNzkxZjgxNzQ0NjVkM2NiNzNiZDAxZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTRhZmUxYzIzOTViODgxMmRjMWRjYTA4ZTlhZDFhNmE0NTgwMDQzMjExZDJk
-    ZDg3ZDE2N2FkY2NjZWE1NTBmMDg4MjE4ZDRlNjNlOTk1OTNmMmQ1ZmZkODIz
-    YzU1MjllMjk2MzU0NWFmNjZjMWIyZWIwOTVkMDU5MmMyMWZhN2I=
+    ODJhMmMzNDJiN2MxZTY2NTQ5ZWM2Y2U4YWIxODZiNTg4OTg0NzBhMDMxYmVh
+    YWRkNTlmYzUxZGE0ZTFlODY4NmYxOWRiYzMwZDI2ODNmZTRkNjU2ZWRjYmQ5
+    ZTJjOTNjNzE0NWYzNWIxMDhkMjc4YjE5N2Y3OWMwODdhNTM3Y2U=
   data.tar.gz: !binary |-
-    NzlmOGM3ZmVkZjEzZTVlYjgxYmRkM2QzNjEyODdhZTc5MDY1NjJjMWUxYmI2
-    YWRmNTUyOWFmYmY3N2RhZGU1ODVjZjdkYTBhZDg0NWE3YjFjZDY2Njc0NzU3
-    MDZmZDdhODQ3OGRhYTJlNWI2ZjcxMjU5NjgxZDhjZmViYWVhMjI=
+    NzE3ODIyNWU1ZTRiNWE4YzliNzVhNGI2MDg0NGQ4MTlkMGZmYzNkYzE1NjBh
+    Nzc1NWQ3ZDg0ZmRhYWJjODYzYjQ5YWZlYmFiZmE4NTQ2ZmFlY2M1M2Q5NTUy
+    YTkxOTYzNjEyODc0YjhmZTc0MTAzNzZhY2Y5NzUwMTkyODExNGE=

data/README.md

@@ -3,14 +3,14 @@
 [![Gem Version](https://badge.fury.io/rb/lanekit.png)](http://badge.fury.io/rb/lanekit)
 
 LaneKit is an iOS Objective-C code generator for integration with [RestKit](https://github.com/RestKit/RestKit). It generates
-models, resource providers, and full iOS apps with mimimal effort. There is support for unit testing with SenTestingKit
+models, resource providers, table views, and full iOS apps with mimimal effort. There is support for unit testing with SenTestingKit
 including fixtures and tests. LaneKit is a command line app written in Ruby and packaged as a Ruby Gem.
 
 - [Source code for LaneKit](https://github.com/LarryAasen/LaneKit/zipball/master) from [GitHub](http://github.com).
 - Questions? [Stack Overflow](http://stackoverflow.com/questions/tagged/lanekit) is the best place to find answers.
 
 ## Benefits
-* properly implemented models and resource providers
+* properly implemented models, resource providers, and table views
 * easy integration with RestKit
 * consistent Objective-C code
 * unit tests with OCUnit (SenTestingKit)
@@ -276,10 +276,22 @@ and here is a unit test that was generated in Models/VideoTest.m by LaneKit:
     Integrating client project
     clean  /Users/larry/Projects/lanekit/SportsFrames/SportsFrames.xcworkspace
 
+### Add a new UITableViewController called ContentsViewController
+This will display the Contents model that is a list of videos.
+
+    $ lanekit generate tableviewcontroller Contents -r LKFeedCell
+
+    create  SportsFrames/SportsFrames/Controllers/ContentsViewController.h
+    create  SportsFrames/SportsFrames/Controllers/ContentsViewController.m
+    create  SportsFrames/SportsFrames/Views/LKFeedCell.h
+    create  SportsFrames/SportsFrames/Views/LKFeedCell.m
+
 ### Add the [Urban Airship](https://github.com/urbanairship/ios-library) CocoaPods Pod to the project.
 
     $ lanekit generate pod UrbanAirship-iOS-SDK
 
+    Installing UrbanAirship-iOS-SDK (3.0.1)
+
 ### Sample App
 The SportsFrames app is a fully functional sample app using RestKit created to demonstrate the use of LaneKit in a real world app. It
 has models and resource providers that are generated from LaneKit.

data/lib/lanekit/generate/model.rb

@@ -22,6 +22,7 @@ module LaneKit
         
         @attributes = []
         @any_relationships = false
+        @first_string_attribute = nil
         
         attributes.each {|attribute|
           name, type, relationship = attribute.split(":")
@@ -37,6 +38,7 @@ module LaneKit
             :unit_test_assert => LaneKit.objective_c_type_unit_test_assert(@model_name, name, type)
           }
           @any_relationships = relationship ? true : @any_relationships
+          @first_string_attribute = name if !@first_string_attribute && type == 'string'
         }
         
         @lanefile = LaneKit::Lanefile.new

data/lib/lanekit/generate/provider.rb

@@ -46,9 +46,9 @@ module LaneKit
         @provider_base_file_name = "LKResourceProvider"
   
         @provider_file_name = @provider_name
-        
-        @providers_folder  = "#{@lanefile.app_project_name}/#{@lanefile.app_project_name}/Controllers"
-        @controllers_group = "#{@lanefile.app_project_name}/Controllers"
+
+        @providers_folder = LaneKit.controllers_folder(@lanefile)
+        @controllers_group = LaneKit.controllers_group(@lanefile)
       end
 
       def create_provider_folders

data/lib/lanekit/generate/tableviewcontroller.rb

@@ -0,0 +1,110 @@
+module LaneKit
+  class Generate
+    
+    include Thor::Actions
+
+    desc "tableviewcontroller MODEL_NAME [-r LKFeedCell]", "Generates an Objective-C UITableViewController"
+    long_desc <<-LONGDESC
+    Generates the Objective-C code for a UITableViewController.\n
+    MODEL_NAME: the name of the model used to supply data to the controller. Will create <MODEL_NAME>ViewController class.\n
+    -r LKFeedCell: register the LKFeedCell class as the class for use in creating new table cells.
+    LONGDESC
+    option :register, :required => false, :aliases => "-r", :banner => "register the LKFeedCell class as the class for use in creating new table cells"
+    def tableviewcontroller(model_name)
+      @using_core_data = options[:use_core_data]
+      @register_class = options[:register]
+      
+      error = self.validate_register_class(@register_class)
+      if error
+        say error, :red
+        return
+      end
+
+      @model_name = LaneKit.derive_model_name(model_name)
+      @lanefile = LaneKit::Lanefile.new
+      lanefile_error = LaneKit.validate_lanefile(@lanefile)
+      if lanefile_error
+        say lanefile_error, :red
+        return
+      end
+      @app_project_path = @lanefile.app_project_path
+
+      self.initialize_tvc
+      self.create_tvc_files
+      self.create_register_files
+    end
+      
+    no_commands do
+
+      def initialize_tvc
+        @model_class_name = LaneKit.derive_class_name(@model_name)
+        @model_file_name = LaneKit.derive_file_name(@model_name)
+        @controller_class_name = "#{LaneKit.derive_class_name(@model_name)}ViewController"
+        @provider_class_name = "#{LaneKit.derive_class_name(@model_name)}Provider"
+        @provider_file_name = @provider_class_name
+        @controller_file_name = @controller_class_name
+        @controllers_folder = LaneKit.controllers_folder(@lanefile)
+        @controllers_group = LaneKit.controllers_group(@lanefile)
+        @views_folder = LaneKit.views_folder(@lanefile)
+        @views_group = LaneKit.views_group(@lanefile)
+
+        if !@register_class
+          @register_class = "UITableViewCell"
+        end
+      end
+      
+      def validate_register_class(class_name)
+        if class_name
+          if class_name.length < 2
+            return "class name must be at least two characters long"
+          elsif class_name.include? " "
+            return "class name cannot include spaces"
+          elsif class_name != "LKFeedCell"
+            return "class name must be LKFeedCell"
+          end
+        end
+        return nil
+      end
+  
+      def create_tvc_files
+        # 1) Create the table view controller
+        # Create the .h file
+        source = "tvc.h.erb"
+        target_file = "#{@controller_file_name}.h"
+        target = File.join(@controllers_folder, target_file)
+        template(source, target, @@template_opts)
+
+        LaneKit.add_file_to_project("Controllers/"+target_file, @controllers_group, @app_project_path)
+  
+        # Create the .m file
+        source = "tvc.m.erb"
+        target_file = "#{@controller_file_name}.m"
+        target = File.join(@controllers_folder, target_file)
+        template(source, target, @@template_opts)
+
+        LaneKit.add_file_to_project("Controllers/"+target_file, @controllers_group, @app_project_path, "@all")
+      end
+      
+      def create_register_files
+        return if @register_class != "LKFeedCell"
+
+        # 1) Create the LKFeedCell class in the Views group
+        # Create the .h file
+        source = "#{@register_class}.h.erb"
+        target_file = "#{@register_class}.h"
+        target = File.join(@views_folder, target_file)
+        template(source, target, @@template_opts)
+
+        LaneKit.add_file_to_project("Views/"+target_file, @views_group, @app_project_path)
+
+        # Create the .m file
+        source = "#{@register_class}.m.erb"
+        target_file = "#{@register_class}.m"
+        target = File.join(@views_folder, target_file)
+        template(source, target, @@template_opts)
+
+        LaneKit.add_file_to_project("Views/"+target_file, @views_group, @app_project_path, "@all")
+      end
+    end
+  end
+end

data/lib/lanekit/generate.rb

@@ -38,6 +38,7 @@ class LaneKit::Generate < Thor
 
   require 'lanekit/generate/model'
   require 'lanekit/generate/provider'
+  require 'lanekit/generate/tableviewcontroller'
   require 'lanekit/generate/urbanairship'
 
   class_option :use_core_data, :type => :boolean, :default => false, :banner => "generate code compatible with Core Data (the default is false)", :aliases => "-c"     # option --use_core_data=true

data/lib/lanekit/version.rb

@@ -1,3 +1,3 @@
 module LaneKit
-  VERSION = "0.3.5"
+  VERSION = "0.4.1"
 end

data/lib/lanekit.rb

@@ -234,6 +234,21 @@ module LaneKit
     end
   end
 
+  def self.controllers_folder(lanefile)
+    "#{lanefile.app_project_name}/#{lanefile.app_project_name}/Controllers"
+  end
+
+  def self.controllers_group(lanefile)
+    "#{lanefile.app_project_name}/Controllers"
+  end
+
+  def self.views_folder(lanefile)
+    "#{lanefile.app_project_name}/#{lanefile.app_project_name}/Views"
+  end
+
+  def self.views_group(lanefile)
+    "#{lanefile.app_project_name}/Views"
+  end
 end
 
 module LaneKit

data/lib/template/LKFeedCell.h.erb

@@ -0,0 +1,16 @@
+//
+//  <%=@register_class%>.h
+//
+//  This model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import <UIKit/UIKit.h>
+
+@interface <%=@register_class%> : UITableViewCell
+
++ (CGFloat)cellHeight;
+
+@end

data/lib/template/LKFeedCell.m.erb

@@ -0,0 +1,148 @@
+//
+//  <%=@register_class%>.m
+//
+//  This model was created on <%=config[:generate_date]%> by LaneKit v<%=config[:lanekit_version]%>.
+//
+// The following LaneKit command was used to generate this file:
+// <%=config[:command]%>
+//
+
+#import "<%=@register_class%>.h"
+#import <QuartzCore/CALayer.h>
+#import <QuartzCore/CAGradientLayer.h>
+
+static CGFloat cellHeight = 178;
+
+static CGFloat contentMarginTop = 5;
+static CGFloat contentMarginRight = 5;
+static CGFloat contentMarginBottom = 5;
+static CGFloat contentMarginLeft = 5;
+
+static CGFloat textMarginRight = 15;
+static CGFloat textMarginBottom = 10;
+static CGFloat textMarginLeft = 15;
+
+@interface <%=@register_class%> ()
+{
+  CAGradientLayer *gradientLayer;
+  UIView *overlayContainer;
+}
+
+-(void)addOverlayToView1:(UIView *)view;
+-(void)addOverlayToView2:(UIView *)view;
+
+@end
+
+@implementation <%=@register_class%>
+
++ (CGFloat)cellHeight
+{
+  return cellHeight;
+}
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
+    if (self) {
+      self.imageView.contentMode = UIViewContentModeScaleAspectFit;
+
+      self.textLabel.backgroundColor = [UIColor clearColor];
+      self.textLabel.textColor = [UIColor whiteColor];
+      self.textLabel.font = [UIFont boldSystemFontOfSize:14];
+      self.textLabel.numberOfLines = 0;
+    }
+    return self;
+}
+
+- (void)makeTopSubview:(UIView *)view
+{
+  UIView *superview = [view superview];
+  [view removeFromSuperview];
+  [superview addSubview:view];
+}
+
+- (void)makeTopSubview
+{
+  [self makeTopSubview:self];
+}
+
+- (void)layoutSubviews
+{
+  [super layoutSubviews];
+
+  CGRect bounds = [self bounds];
+  bounds.origin.x = contentMarginLeft;
+  bounds.origin.y = contentMarginTop;
+  bounds.size.width  -= contentMarginRight + contentMarginLeft;
+  bounds.size.height -= contentMarginTop + contentMarginBottom;
+  [self.contentView setFrame:bounds];
+
+  if (self.imageView)
+  {
+    CGRect imageFrame = self.imageView.frame;
+    imageFrame.size = bounds.size;
+    imageFrame.size.width -= 10;
+    imageFrame.origin.x = (bounds.size.width - imageFrame.size.width) / 2.0;
+    imageFrame.origin.y = 0;
+    self.imageView.frame = CGRectIntegral(imageFrame);
+    
+    self.imageView.layer.cornerRadius = 5;
+    self.imageView.layer.masksToBounds= YES;
+    
+    [self addOverlayToView1:self.imageView];
+  }
+  
+  CGRect textFrame = self.textLabel.frame;
+  textFrame.size.width  = bounds.size.width - (textMarginRight + textMarginLeft);
+  textFrame.size.height = 100;
+  textFrame.origin.x = textMarginRight;
+  self.textLabel.frame = textFrame;
+  [self.textLabel sizeToFit];
+
+  textFrame = self.textLabel.frame;
+  textFrame.origin.y = bounds.size.height - textFrame.size.height - textMarginBottom;
+  self.textLabel.frame = textFrame;
+
+  [self makeTopSubview:self.textLabel];
+}
+
+-(void)addOverlayToView1:(UIView *)view
+{
+  if (!gradientLayer)
+  {
+    gradientLayer = [CAGradientLayer layer];
+    [view.layer addSublayer:gradientLayer];
+  }
+  
+  CGRect frame = view.bounds;
+  frame.size.height = frame.size.height / 2;
+  frame.origin.y = frame.size.height;
+  gradientLayer.frame = CGRectIntegral(frame);
+  
+  gradientLayer.colors = [NSArray arrayWithObjects:
+                          (id)[UIColor colorWithWhite:1.0f alpha:0.0f].CGColor,
+                          (id)[UIColor colorWithWhite:0.0f alpha:0.3f].CGColor,
+                          (id)[UIColor colorWithWhite:0.0f alpha:0.7f].CGColor,
+                          nil];
+
+  gradientLayer.locations = @[[NSNumber numberWithFloat:0.25f], [NSNumber numberWithFloat:0.5f], [NSNumber numberWithFloat:0.7f]];
+  
+  gradientLayer.borderWidth = 0;
+}
+
+-(void)addOverlayToView2:(UIView *)view
+{
+  if (!overlayContainer)
+  {
+    overlayContainer = [[UIView alloc] initWithFrame:view.bounds];
+    overlayContainer.backgroundColor = [UIColor clearColor];
+
+    CAGradientLayer *gradient = [CAGradientLayer layer];
+    gradient.frame = overlayContainer.bounds;
+    gradient.colors = @[(id)[[UIColor blackColor] CGColor], (id)[[UIColor clearColor] CGColor]];
+    [overlayContainer.layer insertSublayer:gradient atIndex:0];
+    [view addSubview:overlayContainer];
+  }
+}
+
+@end

data/lib/template/lanekit-ios-project/lanekit-ios-project/lanekit-ios-project/Controllers/LKAppDelegate.m

@@ -8,12 +8,10 @@
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  // Override point for customization after application launch.
-  if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
-    UISplitViewController *splitViewController = (UISplitViewController *)self.window.rootViewController;
-    UINavigationController *navigationController = [splitViewController.viewControllers lastObject];
-    splitViewController.delegate = (id)navigationController.topViewController;
-  }
+  UIViewController *controller = UIViewController.new;
+  [(UINavigationController *)self.window.rootViewController pushViewController:controller animated:NO];
+  controller.navigationItem.title = @"lanekit-ios-project";
+
   return YES;
 }
 

data/lib/template/lanekit-ios-project/lanekit-ios-project/lanekit-ios-project/Resources/Base.lproj/Main_iPad.storyboard

@@ -1,120 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="vC3-pB-5Vb">
     <dependencies>
         <deployment defaultVersion="1536" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/>
     </dependencies>
     <scenes>
-        <!--Navigation Controller-->
-        <scene sceneID="pY4-Hu-kfo">
-            <objects>
-                <navigationController id="RMx-3f-FxP" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="7bK-jq-Zjz" kind="relationship" relationship="rootViewController" id="tsl-Nk-0bq"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="8fS-aE-onr" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="448" y="-630"/>
-        </scene>
-        <!--Detail View Controller - Detail-->
-        <scene sceneID="yUG-lL-AsK">
-            <objects>
-                <viewController title="Detail" id="JEX-9P-axG" customClass="LKDetailViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="8wd-7d-mFo"/>
-                        <viewControllerLayoutGuide type="bottom" id="gMh-B7-yhi"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="svH-Pt-448">
-                        <rect key="frame" x="0.0" y="0.0" width="703" height="768"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" text="Detail view content goes here" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="0XM-y9-sOw">
-                                <rect key="frame" x="20" y="376" width="663" height="17"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <fontDescription key="fontDescription" type="system" size="system"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="0XM-y9-sOw" firstAttribute="leading" secondItem="svH-Pt-448" secondAttribute="leading" constant="20" symbolic="YES" id="Tsc-yG-G1q"/>
-                            <constraint firstItem="0XM-y9-sOw" firstAttribute="centerY" secondItem="svH-Pt-448" secondAttribute="centerY" id="jWN-iV-94e"/>
-                            <constraint firstAttribute="trailing" secondItem="0XM-y9-sOw" secondAttribute="trailing" constant="20" symbolic="YES" id="tHV-ZD-HQj"/>
-                        </constraints>
-                        <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-                    </view>
-                    <toolbarItems/>
-                    <navigationItem key="navigationItem" title="Detail" id="mOI-FS-AaM"/>
-                    <connections>
-                        <outlet property="detailDescriptionLabel" destination="0XM-y9-sOw" id="deQ-Na-JPF"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="FJe-Yq-33r" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="448" y="248"/>
-        </scene>
-        <!--Split View Controller-->
-        <scene sceneID="Nki-YV-4Qg">
-            <objects>
-                <splitViewController id="H1p-Uh-vWS" sceneMemberID="viewController">
-                    <toolbarItems/>
-                    <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
-                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-                    <connections>
-                        <segue destination="RMx-3f-FxP" kind="relationship" relationship="masterViewController" id="BlO-5A-QYV"/>
-                        <segue destination="vC3-pB-5Vb" kind="relationship" relationship="detailViewController" id="Tll-UG-LXB"/>
-                    </connections>
-                </splitViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="cZU-Oi-B1e" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-687" y="-630"/>
-        </scene>
-        <!--Master View Controller - Master-->
-        <scene sceneID="smW-Zh-WAh">
-            <objects>
-                <tableViewController title="Master" clearsSelectionOnViewWillAppear="NO" id="7bK-jq-Zjz" customClass="LKMasterViewController" sceneMemberID="viewController">
-                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="r7i-6Z-zg0">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="768"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                        <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-                        <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="Arm-wq-HPj" style="IBUITableViewCellStyleDefault" id="WCw-Qf-5nD">
-                                <rect key="frame" x="0.0" y="86" width="320" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WCw-Qf-5nD" id="ydd-e1-P1g">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Arm-wq-HPj">
-                                            <rect key="frame" x="15" y="0.0" width="290" height="43"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="20"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <color key="highlightedColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            </tableViewCell>
-                        </prototypes>
-                        <sections/>
-                        <connections>
-                            <outlet property="dataSource" destination="7bK-jq-Zjz" id="Gho-Na-rnu"/>
-                            <outlet property="delegate" destination="7bK-jq-Zjz" id="RA6-mI-bju"/>
-                        </connections>
-                    </tableView>
-                    <navigationItem key="navigationItem" title="Master" id="Zdf-7t-Un8"/>
-                </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="Rux-fX-hf1" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="859" y="-631"/>
-        </scene>
         <!--Navigation Controller-->
         <scene sceneID="r7l-gg-dq7">
             <objects>
@@ -122,13 +12,10 @@
                     <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="DjV-YW-jjY">
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
-                    <connections>
-                        <segue destination="JEX-9P-axG" kind="relationship" relationship="rootViewController" id="GKi-kA-LjT"/>
-                    </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="SLD-UC-DBI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-366" y="248"/>
+            <point key="canvasLocation" x="-1074" y="-1548"/>
         </scene>
     </scenes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">