diff --git a/UPStackMenu/UPStackMenu.m b/UPStackMenu/UPStackMenu.m index d0c509f..876198d 100644 --- a/UPStackMenu/UPStackMenu.m +++ b/UPStackMenu/UPStackMenu.m @@ -165,12 +165,12 @@ - (void)computeOpenedSize height += item.frame.size.height + _itemsSpacing; if([item labelPosition] == UPStackMenuItemLabelPosition_left) { - CGFloat itemLeftOffset = fabsf(center.x - item.itemCenter.x); + CGFloat itemLeftOffset = fabs(center.x - item.itemCenter.x); if(itemLeftOffset > leftOffset) leftOffset = itemLeftOffset; } else if([item labelPosition] == UPStackMenuItemLabelPosition_right) { - CGFloat itemRightOffset = fabsf(item.frame.size.width - item.itemCenter.x - center.x); + CGFloat itemRightOffset = fabs(item.frame.size.width - item.itemCenter.x - center.x); if(itemRightOffset > rightOffset) rightOffset = itemRightOffset; } diff --git a/UPStackMenuDemo.xcodeproj/project.pbxproj b/UPStackMenuDemo.xcodeproj/project.pbxproj index 65b26dd..cc18bb7 100644 --- a/UPStackMenuDemo.xcodeproj/project.pbxproj +++ b/UPStackMenuDemo.xcodeproj/project.pbxproj @@ -123,7 +123,7 @@ 01C6FA851A7863E600564993 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Paul Ulric"; TargetAttributes = { 01C6FA8C1A7863E600564993 = { @@ -217,6 +217,7 @@ "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_OPTIMIZATION_LEVEL = 0; @@ -279,9 +280,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BrandAsset; INFOPLIST_FILE = UPStackMenuDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "UP.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -290,9 +293,11 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = BrandAsset; INFOPLIST_FILE = UPStackMenuDemo/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 7.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "UP.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/UPStackMenuDemo/Images.xcassets/BrandAsset.launchimage/Contents.json b/UPStackMenuDemo/Images.xcassets/BrandAsset.launchimage/Contents.json new file mode 100644 index 0000000..a0ad363 --- /dev/null +++ b/UPStackMenuDemo/Images.xcassets/BrandAsset.launchimage/Contents.json @@ -0,0 +1,36 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/UPStackMenuDemo/Images.xcassets/launch.imageset/Contents.json b/UPStackMenuDemo/Images.xcassets/launch.imageset/Contents.json new file mode 100644 index 0000000..5989f83 --- /dev/null +++ b/UPStackMenuDemo/Images.xcassets/launch.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "launch.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/UPStackMenuDemo/Images.xcassets/launch.imageset/launch.png b/UPStackMenuDemo/Images.xcassets/launch.imageset/launch.png new file mode 100644 index 0000000..ed7f46b Binary files /dev/null and b/UPStackMenuDemo/Images.xcassets/launch.imageset/launch.png differ diff --git a/UPStackMenuDemo/Info.plist b/UPStackMenuDemo/Info.plist index 563510f..40c6215 100644 --- a/UPStackMenuDemo/Info.plist +++ b/UPStackMenuDemo/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - UP.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName