Skip to content

Commit be56485

Browse files
lufinkeylufinkey
lufinkey
authored and
lufinkey
committed
Fixed crashing bug on iOS 8
Unfortunately, there will be no menu icons for the build menu in iOS 8. (Atleast for now)
1 parent e5a237a commit be56485

File tree

4 files changed

+34
-12
lines changed

4 files changed

+34
-12
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
miniCode.xcodeproj/xcuserdata/
44
miniCode.xcodeproj/project.xcworkspace/xcuserdata/
55
miniCode.xcodeproj/luis.mode1v3
6-
miniCode.xcodeproj/luis.pbxuser
6+
miniCode.xcodeproj/luis.pbxuser
7+
8+
# Output folders
9+
build/

Source/CompilerView/BuildOptionsActionSheet.mm

+27-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#import "../Util/UIImageManager.h"
44
#import "../iCodeAppDelegate.h"
55
#import "CompilerViewController.h"
6+
#import "../Util/VersionCheck.h"
67
//#import "../Compiler/CompilerTools.h"
78

89
@implementation BuildOptionsActionSheet
@@ -40,24 +41,42 @@ - (id)initForViewController:(UIViewController*)viewCtrl
4041
buildAndRunIndex = 4;
4142
}
4243

44+
BOOL buttonIcons = YES;
45+
if(!SYSTEM_VERSION_GREATER_THAN(@"7.2.1"))
46+
{
47+
buttonIcons = NO;
48+
}
49+
4350
[self addButtonWithTitle:@"Build"];
44-
[UIImageManager loadImage:@"Images/build.png"];
45-
[[[self valueForKey:@"_buttons"] objectAtIndex:buildIndex] setImage:[UIImageManager getImage:@"Images/build.png"] forState:UIControlStateNormal];
51+
if(buttonIcons)
52+
{
53+
[UIImageManager loadImage:@"Images/build.png"];
54+
[[[self valueForKey:@"_buttons"] objectAtIndex:buildIndex] setImage:[UIImageManager getImage:@"Images/build.png"] forState:UIControlStateNormal];
55+
}
4656

4757
if(projType==PROJECTTYPE_APPLICATION || projType==PROJECTTYPE_CONSOLE)
4858
{
4959
[self addButtonWithTitle:@"Build and Run"];
50-
[UIImageManager loadImage:@"Images/buildandrun.png"];
51-
[[[self valueForKey:@"_buttons"] objectAtIndex:buildAndRunIndex] setImage:[UIImageManager getImage:@"Images/buildandrun.png"] forState:UIControlStateNormal];
60+
if(buttonIcons)
61+
{
62+
[UIImageManager loadImage:@"Images/buildandrun.png"];
63+
[[[self valueForKey:@"_buttons"] objectAtIndex:buildAndRunIndex] setImage:[UIImageManager getImage:@"Images/buildandrun.png"] forState:UIControlStateNormal];
64+
}
5265
}
5366

5467
[self addButtonWithTitle:@"Clean"];
55-
[UIImageManager loadImage:@"Images/clean.png"];
56-
[[[self valueForKey:@"_buttons"] objectAtIndex:cleanIndex] setImage:[UIImageManager getImage:@"Images/clean.png"] forState:UIControlStateNormal];
68+
if(buttonIcons)
69+
{
70+
[UIImageManager loadImage:@"Images/clean.png"];
71+
[[[self valueForKey:@"_buttons"] objectAtIndex:cleanIndex] setImage:[UIImageManager getImage:@"Images/clean.png"] forState:UIControlStateNormal];
72+
}
5773

5874
[self addButtonWithTitle:@"Results"];
59-
[UIImageManager loadImage:@"Images/results.png"];
60-
[[[self valueForKey:@"_buttons"] objectAtIndex:resultsIndex] setImage:[UIImageManager getImage:@"Images/results.png"] forState:UIControlStateNormal];
75+
if(buttonIcons)
76+
{
77+
[UIImageManager loadImage:@"Images/results.png"];
78+
[[[self valueForKey:@"_buttons"] objectAtIndex:resultsIndex] setImage:[UIImageManager getImage:@"Images/results.png"] forState:UIControlStateNormal];
79+
}
6180

6281
[self addButtonWithTitle:@"Cancel"];
6382
self.cancelButtonIndex = cancelIndex;

Source/ProjectView/ProjectTreeViewController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
+ (void)addDirectoryListToCell:(ProjectTreeViewCell*)cell list:(StringList_struct*)list;
6060
+ (void)expandDynamicFolderCell:(ProjectTreeViewCell*)cell;
6161

62-
- (void)buildButtonSelected;
62+
- (void)buildButtonSelected:(id)sender;
6363

6464
- (void)showObstructionInView:(UIView*)view;
6565
- (void)hideOperationHUDZoom;

Source/ProjectView/ProjectTreeViewController.mm

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ - (id)init
116116
[exitButton release];
117117

118118
[UIImageManager loadImage:@"Images/buttons_white/build.png"];
119-
UIBarImageButtonItem* buildButton = [[UIBarImageButtonItem alloc] initWithImage:[UIImageManager getImage:@"Images/buttons_white/build.png"] target:self action:@selector(buildButtonSelected)];
119+
UIBarImageButtonItem* buildButton = [[UIBarImageButtonItem alloc] initWithImage:[UIImageManager getImage:@"Images/buttons_white/build.png"] target:self action:@selector(buildButtonSelected:)];
120120
[buildButton setSize:32];
121121
[self.navigationItem setRightBarButtonItem:buildButton];
122122
[buildButton release];
@@ -664,7 +664,7 @@ - (void)treeView:(UITreeView*)treeView branchDidClose:(UITreeViewCell*)cell
664664
}
665665
}
666666

667-
- (void)buildButtonSelected
667+
- (void)buildButtonSelected:(id)sender
668668
{
669669
BuildOptionsActionSheet* buildOptions = [[BuildOptionsActionSheet alloc] initForViewController:self];
670670
[buildOptions showInView:self.view];

0 commit comments

Comments
 (0)