[Libreoffice-commits] core.git: ios/LibreOfficeLight
jan Iversen
jani at libreoffice.org
Sun Nov 19 18:26:01 UTC 2017
dev/null |binary
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 6 +
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json | 38 +++----
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png |binary
ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json | 49 ++++++++++
5 files changed, 74 insertions(+), 19 deletions(-)
New commits:
commit 2d8cca33e3cce4a885fcfc9a3c38483927f2242d
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Nov 19 19:24:28 2017 +0100
iOS, updated app icon
new demands for appicons (iOS 11.1)
Change-Id: I26eb7c61d4ffe24347ed3b192b579d07e46afc34
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index 656c7f2693dd..4ffb19054e5d 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -307,6 +307,8 @@
baseConfigurationReference = 39ACF4181F8A317600DA7334 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -393,6 +395,8 @@
baseConfigurationReference = 39ACF4181F8A317600DA7334 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
@@ -473,6 +477,8 @@
baseConfigurationReference = 39ACF4181F8A317600DA7334 /* loApp.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
index 892120fd6e86..c20b7bf1cb1f 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,22 +1,16 @@
{
"images" : [
{
+ "size" : "29x29",
"idiom" : "ipad",
- "size" : "20x20",
- "filename" : "LibreOffice-20.png",
+ "filename" : "LibreOffice-29.png",
"scale" : "1x"
},
{
- "idiom" : "ipad",
- "size" : "20x20",
- "filename" : "LibreOffice-40.png",
- "scale" : "2x"
- },
- {
"size" : "29x29",
- "idiom" : "ipad",
- "filename" : "LibreOffice-29.png",
- "scale" : "1x"
+ "idiom" : "iphone",
+ "filename" : "LibreOffice-58.png",
+ "scale" : "2x"
},
{
"size" : "29x29",
@@ -25,8 +19,8 @@
"scale" : "2x"
},
{
- "idiom" : "ipad",
"size" : "40x40",
+ "idiom" : "ipad",
"filename" : "LibreOffice-40.png",
"scale" : "1x"
},
@@ -37,6 +31,18 @@
"scale" : "2x"
},
{
+ "size" : "40x40",
+ "idiom" : "iphone",
+ "filename" : "LibreOffice-80.png",
+ "scale" : "2x"
+ },
+ {
+ "size" : "60x60",
+ "idiom" : "iphone",
+ "filename" : "LibreOffice-120.png",
+ "scale" : "2x"
+ },
+ {
"size" : "76x76",
"idiom" : "ipad",
"filename" : "LibreOffice-76.png",
@@ -49,14 +55,8 @@
"scale" : "2x"
},
{
- "size" : "83.5x83.5",
- "idiom" : "ipad",
- "filename" : "LibreOffice-167.png",
- "scale" : "2x"
- },
- {
- "idiom" : "ios-marketing",
"size" : "1024x1024",
+ "idiom" : "ios-marketing",
"filename" : "LibreOffice-1024.png",
"scale" : "1x"
}
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png
new file mode 100644
index 000000000000..49a7a1070b60
Binary files /dev/null and b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-120.png differ
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png
deleted file mode 100644
index ef0033f9a8c5..000000000000
Binary files a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-167.png and /dev/null differ
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png
deleted file mode 100644
index 5559db79b9c7..000000000000
Binary files a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/AppIcon.appiconset/LibreOffice-20.png and /dev/null differ
diff --git a/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 000000000000..5a2966687aa0
--- /dev/null
+++ b/ios/LibreOfficeLight/LibreOfficeLight/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,49 @@
+{
+ "images" : [
+ {
+ "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"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "minimum-system-version" : "7.0",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "iphone",
+ "minimum-system-version" : "7.0",
+ "subtype" : "retina4",
+ "scale" : "2x"
+ },
+ {
+ "orientation" : "portrait",
+ "idiom" : "ipad",
+ "minimum-system-version" : "7.0",
+ "extent" : "full-screen",
+ "scale" : "1x"
+ }
+ ],
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
More information about the Libreoffice-commits
mailing list