Merge pull request #842 from Infomaniak/rebrand-app

chore: Rebrand app

.package.resolved

@@ -246,8 +246,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect",
       "state" : {
-        "revision" : "56065b729481abce73fe606e218024bc77d055cd",
-        "version" : "0.6.2"
+        "revision" : "dafd88cf0cc09d906dcef9d042743ae13fcff0d4",
+        "version" : "0.6.3"
       }
     },
     {

Mail/Info.plist

@@ -11,15 +11,15 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>kMail</string>
+	<string>ikMail</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>kMail</string>
+	<string>ikMail</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -101,10 +101,10 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoadsInWebContent</key>
-        <true/>
-    </dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

MailCore/Utils/Constants.swift

@@ -65,7 +65,7 @@ public enum Constants {
 
     public static let sizeChangeThreshold = 3
     public static let viewportContent = "width=device-width, initial-scale=1.0"
-    public static let divWrapperId = "kmail-message-content"
+    public static let divWrapperId = "ikmail-message-content"
     public static let mungeEmailScript: String? = {
         guard let mungeScript = Bundle.main.load(filename: "mungeEmail", withExtension: "js") else { return nil }
         return "const MESSAGE_SELECTOR = \"#\(divWrapperId)\"; \(mungeScript)"
@@ -155,9 +155,10 @@ public enum Constants {
     }
 
     public static func appVersion() -> String {
+        let appName = Bundle.main.object(forInfoDictionaryKey: "CFBundleName") as! String? ?? "Mail"
         let release = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as! String? ?? "x.x"
         let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as! String? ?? "x"
-        return "kMail iOS version \(release)-beta\(build)"
+        return "\(appName) iOS version \(release)-beta\(build)"
     }
 
     public static let searchFolderId = "search_folder_id"

MailCore/Utils/MessageWebViewUtils.swift

@@ -31,7 +31,7 @@ public enum MessageWebViewUtils {
         if let style = Bundle.main.loadCSS(filename: "style") {
             let variables = """
             :root {
-                --kmail-primary-color: \(UserDefaults.shared.accentColor.primary.swiftUIColor.hexRepresentation);
+                --ikmail-primary-color: \(UserDefaults.shared.accentColor.primary.swiftUIColor.hexRepresentation);
             }
             """
             resources += "<style>\(variables + style)</style>".replacingOccurrences(of: "\n", with: "")

MailResources/Assets.xcassets/logo-text.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "logo-light.svg",
+      "filename" : "logo_text_light.svg",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "logo-dark.svg",
+      "filename" : "logo_text_dark.svg",
       "idiom" : "universal"
     }
   ],