From 6a5b859c725c9503647e5661f204ec29a56fb8b6 Mon Sep 17 00:00:00 2001 From: Michael Stingl Date: Tue, 18 Jul 2023 17:21:31 +0200 Subject: [PATCH 1/7] Remove old PLIST examples --- .../Resources/Theming/Branding-default.plist | 5 - .../Branding-flat-identifiers-example.plist | 28 - .../Theming/Branding-mibrowser-example.plist | 8 - .../Branding-owncloud-online-legacy.plist | 612 ------------------ 4 files changed, 653 deletions(-) delete mode 100644 ownCloud/Resources/Theming/Branding-default.plist delete mode 100644 ownCloud/Resources/Theming/Branding-flat-identifiers-example.plist delete mode 100644 ownCloud/Resources/Theming/Branding-mibrowser-example.plist delete mode 100644 ownCloud/Resources/Theming/Branding-owncloud-online-legacy.plist diff --git a/ownCloud/Resources/Theming/Branding-default.plist b/ownCloud/Resources/Theming/Branding-default.plist deleted file mode 100644 index 0c67376eb..000000000 --- a/ownCloud/Resources/Theming/Branding-default.plist +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ownCloud/Resources/Theming/Branding-flat-identifiers-example.plist b/ownCloud/Resources/Theming/Branding-flat-identifiers-example.plist deleted file mode 100644 index 74b7a114c..000000000 --- a/ownCloud/Resources/Theming/Branding-flat-identifiers-example.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - branding.can-add-account - - branding.can-edit-account - - branding.organization-name - demo.owncloud.com - branding.profile-definitions$[0].profile-identifier - demo.owncloud.com - branding.profile-definitions$[0].profile-welcome-message - Welcome to demo.owncloud.com - branding.profile-definitions$[0].profile-password-auth-prompt - Enter your username and password - branding.profile-definitions$[0].profile-token-auth-prompt - Please log in to authorize the app. - branding.profile-definitions$[0].profile-url-prompt - Please enter your demo.owncloud.com URL - branding.profile-definitions$[0].profile-bookmark-name - demo.owncloud.com - branding.profile-definitions$[0].profile-url - https://demo.owncloud.com - branding.profile-definitions$[0].profile-allow-url-configuration - - - diff --git a/ownCloud/Resources/Theming/Branding-mibrowser-example.plist b/ownCloud/Resources/Theming/Branding-mibrowser-example.plist deleted file mode 100644 index 8ce8a4a3d..000000000 --- a/ownCloud/Resources/Theming/Branding-mibrowser-example.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - authentication.browser-session-class - MIBrowser - - diff --git a/ownCloud/Resources/Theming/Branding-owncloud-online-legacy.plist b/ownCloud/Resources/Theming/Branding-owncloud-online-legacy.plist deleted file mode 100644 index 169c2584d..000000000 --- a/ownCloud/Resources/Theming/Branding-owncloud-online-legacy.plist +++ /dev/null @@ -1,612 +0,0 @@ - - - - - canAddAccount - - canEditAccount - - enableReviewPrompt - - organizationName - ownCloud Online - feedbackMail - - Configuration - - Profiles - - - identifier - ownCloud Online - name - ownCloud Online - promptForURL - Please enter your ownCloud Online URL - promptForHelpURL - If you do not have an ownCloud Online account yet, you can request a free test account. - helpURLButtonString - TRY IT FOR FREE - bookmarkName - ownCloud Online - url - - canConfigureURL - - helpURL - https://owncloud.online/try/ - allowedHosts - - owncloud.online - owncloud.com - owncloud.team - - allowedAuthenticationMethods - - com.owncloud.basicauth - com.owncloud.oauth2 - - - - URLs - - Help - https://owncloud.online/faq/ - Privacy - https://owncloud.online/privacy-policy/ - - Generic - - Corporate - - Color - #52DDA9 - - Action - - Primary - #1279C5 - Inverse - #FFFFFF - Secondary - #777777 - - Text - - Primary - #333333 - Inverse - #000000 - Secondary - #666666 - Inverse-Light - #000000 - Disabled - #BFC9D9 - - Login - - Primary - #333333 - Inverse - #FFFFFF - Secondary - #666666 - Inverse-Light - #F2F4F7 - Disabled - #BFC9D9 - - Background - - Standard - #FFFFFF - Light - #EEEEEE - Input-Form - #FFFFFF - Selected - #E5EFFF - Tooltip - #1F2939 - - System - - success - #4CD964 - success-background - #DBF7E0 - warning - #FF8800 - warning-background - #FFE7CC - danger - #E00000 - danger-background - #F9CCCC - - Status - - Progress-Indicator - #7357C7 - Progress-Background - #D5D3DC - - Icon - - System - #667FA3 - System-Light - #CCD4E0 - Filetype-Normal - #00af90 - Disabled - #C4C4C4 - - Tab - - Active - #00af90 - Inactive - #777777 - - - Themes - - - Name - ownCloud-online - Identifier - com.owncloud.branding - ThemeStyle - contrast - darkBrandColor - #52DDA9 - lightBrandColor - #628a99 - Colors - - tintColor - #000000 - Label - - informativeColor - - successColor - System.Success - warningColor - System.Warning - errorColor - System.Danger - - Fill - - approvalColors - - normal - - background - #52DDA9 - foreground - - - highlighted - - background - #52DDA9 - foreground - - - disabled - - background - #37C390 - foreground - - - - neutralColors - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - destructiveColors - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - Favorite - - enabledColor - - disabledColor - - - Table - - tableBackgroundColor - Background.Standard - tableGroupBackgroundColor - - tableSeparatorColor - - tableRowBorderColor - - tableRowColors - - backgroundColor - Background.Standard - labelColor - Text.Primary - secondaryLabelColor - Text.Secondary - symbolColor - Action.Primary - tintColor - - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - tableRowHighlightColors - - backgroundColor - #DCEBF6 - labelColor - - secondaryLabelColor - - symbolColor - - tintColor - - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - - Icon - - folderFillColor - Icon.Filetype-Normal - fileFillColor - Icon.Filetype-Normal - logoFillColor - Icon.Filetype-Normal - iconFillColor - Icon.Filetype-Normal - symbolFillColor - Icon.Filetype-Normal - - Progress - - foreground - Progress.Indicator - background - Progress.Background - - Toolbar - - backgroundColor - Background.Standard - labelColor - Text.Inverse - secondaryLabelColor - Tab.Inactive - symbolColor - - tintColor - Tab.Active - filledColorPairCollection - - normal - - background - - foreground - Tab.Inactive - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - Searchbar - - backgroundColor - Background.Input-Form - labelColor - Text.Inverse - secondaryLabelColor - Text.Secondary - symbolColor - - tintColor - Text.Inverse - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - Login - - backgroundColor - Background.Standard - labelColor - Login.Primary - secondaryLabelColor - Login.Secondary - symbolColor - - tintColor - Login.Inverse - filledColorPairCollection - - normal - - background - - foreground - #000000 - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - NavigationBar - - backgroundColor - #FFFFFF - labelColor - Text.Inverse - secondaryLabelColor - - symbolColor - - tintColor - Text.Inverse-Light - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - darkBrandColors - - backgroundColor - - labelColor - - secondaryLabelColor - - symbolColor - - tintColor - - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - lightBrandColors - - backgroundColor - - labelColor - - secondaryLabelColor - - symbolColor - - tintColor - - filledColorPairCollection - - normal - - background - - foreground - - - highlighted - - background - - foreground - - - disabled - - background - - foreground - - - - - - Styles - - statusBarStyle - darkContent - barStyle - black - activityIndicatorViewStyle - gray - searchBarActivityIndicatorViewStyle - white - interfaceStyle - light - keyboardAppearance - light - backgroundBlurEffectStyle - light - - - - - From 9c3b529eb76b7e7fda6c417907436e7f75344411 Mon Sep 17 00:00:00 2001 From: Michael Stingl Date: Tue, 18 Jul 2023 17:27:15 +0200 Subject: [PATCH 2/7] move ownCloud.online theme + assets --- .../Contents.json | 0 .../icon-1024.png | Bin .../AppIcon-ownCloud-online.appiconset/icon-20.png | Bin .../icon-20@2x.png | Bin .../icon-20@3x.png | Bin .../AppIcon-ownCloud-online.appiconset/icon-29.png | Bin .../icon-29@2x.png | Bin .../icon-29@3x.png | Bin .../AppIcon-ownCloud-online.appiconset/icon-40.png | Bin .../icon-40@2x.png | Bin .../icon-40@3x.png | Bin .../icon-60@2x.png | Bin .../icon-60@3x.png | Bin .../AppIcon-ownCloud-online.appiconset/icon-76.png | Bin .../icon-76@2x.png | Bin .../icon-83.5@2x.png | Bin .../Branding.plist} | 0 .../branding-login-background.png} | Bin .../branding-login-logo.png} | Bin .../branding-splashscreen-background.png} | Bin .../branding-splashscreen.png} | Bin 21 files changed, 0 insertions(+), 0 deletions(-) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png (100%) rename ownCloud/Resources/{ => Theming/online.owncloud.ios-app}/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png (100%) rename ownCloud/Resources/Theming/{Branding-owncloud-online.plist => online.owncloud.ios-app/Branding.plist} (100%) rename ownCloud/Resources/Theming/{branding-login-background-owncloud-online.png => online.owncloud.ios-app/branding-login-background.png} (100%) rename ownCloud/Resources/Theming/{branding-login-logo-owncloud-online.png => online.owncloud.ios-app/branding-login-logo.png} (100%) rename ownCloud/Resources/Theming/{branding-splashscreen-background-owncloud-online.png => online.owncloud.ios-app/branding-splashscreen-background.png} (100%) rename ownCloud/Resources/Theming/{branding-splashscreen-owncloud-online.png => online.owncloud.ios-app/branding-splashscreen.png} (100%) diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png diff --git a/ownCloud/Resources/Theming/Branding-owncloud-online.plist b/ownCloud/Resources/Theming/online.owncloud.ios-app/Branding.plist similarity index 100% rename from ownCloud/Resources/Theming/Branding-owncloud-online.plist rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Branding.plist diff --git a/ownCloud/Resources/Theming/branding-login-background-owncloud-online.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-background.png similarity index 100% rename from ownCloud/Resources/Theming/branding-login-background-owncloud-online.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-background.png diff --git a/ownCloud/Resources/Theming/branding-login-logo-owncloud-online.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-logo.png similarity index 100% rename from ownCloud/Resources/Theming/branding-login-logo-owncloud-online.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-logo.png diff --git a/ownCloud/Resources/Theming/branding-splashscreen-background-owncloud-online.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen-background.png similarity index 100% rename from ownCloud/Resources/Theming/branding-splashscreen-background-owncloud-online.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen-background.png diff --git a/ownCloud/Resources/Theming/branding-splashscreen-owncloud-online.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen.png similarity index 100% rename from ownCloud/Resources/Theming/branding-splashscreen-owncloud-online.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen.png From bc152f39a432c9888e4e51bf484773029386c6f2 Mon Sep 17 00:00:00 2001 From: Michael Stingl Date: Tue, 18 Jul 2023 17:29:20 +0200 Subject: [PATCH 3/7] move EMM assets --- .../AppIcon-emm.appiconset/Contents.json | 0 .../AppIcon-emm.appiconset/icon-1024.png | Bin .../AppIcon-emm.appiconset/icon-20.png | Bin .../AppIcon-emm.appiconset/icon-20@2x.png | Bin .../AppIcon-emm.appiconset/icon-20@3x.png | Bin .../AppIcon-emm.appiconset/icon-29.png | Bin .../AppIcon-emm.appiconset/icon-29@2x.png | Bin .../AppIcon-emm.appiconset/icon-29@3x.png | Bin .../AppIcon-emm.appiconset/icon-40.png | Bin .../AppIcon-emm.appiconset/icon-40@2x.png | Bin .../AppIcon-emm.appiconset/icon-40@3x.png | Bin .../AppIcon-emm.appiconset/icon-60@2x.png | Bin .../AppIcon-emm.appiconset/icon-60@3x.png | Bin .../AppIcon-emm.appiconset/icon-76.png | Bin .../AppIcon-emm.appiconset/icon-76@2x.png | Bin .../AppIcon-emm.appiconset/icon-83.5@2x.png | Bin 16 files changed, 0 insertions(+), 0 deletions(-) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/Contents.json (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png (100%) rename ownCloud/Resources/{ => Theming/com.owncloud.ios-app.emm}/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png (100%) diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/Contents.json b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/Contents.json similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/Contents.json rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/Contents.json diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png diff --git a/ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png similarity index 100% rename from ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png From 0804572fa0a83b6016be468a6eeffcf49f842585 Mon Sep 17 00:00:00 2001 From: Michael Stingl Date: Tue, 18 Jul 2023 17:43:36 +0200 Subject: [PATCH 4/7] Adjust Fastfile for moved themes + assets --- fastlane/Fastfile | 14 +++++++------- .../Contents.json | 0 .../icon-1024.png | Bin .../icon-20.png | Bin .../icon-20@2x.png | Bin .../icon-20@3x.png | Bin .../icon-29.png | Bin .../icon-29@2x.png | Bin .../icon-29@3x.png | Bin .../icon-40.png | Bin .../icon-40@2x.png | Bin .../icon-40@3x.png | Bin .../icon-60@2x.png | Bin .../icon-60@3x.png | Bin .../icon-76.png | Bin .../icon-76@2x.png | Bin .../icon-83.5@2x.png | Bin .../Contents.json | 0 .../icon-1024.png | Bin .../icon-20.png | Bin .../icon-20@2x.png | Bin .../icon-20@3x.png | Bin .../icon-29.png | Bin .../icon-29@2x.png | Bin .../icon-29@3x.png | Bin .../icon-40.png | Bin .../icon-40@2x.png | Bin .../icon-40@3x.png | Bin .../icon-60@2x.png | Bin .../icon-60@3x.png | Bin .../icon-76.png | Bin .../icon-76@2x.png | Bin .../icon-83.5@2x.png | Bin 33 files changed, 7 insertions(+), 7 deletions(-) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/Contents.json (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-1024.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-20.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-20@2x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-20@3x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-29.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-29@2x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-29@3x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-40.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-40@2x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-40@3x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-60@2x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-60@3x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-76.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-76@2x.png (100%) rename ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/{AppIcon-emm.appiconset => AppIcon.appiconset}/icon-83.5@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/Contents.json (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-1024.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-20.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-20@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-20@3x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-29.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-29@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-29@3x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-40.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-40@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-40@3x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-60@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-60@3x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-76.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-76@2x.png (100%) rename ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/{AppIcon-ownCloud-online.appiconset => AppIcon.appiconset}/icon-83.5@2x.png (100%) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 53eeba7fb..604add81e 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -187,7 +187,7 @@ platform :ios do puts("Build EMM iOS App…") # Set EMM App-Icon for App Build sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon-regular.appiconset/" - sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon-emm.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" + sh "mv ../ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" # Build App owncloud_emm_build() @@ -224,27 +224,27 @@ platform :ios do # Moving the ownCloud.online Branding.plist to the correct place sh "mv ../ownCloud/Resources/Theming/Branding.plist ../ownCloud/Resources/Theming/Branding-regular.plist" - sh "mv ../ownCloud/Resources/Theming/Branding-owncloud-online.plist ../ownCloud/Resources/Theming/Branding.plist" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/Branding.plist ../ownCloud/Resources/Theming/Branding.plist" # Set ownCloud.online Splashscreen Background for App Build sh "mv ../ownCloud/Resources/Theming/branding-splashscreen-background.png ../ownCloud/Resources/Theming/branding-splashscreen-background-regular.png" - sh "mv ../ownCloud/Resources/Theming/branding-splashscreen-background-owncloud-online.png ../ownCloud/Resources/Theming/branding-splashscreen-background.png" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen-background.png ../ownCloud/Resources/Theming/branding-splashscreen-background.png" # Set ownCloud.online Splashscreen Logo for App Build sh "mv ../ownCloud/Resources/Theming/branding-splashscreen.png ../ownCloud/Resources/Theming/branding-splashscreen-regular.png" - sh "mv ../ownCloud/Resources/Theming/branding-splashscreen-owncloud-online.png ../ownCloud/Resources/Theming/branding-splashscreen.png" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen.png ../ownCloud/Resources/Theming/branding-splashscreen.png" # Set ownCloud.online Branded Login Logo for App Build sh "mv ../ownCloud/Resources/Theming/branding-login-logo.png ../ownCloud/Resources/Theming/branding-login-logo-regular.png" - sh "mv ../ownCloud/Resources/Theming/branding-login-logo-owncloud-online.png ../ownCloud/Resources/Theming/branding-login-logo.png" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-logo.png ../ownCloud/Resources/Theming/branding-login-logo.png" # Set ownCloud.online Branded Login Background for App Build sh "mv ../ownCloud/Resources/Theming/branding-login-background.png ../ownCloud/Resources/Theming/branding-login-background-regular.png" - sh "mv ../ownCloud/Resources/Theming/branding-login-background-owncloud-online.png ../ownCloud/Resources/Theming/branding-login-background.png" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-background.png ../ownCloud/Resources/Theming/branding-login-background.png" # Set ownCloud.online App-Icon for App Build sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon-regular.appiconset/" - sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon-ownCloud-online.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" + sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" # Build App owncloud_online_build() diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/Contents.json b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/Contents.json rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-1024.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-1024.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-1024.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-20@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-29@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-40@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-60@3x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-76.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-76.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-76@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png diff --git a/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png similarity index 100% rename from ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon-emm.appiconset/icon-83.5@2x.png rename to ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/Contents.json rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-1024.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-1024.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-1024.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-20@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-29@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-40@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-60@3x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-76.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-76.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-76@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png diff --git a/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png b/ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png similarity index 100% rename from ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon-ownCloud-online.appiconset/icon-83.5@2x.png rename to ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png From ef52ef46a2966da46e87956d7d143d345483ba6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 20 Jul 2023 11:53:29 +0200 Subject: [PATCH 5/7] updated to Xcode 14.3 --- .xcode-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode-version b/.xcode-version index 6b5bab067..c32eced3a 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -14.2 +14.3 From 4db22783b62ba65ae5c17aa8688dc1a36ec86bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 20 Jul 2023 12:09:33 +0200 Subject: [PATCH 6/7] move all app resources to the correct place in one copy command --- fastlane/Fastfile | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 604add81e..d8fa135c0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -185,9 +185,8 @@ platform :ios do ) puts("Build EMM iOS App…") - # Set EMM App-Icon for App Build - sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon-regular.appiconset/" - sh "mv ../ownCloud/Resources/Theming/com.owncloud.ios-app.emm/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" + # Moving all EMM resources to the correct place + sh "cp -R ../ownCloud/Resources/Theming/com.owncloud.ios-app.emm/* ../ownCloud/Resources/Theming/" # Build App owncloud_emm_build() @@ -222,30 +221,9 @@ platform :ios do puts("Build ownCloud Online iOS App…") - # Moving the ownCloud.online Branding.plist to the correct place - sh "mv ../ownCloud/Resources/Theming/Branding.plist ../ownCloud/Resources/Theming/Branding-regular.plist" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/Branding.plist ../ownCloud/Resources/Theming/Branding.plist" - - # Set ownCloud.online Splashscreen Background for App Build - sh "mv ../ownCloud/Resources/Theming/branding-splashscreen-background.png ../ownCloud/Resources/Theming/branding-splashscreen-background-regular.png" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen-background.png ../ownCloud/Resources/Theming/branding-splashscreen-background.png" - - # Set ownCloud.online Splashscreen Logo for App Build - sh "mv ../ownCloud/Resources/Theming/branding-splashscreen.png ../ownCloud/Resources/Theming/branding-splashscreen-regular.png" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-splashscreen.png ../ownCloud/Resources/Theming/branding-splashscreen.png" - - # Set ownCloud.online Branded Login Logo for App Build - sh "mv ../ownCloud/Resources/Theming/branding-login-logo.png ../ownCloud/Resources/Theming/branding-login-logo-regular.png" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-logo.png ../ownCloud/Resources/Theming/branding-login-logo.png" - - # Set ownCloud.online Branded Login Background for App Build - sh "mv ../ownCloud/Resources/Theming/branding-login-background.png ../ownCloud/Resources/Theming/branding-login-background-regular.png" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/branding-login-background.png ../ownCloud/Resources/Theming/branding-login-background.png" - - # Set ownCloud.online App-Icon for App Build - sh "mv ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon-regular.appiconset/" - sh "mv ../ownCloud/Resources/Theming/online.owncloud.ios-app/Assets.xcassets/AppIcon.appiconset/ ../ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/" - + # Moving all ownCloud.online resources to the correct place + sh "cp -R ../ownCloud/Resources/Theming/online.owncloud.ios-app/* ../ownCloud/Resources/Theming/" + # Build App owncloud_online_build() From 1b38922a9004e2660bf9d12a0e934ffcd0f1607b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 20 Jul 2023 12:15:14 +0200 Subject: [PATCH 7/7] updated to 14.3.1 --- .xcode-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.xcode-version b/.xcode-version index c32eced3a..6dfe8b129 100644 --- a/.xcode-version +++ b/.xcode-version @@ -1 +1 @@ -14.3 +14.3.1