Skip to content

Commit

Permalink
Merge branch 'master' of github.com:johnlabarge/modevhackathon
Browse files Browse the repository at this point in the history
  • Loading branch information
pauls committed Apr 21, 2012
2 parents e5d43dc + 0afd62b commit d4ce78c
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 1 deletion.
8 changes: 8 additions & 0 deletions thankxBuddyApp.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
7280D481154342EC00D47AC5 /* mainbg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7280D47F154342EC00D47AC5 /* mainbg@2x.png */; };
7280D4851543562700D47AC5 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7280D4831543562700D47AC5 /* DetailViewController.m */; };
7280D4861543562700D47AC5 /* DetailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7280D4841543562700D47AC5 /* DetailViewController.xib */; };
7280D48D15435D3500D47AC5 /* header.png in Resources */ = {isa = PBXBuildFile; fileRef = 7280D48B15435D3500D47AC5 /* header.png */; };
7280D48E15435D3500D47AC5 /* header@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7280D48C15435D3500D47AC5 /* header@2x.png */; };
72B050B1154312CF00A9661F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B050B0154312CF00A9661F /* UIKit.framework */; };
72B050B3154312CF00A9661F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B050B2154312CF00A9661F /* Foundation.framework */; };
72B050B5154312CF00A9661F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72B050B4154312CF00A9661F /* CoreGraphics.framework */; };
Expand Down Expand Up @@ -132,6 +134,8 @@
7280D4821543562700D47AC5 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailViewController.h; sourceTree = "<group>"; };
7280D4831543562700D47AC5 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailViewController.m; sourceTree = "<group>"; };
7280D4841543562700D47AC5 /* DetailViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetailViewController.xib; sourceTree = "<group>"; };
7280D48B15435D3500D47AC5 /* header.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = header.png; sourceTree = "<group>"; };
7280D48C15435D3500D47AC5 /* header@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "header@2x.png"; sourceTree = "<group>"; };
72B050AC154312CF00A9661F /* thankxBuddyApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = thankxBuddyApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
72B050B0154312CF00A9661F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
72B050B2154312CF00A9661F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -284,6 +288,8 @@
72B050DB154312E400A9661F /* images */ = {
isa = PBXGroup;
children = (
7280D48B15435D3500D47AC5 /* header.png */,
7280D48C15435D3500D47AC5 /* header@2x.png */,
7280D47E154342EC00D47AC5 /* mainbg.png */,
7280D47F154342EC00D47AC5 /* mainbg@2x.png */,
722E023B15433A3500673BE2 /* 116-controller.png */,
Expand Down Expand Up @@ -417,6 +423,8 @@
7280D480154342EC00D47AC5 /* mainbg.png in Resources */,
7280D481154342EC00D47AC5 /* mainbg@2x.png in Resources */,
7280D4861543562700D47AC5 /* DetailViewController.xib in Resources */,
7280D48D15435D3500D47AC5 /* header.png in Resources */,
7280D48E15435D3500D47AC5 /* header@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
Binary file modified ...codeproj/project.xcworkspace/xcuserdata/bs5846.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
8 changes: 7 additions & 1 deletion thankxBuddyApp/ModevUXAppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@

#import <UIKit/UIKit.h>

@interface ModevUXAppDelegate : UIResponder <UIApplicationDelegate, UITabBarControllerDelegate>
@interface ModevUXAppDelegate : UIResponder <UIApplicationDelegate, UITabBarControllerDelegate> {
UINavigationController *navigationController;
UITabBarController *tabBarController;

}

@property (strong, nonatomic) UIWindow *window;

@property (strong, nonatomic) UITabBarController *tabBarController;

@property (nonatomic, retain) IBOutlet UINavigationController *navigationController;

@end
1 change: 1 addition & 0 deletions thankxBuddyApp/ModevUXFirstViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ - (void)fetchedData:(NSData *)responseData {
options:kNilOptions
error:&error];


}

#pragma mark - Table view data source
Expand Down
Binary file added thankxBuddyApp/header.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added thankxBuddyApp/header@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d4ce78c

Please sign in to comment.