From 79c6ee4513e30a39fff6dfe137aa9b6391f4ab25 Mon Sep 17 00:00:00 2001 From: siqi Date: Sun, 26 Jan 2014 00:46:00 +0100 Subject: icons with required sizes for iOS7 Change-Id: I2afad83240a2306bb8a4312659c75613c9c7519e --- .../AppIcon.appiconset/Contents.json | 104 +++++++++++++++++++++ .../Images.xcassets/AppIcon.appiconset/Icon-40.png | Bin 0 -> 4905 bytes .../AppIcon.appiconset/Icon-40@2x-1.png | Bin 0 -> 8070 bytes .../AppIcon.appiconset/Icon-40@2x.png | Bin 0 -> 8070 bytes .../AppIcon.appiconset/Icon-60@2x.png | Bin 0 -> 11595 bytes .../Images.xcassets/AppIcon.appiconset/Icon-76.png | Bin 0 -> 7854 bytes .../AppIcon.appiconset/Icon-76@2x.png | Bin 0 -> 12573 bytes .../AppIcon.appiconset/Icon-Small-1.png | Bin 0 -> 4162 bytes .../AppIcon.appiconset/Icon-Small-50.png | Bin 0 -> 5705 bytes .../AppIcon.appiconset/Icon-Small-50@2x.png | Bin 0 -> 9983 bytes .../AppIcon.appiconset/Icon-Small.png | Bin 0 -> 4162 bytes .../AppIcon.appiconset/Icon-Small@2x-1.png | Bin 0 -> 6303 bytes .../AppIcon.appiconset/Icon-Small@2x.png | Bin 0 -> 6303 bytes .../AppIcon.appiconset/iosremote_ipad_icon.png | Bin 0 -> 6105 bytes .../AppIcon.appiconset/iosremote_ipad_icon@2x.png | Bin 0 -> 6857 bytes .../AppIcon.appiconset/iosremote_iphone_icon.png | Bin 0 -> 5552 bytes .../iosremote_iphone_icon@2x.png | Bin 0 -> 8878 bytes .../LaunchImage.launchimage/Contents.json | 94 +++++++++++++++++++ .../LaunchImage.launchimage/Default-568h@2x.png | Bin 0 -> 18594 bytes .../LaunchImage.launchimage/Default.png | Bin 0 -> 6540 bytes .../LaunchImage.launchimage/Default@2x.png | Bin 0 -> 16107 bytes ios/iosremote/iosremote.xcodeproj/project.pbxproj | 8 ++ .../iosremote/en.lproj/iPhone_autoSize.storyboard | 8 +- .../en.lproj/iPhone_autoSize_old.storyboard | 8 +- .../iosremote/fr.lproj/iPhone_autoSize.storyboard | 4 +- .../fr.lproj/iPhone_autoSize_old.storyboard | 4 +- .../zh-Hans.lproj/iPhone_autoSize.storyboard | 4 +- .../zh-Hans.lproj/iPhone_autoSize_old.storyboard | 4 +- 28 files changed, 222 insertions(+), 16 deletions(-) create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon.png create mode 100644 ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Contents.json create mode 100644 ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png create mode 100644 ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default.png create mode 100644 ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default@2x.png (limited to 'ios') diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000000..bcaf376213a5 --- /dev/null +++ b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,104 @@ +{ + "images" : [ + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@2x-1.png", + "scale" : "2x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "iosremote_iphone_icon.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "iosremote_iphone_icon@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small-1.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small@2x-1.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "Icon-Small-50.png", + "scale" : "1x" + }, + { + "size" : "50x50", + "idiom" : "ipad", + "filename" : "Icon-Small-50@2x.png", + "scale" : "2x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "iosremote_ipad_icon.png", + "scale" : "1x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "iosremote_ipad_icon@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 000000000000..f95b3320a50d Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 000000000000..58e65eb4d58d Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 000000000000..58e65eb4d58d Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 000000000000..96468d3dafe1 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 000000000000..0c024b099877 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 000000000000..e0c55e6ed5d9 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png new file mode 100644 index 000000000000..f4a08a5049bf Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-1.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png new file mode 100644 index 000000000000..436d82dc21d7 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png new file mode 100644 index 000000000000..0f62e74d1d80 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small-50@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small.png new file mode 100644 index 000000000000..f4a08a5049bf Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png new file mode 100644 index 000000000000..b314b23c9c91 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x-1.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png new file mode 100644 index 000000000000..b314b23c9c91 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon.png new file mode 100644 index 000000000000..33dda09636b9 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon@2x.png new file mode 100644 index 000000000000..1fce03ca7f18 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_ipad_icon@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon.png new file mode 100644 index 000000000000..84e23cd5809b Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon@2x.png b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon@2x.png new file mode 100644 index 000000000000..c3a41c22bed6 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/AppIcon.appiconset/iosremote_iphone_icon@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Contents.json b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Contents.json new file mode 100644 index 000000000000..a2a7d966d0de --- /dev/null +++ b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -0,0 +1,94 @@ +{ + "images" : [ + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default.png", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png new file mode 100644 index 000000000000..0891b7aabfcf Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default-568h@2x.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default.png b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default.png new file mode 100644 index 000000000000..4c8ca6f693f9 Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default.png differ diff --git a/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default@2x.png b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default@2x.png new file mode 100644 index 000000000000..35b84cffeb4d Binary files /dev/null and b/ios/iosremote/Impress/Images.xcassets/LaunchImage.launchimage/Default@2x.png differ diff --git a/ios/iosremote/iosremote.xcodeproj/project.pbxproj b/ios/iosremote/iosremote.xcodeproj/project.pbxproj index 90857944655b..4ab34ec07bb9 100644 --- a/ios/iosremote/iosremote.xcodeproj/project.pbxproj +++ b/ios/iosremote/iosremote.xcodeproj/project.pbxproj @@ -62,6 +62,7 @@ 8C0DC84417A4185A0099E5AE /* previousButton_normal.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84017A4185A0099E5AE /* previousButton_normal.png */; }; 8C0DC84517A4185A0099E5AE /* previousButton_normal@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */; }; 8C0DC85117A512250099E5AE /* AppDelegate~ipad.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C0DC85017A512250099E5AE /* AppDelegate~ipad.m */; }; + 8C10780318947B9D0062E0E7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8C10780218947B9D0062E0E7 /* Images.xcassets */; }; 8C19F41D17B00899005BDB61 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C19F41C17B00899005BDB61 /* SystemConfiguration.framework */; }; 8C19F41F17B02A8A005BDB61 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8C19F41E17B02A8A005BDB61 /* QuartzCore.framework */; }; 8C19F42417B02C7A005BDB61 /* PopoverView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C19F42117B02AA9005BDB61 /* PopoverView.m */; }; @@ -239,6 +240,7 @@ 8C0DC84117A4185A0099E5AE /* previousButton_normal@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "previousButton_normal@2x.png"; sourceTree = ""; }; 8C0DC84F17A512250099E5AE /* AppDelegate~ipad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "AppDelegate~ipad.h"; path = "iosremote/Classes/AppDelegate~ipad.h"; sourceTree = ""; }; 8C0DC85017A512250099E5AE /* AppDelegate~ipad.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "AppDelegate~ipad.m"; path = "iosremote/Classes/AppDelegate~ipad.m"; sourceTree = ""; }; + 8C10780218947B9D0062E0E7 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Impress/Images.xcassets; sourceTree = ""; }; 8C19F41C17B00899005BDB61 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; 8C19F41E17B02A8A005BDB61 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 8C19F42017B02AA9005BDB61 /* PopoverView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PopoverView.h; path = PopoverView/PopoverView.h; sourceTree = ""; }; @@ -426,6 +428,7 @@ 57C6E3E6175E06E800E8BC5F = { isa = PBXGroup; children = ( + 8C10780218947B9D0062E0E7 /* Images.xcassets */, 8C1A170217A28AB900B4BB3C /* Shared */, 8C1A170917A28E6500B4BB3C /* iPhone */, 8C1A170817A28E5E00B4BB3C /* iPad */, @@ -871,6 +874,7 @@ buildActionMask = 2147483647; files = ( 57C6E3FD175E06E800E8BC5F /* InfoPlist.strings in Resources */, + 8C10780318947B9D0062E0E7 /* Images.xcassets in Resources */, 57C6E405175E06E800E8BC5F /* Default.png in Resources */, 57C6E407175E06E800E8BC5F /* Default@2x.png in Resources */, 57C6E409175E06E800E8BC5F /* Default-568h@2x.png in Resources */, @@ -1145,6 +1149,8 @@ 57C6E416175E06E800E8BC5F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "iosremote/iosremote-Prefix.pch"; INFOPLIST_FILE = "iosremote/iosremote-Info.plist"; @@ -1164,6 +1170,8 @@ 57C6E417175E06E800E8BC5F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Distribution: Siqi Liu (ECNT5P5MTW)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Siqi Liu (ECNT5P5MTW)"; GCC_PRECOMPILE_PREFIX_HEADER = YES; diff --git a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard index 848b74f3da6f..4c89f585c358 100644 --- a/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard +++ b/ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard @@ -1,8 +1,8 @@ - + - + @@ -121,7 +121,7 @@