yetangitu/photo-ios
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing crashes when clicking camera

Browse source
This commit is contained in:
Patrick Santana 2013-03-14 10:55:57 +01:00
parent 7d3318cf70
commit 38e0327bb8
5 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Photo/AlbumViewController.m
View file

@ -65,7 +65,7 @@
UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ; UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ;
[buttonRight setImage:buttonRightImage forState:UIControlStateNormal]; [buttonRight setImage:buttonRightImage forState:UIControlStateNormal];
buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height); buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height);
[buttonRight addTarget:self action:@selector(capturePhoto) forControlEvents:UIControlEventTouchUpInside]; [buttonRight addTarget:self action:@selector(openCamera:) forControlEvents:UIControlEventTouchUpInside];
UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight]; UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight];
self.navigationItem.rightBarButtonItem = customRightButton; self.navigationItem.rightBarButtonItem = customRightButton;
@ -94,6 +94,10 @@
} }
} }
- (void) openCamera:(id) sender
{
[(MenuViewController*)self.viewDeckController.leftController openCamera:sender];
}
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
{ {

12
Photo/AppDelegate.m
View file

@ -48,6 +48,11 @@ static const NSInteger kGANDispatchPeriodSec = 10;
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{ {
#ifdef TEST_FLIGHT_ENABLED
// to start the TestFlight SDK
[TestFlight takeOff:@"5713cf3e-f49b-4f0d-ba14-88958f16ec08"];
#endif
#ifdef GOOGLE_ANALYTICS_ENABLED #ifdef GOOGLE_ANALYTICS_ENABLED
// Google Analytics SDK // Google Analytics SDK
// Initialize Google Analytics // Initialize Google Analytics
@ -61,18 +66,13 @@ static const NSInteger kGANDispatchPeriodSec = 10;
[TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]]; [TestFlight setDeviceIdentifier:[[UIDevice currentDevice] uniqueIdentifier]];
#endif #endif
#ifdef TEST_FLIGHT_ENABLED
// to start the TestFlight SDK
[TestFlight takeOff:@"407f45aed7c5bc2fc88cb567078edb1f_MjMyNTUyMDExLTA5LTEyIDEyOjEyOjU3Ljc1Nzg5MA"];
#endif
[self prepareConnectionInformation]; [self prepareConnectionInformation];
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch. // Override point for customization after application launch.
self.window.backgroundColor = [UIColor whiteColor]; self.window.backgroundColor = [UIColor whiteColor];
self.menuController = [[MenuViewController alloc] initWithNibName:@"MenuViewController" bundle:nil]; self.menuController = [[MenuViewController alloc] init];
HomeTableViewController *centerController = [[HomeTableViewController alloc] init]; HomeTableViewController *centerController = [[HomeTableViewController alloc] init];
self.centerController = [[UINavigationController alloc] initWithRootViewController:centerController]; self.centerController = [[UINavigationController alloc] initWithRootViewController:centerController];

7
Photo/GalleryViewController.m
View file

@ -66,7 +66,7 @@ const NSInteger kNumberOfCells = 10;
UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ; UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ;
[buttonRight setImage:buttonRightImage forState:UIControlStateNormal]; [buttonRight setImage:buttonRightImage forState:UIControlStateNormal];
buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height); buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height);
[buttonRight addTarget:self action:@selector(capturePhoto) forControlEvents:UIControlEventTouchUpInside]; [buttonRight addTarget:self action:@selector(openCamera:) forControlEvents:UIControlEventTouchUpInside];
UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight]; UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight];
self.navigationItem.rightBarButtonItem = customRightButton; self.navigationItem.rightBarButtonItem = customRightButton;
@ -95,6 +95,11 @@ const NSInteger kNumberOfCells = 10;
self.quiltView.backgroundColor = [[UIColor alloc] initWithPatternImage:backgroundImage]; self.quiltView.backgroundColor = [[UIColor alloc] initWithPatternImage:backgroundImage];
} }
- (void) openCamera:(id) sender
{
[(MenuViewController*)self.viewDeckController.leftController openCamera:sender];
}
- (void)didReceiveMemoryWarning - (void)didReceiveMemoryWarning
{ {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];

7
Photo/TagViewController.m
View file

@ -121,7 +121,7 @@
UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ; UIImage *buttonRightImage = [UIImage imageNamed:@"button-navigation-camera.png"] ;
[buttonRight setImage:buttonRightImage forState:UIControlStateNormal]; [buttonRight setImage:buttonRightImage forState:UIControlStateNormal];
buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height); buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height);
[buttonRight addTarget:self action:@selector(capturePhoto) forControlEvents:UIControlEventTouchUpInside]; [buttonRight addTarget:self action:@selector(openCamera:) forControlEvents:UIControlEventTouchUpInside];
UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight]; UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight];
self.navigationItem.rightBarButtonItem = customRightButton; self.navigationItem.rightBarButtonItem = customRightButton;
@ -136,6 +136,11 @@
self.tableView.separatorColor = UIColorFromRGB(0xC8BEA0); self.tableView.separatorColor = UIColorFromRGB(0xC8BEA0);
} }
- (void) openCamera:(id) sender
{
[(MenuViewController*)self.viewDeckController.leftController openCamera:sender];
}
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
{ {
[super viewWillAppear:animated]; [super viewWillAppear:animated];

2
Photo/Trovebox-Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>10.7</string> <string>10.8</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>