diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 08c5c48..d025f81 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -1570,7 +1570,7 @@ baseConfigurationReference = 93C9ED3E7E1041224C33AED5 /* Pods.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; FRAMEWORK_SEARCH_PATHS = ( @@ -1600,7 +1600,7 @@ baseConfigurationReference = AD3C5DED2445FC2F0892A525 /* Pods.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-2"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = "iPhone Developer: wu ShengHua (E2D99JSE7J)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json b/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json deleted file mode 100644 index 888748c..0000000 --- a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Contents.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default-568h@2x.png", - "minimum-system-version" : "7.0", - "subtype" : "retina4", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "1x", - "orientation" : "portrait" - }, - { - "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" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json index 888748c..6800072 100644 --- a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -1,36 +1,145 @@ { "images" : [ { - "orientation" : "portrait", + "extent" : "full-screen", "idiom" : "iphone", - "filename" : "Default-568h@2x.png", - "minimum-system-version" : "7.0", - "subtype" : "retina4", + "subtype" : "736h", + "filename" : "Default-568h@2x-2.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "736h", + "filename" : "Default-568h@2x-4.png", + "minimum-system-version" : "8.0", + "orientation" : "landscape", + "scale" : "3x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "667h", + "filename" : "Default-568h@2x-3.png", + "minimum-system-version" : "8.0", + "orientation" : "portrait", "scale" : "2x" }, { + "orientation" : "portrait", "idiom" : "iphone", - "scale" : "1x", - "orientation" : "portrait" + "extent" : "full-screen", + "minimum-system-version" : "7.0", + "filename" : "Default@2x-1.png", + "scale" : "2x" + }, + { + "extent" : "full-screen", + "idiom" : "iphone", + "subtype" : "retina4", + "filename" : "Default-568h@2x-1.png", + "minimum-system-version" : "7.0", + "orientation" : "portrait", + "scale" : "2x" + }, + { + "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" }, { "orientation" : "portrait", "idiom" : "iphone", + "extent" : "full-screen", + "filename" : "Default.png", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "extent" : "full-screen", "filename" : "Default@2x.png", "scale" : "2x" }, { "orientation" : "portrait", "idiom" : "iphone", + "extent" : "full-screen", "filename" : "Default-568h@2x.png", "subtype" : "retina4", "scale" : "2x" }, { "orientation" : "portrait", - "idiom" : "iphone", - "filename" : "Default@2x.png", - "minimum-system-version" : "7.0", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "full-screen", "scale" : "2x" } ], diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-1.png similarity index 100% rename from Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png rename to Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-1.png diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-2.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-2.png new file mode 100644 index 0000000..2726765 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-2.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-3.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-3.png new file mode 100644 index 0000000..2726765 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-3.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png new file mode 100644 index 0000000..2726765 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default-568h@2x-4.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default.png new file mode 100644 index 0000000..1bd71e9 Binary files /dev/null and b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default.png differ diff --git a/Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png b/Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default@2x-1.png similarity index 100% rename from Ash_AWord/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png rename to Ash_AWord/Images.xcassets/LaunchImage.launchimage/Default@2x-1.png