diff --git a/Classes/NavigationController/UINavigationController+M13ProgressViewBar.h b/Classes/NavigationController/UINavigationController+M13ProgressViewBar.h index feaf529..e82f031 100644 --- a/Classes/NavigationController/UINavigationController+M13ProgressViewBar.h +++ b/Classes/NavigationController/UINavigationController+M13ProgressViewBar.h @@ -53,7 +53,7 @@ /** The background color of the progress bar, if nil, the background color will be the clearColor. - @param background The color to set. + @param backgroundColor The color to set. */ - (void)setBackgroundColor:(UIColor *)backgroundColor; diff --git a/M13ProgressSuite.xcodeproj/project.pbxproj b/M13ProgressSuite.xcodeproj/project.pbxproj index 83862fc..a2c0c1d 100644 --- a/M13ProgressSuite.xcodeproj/project.pbxproj +++ b/M13ProgressSuite.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ CA2FAF901889907300BCAEF5 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0720; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Brandon McQuilkin"; TargetAttributes = { CA2FAFBB1889907300BCAEF5 = { @@ -888,19 +888,30 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -928,18 +939,29 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1045,6 +1067,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; @@ -1077,6 +1100,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_UNREACHABLE_CODE = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; diff --git a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme index 7ce4552..dcceb9d 100644 --- a/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme +++ b/M13ProgressSuite.xcodeproj/xcshareddata/xcschemes/M13ProgressSuiteFramework.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20.png new file mode 100644 index 0000000..cfaedf8 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png new file mode 100644 index 0000000..8146592 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x-1.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png new file mode 100644 index 0000000..8146592 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png new file mode 100644 index 0000000..f361b87 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png index 0a44b8b..85ae132 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png index 2144253..efde9d9 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x-1.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png index 2144253..efde9d9 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png new file mode 100644 index 0000000..88182d8 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40.png index f7c2fa8..8146592 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png index a46e43d..5612cfe 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x-1.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png index a46e43d..5612cfe 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x-1.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x-1.png new file mode 100644 index 0000000..3a98d56 Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x-1.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png index 251c290..3a98d56 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png index 3df2d9f..3f94e90 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76.png index 9bc57d6..c03fc5a 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png index f12fb68..531c2d3 100644 Binary files a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon835x835@2x-1.png b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon835x835@2x-1.png new file mode 100644 index 0000000..7deddaf Binary files /dev/null and b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/AppIcon835x835@2x-1.png differ diff --git a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/Contents.json b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/Contents.json index 0661f14..31bf2c8 100644 --- a/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/M13ProgressSuite/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,13 +1,15 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon20x20@2x-1.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon20x20@3x.png", "scale" : "3x" }, { @@ -17,8 +19,9 @@ "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon29x29@3x.png", "scale" : "3x" }, { @@ -28,8 +31,9 @@ "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon60x60@2x-1.png", "scale" : "3x" }, { @@ -45,13 +49,15 @@ "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon20x20.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon20x20@2x.png", "scale" : "2x" }, { @@ -91,9 +97,15 @@ "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "AppIcon835x835@2x-1.png", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : {