Project organization and demo project changes.

tLewisII · Aug 23, 2013 · 29e75b0 · 29e75b0
1 parent fabc51e
commit 29e75b0
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 61 deletions.
diff --git a/TJLBarButtonMenu.xcodeproj/project.pbxproj b/TJLBarButtonMenu.xcodeproj/project.pbxproj
@@ -45,12 +45,12 @@
 		DB79B5B417C5AFB400173A70 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard.storyboard; sourceTree = "<group>"; };
 		DB79B5B617C5AFB400173A70 /* TJLViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TJLViewController.h; sourceTree = "<group>"; };
 		DB79B5B717C5AFB400173A70 /* TJLViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TJLViewController.m; sourceTree = "<group>"; };
-		DB79B5BE17C5B00C00173A70 /* Blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Blue.png; sourceTree = "<group>"; };
-		DB79B5BF17C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		DB79B5C017C5B00C00173A70 /* Green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Green.png; sourceTree = "<group>"; };
-		DB79B5C117C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
-		DB79B5C217C5B00C00173A70 /* Orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Orange.png; sourceTree = "<group>"; };
-		DB79B5C317C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
+		DB79B5BE17C5B00C00173A70 /* Blue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Blue.png; path = Resources/Blue.png; sourceTree = "<group>"; };
+		DB79B5BF17C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/[email protected]"; sourceTree = "<group>"; };
+		DB79B5C017C5B00C00173A70 /* Green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Green.png; path = Resources/Green.png; sourceTree = "<group>"; };
+		DB79B5C117C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/[email protected]"; sourceTree = "<group>"; };
+		DB79B5C217C5B00C00173A70 /* Orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Orange.png; path = Resources/Orange.png; sourceTree = "<group>"; };
+		DB79B5C317C5B00C00173A70 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = "Resources/[email protected]"; sourceTree = "<group>"; };
 		DB79B5CA17C5B06100173A70 /* TJLBarButtonMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TJLBarButtonMenu.h; path = Source/TJLBarButtonMenu.h; sourceTree = "<group>"; };
 		DB79B5CB17C5B06100173A70 /* TJLBarButtonMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TJLBarButtonMenu.m; path = Source/TJLBarButtonMenu.m; sourceTree = "<group>"; };
 		DB79B5CE17C5B12B00173A70 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
@@ -102,18 +102,10 @@
 		DB79B5A117C5AFB400173A70 /* TJLBarButtonMenu */ = {
 			isa = PBXGroup;
 			children = (
-				DB79B5AA17C5AFB400173A70 /* TJLAppDelegate.h */,
-				DB79B5AB17C5AFB400173A70 /* TJLAppDelegate.m */,
-				DB79B5B317C5AFB400173A70 /* MainStoryboard.storyboard */,
+				DBB8364C17C6F05900F6F43F /* App Delegate and Storyboard */,
 				DB79B5CD17C5B06500173A70 /* Source */,
-				DB79B5BE17C5B00C00173A70 /* Blue.png */,
-				DB79B5BF17C5B00C00173A70 /* [email protected] */,
-				DB79B5C017C5B00C00173A70 /* Green.png */,
-				DB79B5C117C5B00C00173A70 /* [email protected] */,
-				DB79B5C217C5B00C00173A70 /* Orange.png */,
-				DB79B5C317C5B00C00173A70 /* [email protected] */,
-				DB79B5B617C5AFB400173A70 /* TJLViewController.h */,
-				DB79B5B717C5AFB400173A70 /* TJLViewController.m */,
+				DBB8364B17C6EFEF00F6F43F /* Resources */,
+				DBB8364D17C6F06900F6F43F /* RootVC */,
 				DB79B5A217C5AFB400173A70 /* Supporting Files */,
 			);
 			path = TJLBarButtonMenu;
@@ -142,6 +134,38 @@
 			name = Source;
 			sourceTree = "<group>";
 		};
