diff --git a/Default-568h@2x.png b/Default-568h@2x.png deleted file mode 100644 index 0891b7a..0000000 Binary files a/Default-568h@2x.png and /dev/null differ diff --git a/MOGlassButton.mm b/MOGlassButton.mm index 95fc7bd..c7b4aaa 100644 --- a/MOGlassButton.mm +++ b/MOGlassButton.mm @@ -54,7 +54,6 @@ - (id)initWithFrame:(CGRect)aRect { - (void)awakeFromNib { [super awakeFromNib]; - //[self setupLayers]; } @@ -62,10 +61,6 @@ - (void)awakeFromNib { - (void)layoutSubviews { [super layoutSubviews]; - - //gradientLayer1.frame = CGRectMake(0, 0, self.frame.size.width, self.frame.size.height/2); - //gradientLayer2.frame = CGRectMake(0, self.frame.size.height/2, self.frame.size.width, self.frame.size.height/2); - //outlineLayer.frame = CGRectMake(0, 1, self.frame.size.width, self.frame.size.height); } #pragma mark Default Button Background Colors @@ -73,8 +68,6 @@ - (void)layoutSubviews { - (void)setupForStandardButtons { [self setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [self setTitleColor:[UIColor colorFromRGBIntegers:205 green:212 blue:220 alpha:1.0f] forState:UIControlStateDisabled]; - //self.titleLabel.shadowOffset = CGSizeMake(0, -1); - //self.titleLabel.shadowColor = [UIColor colorFromRGBIntegers:192 green:73 blue:84 alpha:1.0f]; self.titleLabel.font = [UIFont systemFontOfSize:20 weight:UIFontWeightLight]; } @@ -105,14 +98,12 @@ - (void)setupAsWhiteButton { - (void)setupAsSmallGreenButton { [self setupAsGreenButton]; self.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightLight]; - //self.layer.cornerRadius = 4.0f; } - (void)setupAsSmallRedButton { [self setupAsRedButton]; self.titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightLight]; - //self.layer.cornerRadius = 4.0f; } @end diff --git a/Resources/Info.plist b/Resources/Info.plist index 1481dfb..9690510 100644 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -8,6 +8,8 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} + CFBundleIcons + CFBundleIcons~ipad CFBundleIdentifier @@ -24,12 +26,12 @@ ???? CFBundleVersion 1.7 - UILaunchStoryboardName - LaunchScreen UIBackgroundModes audio + UILaunchStoryboardName + LaunchScreen UIMainStoryboardFile Main UIStatusBarStyle diff --git a/Tethering.xcodeproj/project.pbxproj b/Tethering.xcodeproj/project.pbxproj index 7d96cf4..1dbc531 100755 --- a/Tethering.xcodeproj/project.pbxproj +++ b/Tethering.xcodeproj/project.pbxproj @@ -30,7 +30,6 @@ 9C4CAB051AD73ABB0025CFE1 /* PacFileResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C4CAB001AD73ABB0025CFE1 /* PacFileResponse.m */; }; 9C4CAB061AD73ABB0025CFE1 /* HTTPResponseHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C4CAB021AD73ABB0025CFE1 /* HTTPResponseHandler.m */; }; 9C4CAB071AD73ABB0025CFE1 /* HTTPServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C4CAB041AD73ABB0025CFE1 /* HTTPServer.m */; }; - 9C5C8AB91825468200ED829D /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9C5C8AB81825468200ED829D /* Default-568h@2x.png */; }; 9C95E98618393629004559EB /* LoggerClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C95E98418393629004559EB /* LoggerClient.m */; }; E40F66010FB1E38600D92710 /* SocksProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = E40F65FF0FB1E38600D92710 /* SocksProxy.mm */; }; E40F66BA0FB3029A00D92710 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E40F66B90FB3029A00D92710 /* CFNetwork.framework */; }; @@ -75,7 +74,6 @@ 9C4CAB021AD73ABB0025CFE1 /* HTTPResponseHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTTPResponseHandler.m; path = WebServer/HTTPResponseHandler.m; sourceTree = ""; }; 9C4CAB031AD73ABB0025CFE1 /* HTTPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPServer.h; path = WebServer/HTTPServer.h; sourceTree = ""; }; 9C4CAB041AD73ABB0025CFE1 /* HTTPServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = HTTPServer.m; path = WebServer/HTTPServer.m; sourceTree = ""; }; - 9C5C8AB81825468200ED829D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 9C95E98318393629004559EB /* LoggerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LoggerClient.h; path = NSLogger/LoggerClient.h; sourceTree = ""; }; 9C95E98418393629004559EB /* LoggerClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LoggerClient.m; path = NSLogger/LoggerClient.m; sourceTree = ""; }; 9C95E98518393629004559EB /* LoggerCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LoggerCommon.h; path = NSLogger/LoggerCommon.h; sourceTree = ""; }; @@ -117,7 +115,6 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 9C5C8AB81825468200ED829D /* Default-568h@2x.png */, 9C1900741AD729A00022F53D /* Classes */, 54074CF1124126F10036116E /* Other Sources */, E4D543FE0FAB45DC00630176 /* Resources */, @@ -330,7 +327,6 @@ 25EE9D561D601F8B00774FFF /* Images.xcassets in Resources */, 9C3FB27A183FEB97001B81FA /* Main.storyboard in Resources */, E4D5443B0FAB4B1600630176 /* Info.html in Resources */, - 9C5C8AB91825468200ED829D /* Default-568h@2x.png in Resources */, 546335FE10DAB3BE00D3A3AE /* README in Resources */, 905DD2691C896C69000EA271 /* silence.mp3 in Resources */, ); @@ -365,6 +361,7 @@ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_ENTITLEMENTS[sdk=*]" = ""; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -385,6 +382,7 @@ 1D6058950D05DD3E006BFB54 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_OBJC_ARC = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";