Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .xcode-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.2
14.3.1
32 changes: 5 additions & 27 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/Assets.xcassets/AppIcon-emm.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()
Expand Down Expand Up @@ -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/Branding-owncloud-online.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"

# 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"

# 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"

# 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"

# 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/"

# 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()

Expand Down
5 changes: 0 additions & 5 deletions ownCloud/Resources/Theming/Branding-default.plist

This file was deleted.

28 changes: 0 additions & 28 deletions ownCloud/Resources/Theming/Branding-flat-identifiers-example.plist

This file was deleted.

8 changes: 0 additions & 8 deletions ownCloud/Resources/Theming/Branding-mibrowser-example.plist

This file was deleted.

Loading