+		DBB8364B17C6EFEF00F6F43F /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				DB79B5BE17C5B00C00173A70 /* Blue.png */,
+				DB79B5BF17C5B00C00173A70 /* [email protected] */,
+				DB79B5C017C5B00C00173A70 /* Green.png */,
+				DB79B5C117C5B00C00173A70 /* [email protected] */,
+				DB79B5C217C5B00C00173A70 /* Orange.png */,
+				DB79B5C317C5B00C00173A70 /* [email protected] */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		DBB8364C17C6F05900F6F43F /* App Delegate and Storyboard */ = {
+			isa = PBXGroup;
+			children = (
+				DB79B5AA17C5AFB400173A70 /* TJLAppDelegate.h */,
+				DB79B5AB17C5AFB400173A70 /* TJLAppDelegate.m */,
+				DB79B5B317C5AFB400173A70 /* MainStoryboard.storyboard */,
+			);
+			name = "App Delegate and Storyboard";
+			sourceTree = "<group>";
+		};
+		DBB8364D17C6F06900F6F43F /* RootVC */ = {
+			isa = PBXGroup;
+			children = (
+				DB79B5B617C5AFB400173A70 /* TJLViewController.h */,
+				DB79B5B717C5AFB400173A70 /* TJLViewController.m */,
+			);
+			name = RootVC;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -341,6 +365,7 @@
 				DB79B5BD17C5AFB400173A70 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

diff --git a/TJLBarButtonMenu/Blue.png → TJLBarButtonMenu/Resources/Blue.png b/TJLBarButtonMenu/Blue.png → TJLBarButtonMenu/Resources/Blue.png
diff --git a/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected] b/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected]
diff --git a/TJLBarButtonMenu/Green.png → TJLBarButtonMenu/Resources/Green.png b/TJLBarButtonMenu/Green.png → TJLBarButtonMenu/Resources/Green.png
diff --git a/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected] b/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected]
diff --git a/TJLBarButtonMenu/Orange.png → TJLBarButtonMenu/Resources/Orange.png b/TJLBarButtonMenu/Orange.png → TJLBarButtonMenu/Resources/Orange.png
diff --git a/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected] b/TJLBarButtonMenu/[email protected] → TJLBarButtonMenu/Resources/[email protected]
diff --git a/TJLBarButtonMenu/TJLViewController.m b/TJLBarButtonMenu/TJLViewController.m
@@ -28,10 +28,9 @@ - (IBAction)showRight:(UIBarButtonItem *)sender {
             [UIImage imageNamed:@"Orange"]
     ];
     self.barMenu = [[TJLBarButtonMenu alloc]initWithView:self.view images:images buttonTitles:@[@"1", @"2", @"3"]];
-    __weak id weakSelf = self;
+
     [self.barMenu setButtonTappedBlock:^(TJLBarButtonMenu *buttonView, NSString *title) {
-        __strong id strongSelf = weakSelf;
-        [strongSelf performSegueWithIdentifier:@"segue" sender:nil];
+        NSLog(@"%@", title);
     }];
     [self.barMenu show];
 }

diff --git a/TJLBarButtonMenu/en.lproj/MainStoryboard.storyboard b/TJLBarButtonMenu/en.lproj/MainStoryboard.storyboard
@@ -30,53 +30,12 @@
                             <constraint firstItem="jPA-mf-eb0" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" type="default" id="fgO-55-6fl"/>
                         </constraints>
                     </view>
-                    <connections>
-                        <segue destination="D7k-ex-cqn" kind="modal" identifier="segue" id="Yr0-M0-NF7"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-48" y="30"/>
         </scene>
-        <!--View Controller-->
-        <scene sceneID="OcE-dL-diZ">
-            <objects>
-                <viewController id="D7k-ex-cqn" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="K6I-Lp-mr0">
-                        <rect key="frame" x="0.0" y="20" width="320" height="548"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NiI-8W-wAF">
-                                <items>
-                                    <barButtonItem title="Item" id="l8a-gW-Qqm"/>
-                                </items>
-                            </toolbar>
-                        </subviews>
-                        <color key="backgroundColor" red="0.078431375319999996" green="0.38431376220000002" blue="0.64313727620000005" alpha="1" colorSpace="deviceRGB"/>
-                        <constraints>
-                            <constraint firstItem="NiI-8W-wAF" firstAttribute="trailing" secondItem="K6I-Lp-mr0" secondAttribute="trailing" type="default" id="1BU-xA-joA"/>
-                            <constraint firstItem="NiI-8W-wAF" firstAttribute="leading" secondItem="K6I-Lp-mr0" secondAttribute="leading" type="default" id="Bcw-3f-v32"/>
-                            <constraint firstItem="NiI-8W-wAF" firstAttribute="top" secondItem="K6I-Lp-mr0" secondAttribute="top" type="default" id="nim-Eo-1Le"/>
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="okf-KG-fcA" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="378" y="30"/>
-        </scene>
     </scenes>
-    <classes>
-        <class className="NSLayoutConstraint" superclassName="NSObject">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/NSLayoutConstraint.h"/>
-        </class>
-        <class className="TJLViewController" superclassName="UIViewController">
-            <source key="sourceIdentifier" type="project" relativePath="./Classes/TJLViewController.h"/>
-            <relationships>
-                <relationship kind="action" name="showLeft:" candidateClass="UIBarButtonItem"/>
-                <relationship kind="action" name="showRight:" candidateClass="UIBarButtonItem"/>
-            </relationships>
-        </class>
-    </classes>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>