Assets.xcassets/AppIcon.appiconset generated with fastlane + welcome …

…screen background (#1264)

* - add background image to welcome screen
- add support for RGBA hex values to CSS

* Assets.xcassets/AppIcon.appiconset generated with fastlane

* align icon name with branding

---------

Co-authored-by: Felix Schwarz <fs-git@iospirit.com>
Co-authored-by: Michael Stingl <git@michaelstingl.com>

fastlane/Fastfile

@@ -402,7 +402,7 @@ end
   end
 
   lane :generate_appicon do
-    iconPath = "ownCloud/Resources/Theming/icon-1024.png"
+    iconPath = "ownCloud/Resources/Theming/branding-icon.png"
     if File.exist?("../" + iconPath)
       appicon(
         appicon_image_file: iconPath,

ownCloud/App Controllers/AppRootViewController.swift

@@ -144,6 +144,14 @@ open class AppRootViewController: EmbeddingViewController, BrowserNavigationView
 				messageView.elementInsets = NSDirectionalEdgeInsets(top: 25, leading: 50, bottom: 50, trailing: 50)
 
 				let rootView = ThemeCSSView(withSelectors: [.modal, .welcome])
+
+				if let image = Branding.shared.brandedImageNamed(.loginBackground) {
+					messageView.isOpaque = false
+					let backgroundImageView = UIImageView(image: image)
+					backgroundImageView.contentMode = .scaleAspectFill
+					rootView.embed(toFillWith: backgroundImageView)
+				}
+
 				rootView.embed(centered: messageView, minimumInsets: NSDirectionalEdgeInsets(top: 20, leading: 20, bottom: 20, trailing: 20))
 
 				let messageViewController = UIViewController()

ownCloud/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,116 +1,116 @@
 {
-  "images" : [
-	{
-      "size" : "20x20",
-      "idiom": "iphone",
-	  "filename" : "icon-20@2x.png",
-      "scale": "2x"
+  "images": [
+    {
+      "idiom": "ios-marketing",
+      "filename": "icon-1024-1024x1024.png",
+      "scale": "1x",
+      "size": "1024x1024"
     },
-	{
-      "size" : "20x20",
+    {
       "idiom": "iphone",
-	  "filename" : "icon-20@3x.png",
-      "scale": "3x"
+      "filename": "icon-1024-180x180.png",
+      "scale": "3x",
+      "size": "60x60"
     },
-	{
-      "size" : "20x20",
+    {
       "idiom": "ipad",
-	  "filename" : "icon-20.png",
-      "scale": "1x"
+      "filename": "icon-1024-167x167.png",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "size" : "20x20",
       "idiom": "ipad",
-	  "filename" : "icon-20@2x.png",
-      "scale": "2x"
+      "filename": "icon-1024-152x152.png",
+      "scale": "2x",
+      "size": "76x76"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-29@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "filename": "icon-1024-120x120.png",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "icon-29@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "filename": "icon-1024-120x120.png",
+      "scale": "2x",
+      "size": "60x60"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "filename": "icon-1024-87x87.png",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "icon-40@3x.png",
-      "scale" : "3x"
+      "idiom": "ipad",
+      "filename": "icon-1024-80x80.png",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-60@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "filename": "icon-1024-80x80.png",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "icon-60@3x.png",
-      "scale" : "3x"
+      "idiom": "ipad",
+      "filename": "icon-1024-76x76.png",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-29.png",
-      "scale" : "1x"
+      "idiom": "iphone",
+      "filename": "icon-1024-60x60.png",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "icon-29@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "filename": "icon-1024-58x58.png",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40.png",
-      "scale" : "1x"
+      "idiom": "iphone",
+      "filename": "icon-1024-58x58.png",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "icon-40@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "filename": "icon-1024-40x40.png",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-76.png",
-      "scale" : "1x"
+      "idiom": "iphone",
+      "filename": "icon-1024-40x40.png",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "icon-76@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "filename": "icon-1024-40x40.png",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "icon-83.5@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "filename": "icon-1024-29x29.png",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "icon-1024.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "filename": "icon-1024-20x20.png",
+      "scale": "1x",
+      "size": "20x20"
     }
   ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
+  "info": {
+    "version": 1,
+    "author": "fastlane"
   }
-}
+}

ownCloudAppShared/UIKit Extension/UIColor+Extension.swift

@@ -28,6 +28,11 @@ extension UIColor {
 		self.init(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(alpha))
 	}
 
+	public convenience init(hexa unsignedRGBAHex: UInt) {
+		let rgbaHex = Int(unsignedRGBAHex)
+		self.init(red: (rgbaHex >> 24) & 0xFF, green: (rgbaHex >> 16) & 0xFF, blue: (rgbaHex >> 8) & 0xFF, alpha: Float(rgbaHex & 0xFF) / 255.0)
+	}
+
 	public convenience init(hex unsignedRGBHex: UInt, alpha: Float = 1.0) {
 		let rgbHex = Int(unsignedRGBHex)
 		self.init(red: (rgbHex >> 16) & 0xFF, green: (rgbHex >> 8) & 0xFF, blue: (rgbHex & 0xFF), alpha: alpha)

ownCloudAppShared/User Interface/Theme/ThemeCollection.swift

@@ -678,8 +678,8 @@ public class ThemeCollection : NSObject {
 			ThemeCSSRecord(selectors: [.vectorImage, .symbolColor], 	property: .fill, value: iconSymbolColor),
 
 			// Welcome screen
-			ThemeCSSRecord(selectors: [.welcome, .message, .background],    property: .fill,   value: lightBrandColor),
-			ThemeCSSRecord(selectors: [.welcome, .message, .title],     property: .stroke, value: darkBrandSet.labelColor),
+			ThemeCSSRecord(selectors: [.welcome, .message, .background], property: .fill,   value: UIColor(red: 0, green: 0, blue: 0, alpha: 0.2)),
+			ThemeCSSRecord(selectors: [.welcome, .message, .title],      property: .stroke, value: darkBrandSet.labelColor),
 			ThemeCSSRecord(selectors: [.welcome, .message, .button],     property: .stroke, value: darkBrandSet.labelColor),
 			ThemeCSSRecord(selectors: [.welcome, .message, .button],     property: .fill,   value: darkBrandColor),
 

ownCloudAppShared/User Interface/Theme/ThemeStyle.swift

@@ -64,6 +64,18 @@ public extension String {
 			}
 		}
 
+		if self.hasPrefix("#"), self.count == 9 {
+			// Format: #RRGGBBAA
+			if let hexRGB = UInt(self.replacingOccurrences(of: "#", with: ""), radix: 16) {
+				return UIColor(hexa: hexRGB)
+			}
+		} else if self.count == 8 {
+			// Format: RRGGBBAA
+			if let hexRGB = UInt(self, radix: 16) {
+				return UIColor(hexa: hexRGB)
+			}
+		}
+
 		return nil
 	}
 }