remove duplicate image for branding

iOSClient/Brand/Custom.xcassets/backgroundDetail.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "backgroundDetail.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "backgroundDetail@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "backgroundDetail@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Brand/Custom.xcassets/launchscreen.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "launchscreen.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "launchscreen@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "launchscreen@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Brand/Custom.xcassets/loginLogo.imageset/Contents.json → iOSClient/Brand/Custom.xcassets/logo.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "loginLogo.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "loginLogo@2x.png",
+      "filename" : "logo@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "loginLogo@3x.png",
       "scale" : "3x"
     }
   ],

iOSClient/Brand/Custom.xcassets/themingBackground.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "themingBackground.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "themingBackground@3x.png",
       "scale" : "3x"
     }
   ],

iOSClient/Brand/LaunchScreen.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -15,7 +15,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launchscreen" translatesAutoresizingMaskIntoConstraints="NO" id="Rrv-MP-hCW">
+                <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="Rrv-MP-hCW">
                     <rect key="frame" x="8" y="8" width="464" height="464"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="464" id="9WT-Cv-gy8"/>
@@ -34,6 +34,6 @@
         </view>
     </objects>
     <resources>
-        <image name="launchscreen" width="223" height="157"/>
+        <image name="logo" width="107" height="75.599998474121094"/>
     </resources>
 </document>

iOSClient/Brand/NCBrand.swift

@@ -103,7 +103,7 @@ class NCBrandColor: NSObject {
     @objc public let disable_multiaccount:              Bool = false
     @objc public let disable_manage_account:            Bool = false
     @objc public let disable_more_external_site:        Bool = false
-    @objc public let disable_openin_file:               Bool = false
+    @objc public let disable_openin_file:               Bool = false                                                // Don't touch me !!
 
     override init() {
         

iOSClient/Login/CCLogin.m

@@ -46,7 +46,7 @@
     self.view.backgroundColor = [NCBrandColor sharedInstance].customer;
     
     // Image Brand
-    self.imageBrand.image = [UIImage imageNamed:@"loginLogo"];
+    self.imageBrand.image = [UIImage imageNamed:@"logo"];
     
     // Annulla
     [self.annulla setTitle:NSLocalizedString(@"_cancel_", nil) forState:UIControlStateNormal];

iOSClient/Main/CCDetail.m

@@ -89,7 +89,7 @@
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(insertGeocoderLocation:) name:@"insertGeocoderLocation" object:nil];
 
-    self.imageBackground.image = [UIImage imageNamed:@"backgroundDetail"];
+    self.imageBackground.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"logo"] multiplier:2 color:[[[NCBrandColor sharedInstance] brand] colorWithAlphaComponent:0.4]];
     
     // Change bar bottom line shadow and remove title back button <"title"
     self.navigationController.navigationBar.shadowImage = [CCGraphics generateSinglePixelImageWithColor:[NCBrandColor sharedInstance].brand];

iOSClient/Main/Main.storyboard

@@ -282,7 +282,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" tag="999" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" preservesSuperviewLayoutMargins="YES" image="backgroundDetail" translatesAutoresizingMaskIntoConstraints="NO" id="zlU-MP-ZVs">
+                            <imageView userInteractionEnabled="NO" tag="999" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" preservesSuperviewLayoutMargins="YES" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="zlU-MP-ZVs">
                                 <rect key="frame" x="134" y="296" width="107" height="75"/>
                             </imageView>
                         </subviews>
@@ -819,8 +819,8 @@
     </scenes>
     <resources>
         <image name="avatar" width="25" height="25"/>
-        <image name="backgroundDetail" width="107" height="75.599998474121094"/>
         <image name="disclosureIndicator" width="13" height="14"/>
+        <image name="logo" width="107" height="75.599998474121094"/>
         <image name="tabBarPlus" width="40" height="40"/>
     </resources>
     <inferredMetricsTieBreakers>