Features/re branding

CHANGES.md

@@ -3103,7 +3103,7 @@ Bug fix:
  * Xcode11: Fix status bar styles for many screens (PR #3077).
  * Xcode11: Replace deprecated MPMoviePlayerController with AVPlayerViewController (PR #3092).
  * Xcode11: Show AuthenticationViewController fullscreen (PR #3093).
- * Xcode11: Fix font used for `org.matrix.custom.html`messages in timeline (#3241).
+ * Xcode11: Fix font used for `com.superhero.chat.custom.html`messages in timeline (#3241).
  * Settings: New phone number is invisible in dark theme (#3218).
  * SettingsViewController: Fix notifications on this device setting to use APNS pusher (#3291).
  * Xcode11: Fix decryption on notifications when the key is not present (#3295).
@@ -4464,7 +4464,7 @@ Improvements:
  * Room preview: Show a preview of messages.
  * Room preview: Improve header in landscape
  * Add missing slash commands: /invite, /part and /topic #223.
- * Add Markdown typing support and display of "org.matrix.custom.html" messages body #403
+ * Add Markdown typing support and display of "com.superhero.chat.custom.html" messages body #403
  * Room search: search result includes the search pattern when it corresponds to a valid room alias or id #328
  * Room search: Room preview is used when the user selects a public room that he did not join yet #329.
  * Rooms global search: Refresh the current search results when view will appear.

Config/AppIdentifiers.xcconfig

@@ -16,13 +16,13 @@
 
 
 // App identity
-BUNDLE_DISPLAY_NAME = Element
-BASE_BUNDLE_IDENTIFIER = im.vector.app
+BUNDLE_DISPLAY_NAME = Superhero Chat
+BASE_BUNDLE_IDENTIFIER = com.superhero.chat
 APPLICATION_GROUP_IDENTIFIER = group.im.vector
 APPLICATION_SCHEME = element
 
 // Team
-DEVELOPMENT_TEAM = 7J4U792NQT
+DEVELOPMENT_TEAM = 8H7FGC266S
 
 
 // Provisioning profiles

Config/BuildSettings.swift

@@ -190,13 +190,13 @@ final class BuildSettings: NSObject {
 
     #if DEBUG
     /// The configuration to use for analytics during development. Set `isEnabled` to false to disable analytics in debug builds.
-    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "im.vector.app"),
+    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "com.superhero.chat"),
                                                                host: "https://posthog.element.dev",
                                                                apiKey: "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN",
                                                                termsURL: URL(string: "https://element.io/cookie-policy")!)
     #else
     /// The configuration to use for analytics. Set `isEnabled` to false to disable analytics.
-    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "im.vector.app"),
+    static let analyticsConfiguration = AnalyticsConfiguration(isEnabled: BuildSettings.baseBundleIdentifier.starts(with: "com.superhero.chat"),
                                                                host: "https://posthog.element.io",
                                                                apiKey: "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
                                                                termsURL: URL(string: "https://element.io/cookie-policy")!)

Config/MDMSettings.swift

@@ -20,9 +20,9 @@ enum MDMSettings {
     private static let appleManagedConfigurationKey = "com.apple.configuration.managed"
 
     private enum Key: String {
-        case serverConfigDefaultHomeserverUrlString = "im.vector.app.serverConfigDefaultHomeserverUrlString"
-        case serverConfigSygnalAPIUrlString = "im.vector.app.serverConfigSygnalAPIUrlString"
-        case clientPermalinkBaseUrl = "im.vector.app.clientPermalinkBaseUrl"
+        case serverConfigDefaultHomeserverUrlString = "com.superhero.chat.serverConfigDefaultHomeserverUrlString"
+        case serverConfigSygnalAPIUrlString = "com.superhero.chat.serverConfigSygnalAPIUrlString"
+        case clientPermalinkBaseUrl = "com.superhero.chat.clientPermalinkBaseUrl"
     }
 
     static var serverConfigDefaultHomeserverUrlString: String? {

DesignKit/Source/ColorValues.swift

@@ -48,7 +48,13 @@ public struct ColorValues: Colors {
 
     public let ems: UIColor
 
+    public let vibrantGreen: UIColor
+
+    public let cGreen: UIColor
+
     public let links: UIColor
 
     public let namesAndAvatars: [UIColor]
+
+
 }

DesignKit/Source/ColorsSwiftUI.swift

@@ -48,6 +48,8 @@ public struct ColorSwiftUI: Colors {
 
     public var ems: Color
 
+    public var vibrantGreen: Color
+
     public let links: Color
 
     public let namesAndAvatars: [Color]
@@ -66,6 +68,7 @@ public struct ColorSwiftUI: Colors {
         navigation = Color(values.navigation)
         background = Color(values.background)
         ems = Color(values.ems)
+        vibrantGreen = Color(values.vibrantGreen)
         links = Color(values.links)
         namesAndAvatars = values.namesAndAvatars.map({ Color($0) })
     }

DesignKit/Source/ColorsUIkit.swift

@@ -47,6 +47,8 @@ import UIKit
     public let background: UIColor
 
     public let links: UIColor
+
+    public let cGreen: UIColor
 
     public let namesAndAvatars: [UIColor]
 
@@ -65,6 +67,7 @@ import UIKit
         background = values.background
         links = values.links
         namesAndAvatars = values.namesAndAvatars
+        cGreen = values.cGreen
     }
 }
 

DesignKit/Variants/Colors/Dark/DarkColors.swift

@@ -21,7 +21,7 @@ import SwiftUI
 /// Dark theme colors.
 public class DarkColors {
     private static let values = ColorValues(
-        accent: UIColor(rgb:0x0DBD8B),
+        accent: UIColor(rgb:0x6147FF),
         alert: UIColor(rgb:0xFF4B55),
         primaryContent: UIColor(rgb:0xFFFFFF),
         secondaryContent: UIColor(rgb:0xA9B2BC),
@@ -33,7 +33,9 @@ public class DarkColors {
         tile: UIColor(rgb:0x394049),
         navigation: UIColor(rgb:0x21262C),
         background: UIColor(rgb:0x15191E),
-        ems: UIColor(rgb: 0x7E69FF),
+        ems: UIColor(rgb: 0x7E69FF), 
+        vibrantGreen: UIColor(rgb: 0x03E3AE),
+        cGreen:UIColor(rgb: 0x1ecbac),
         links: UIColor(rgb: 0x0086E6),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),

DesignKit/Variants/Colors/Light/LightColors.swift

@@ -22,7 +22,7 @@ import SwiftUI
 /// Light theme colors.
 public class LightColors {
     private static let values = ColorValues(
-        accent: UIColor(rgb:0x0DBD8B),
+        accent: UIColor(rgb:0x6147FF),
         alert: UIColor(rgb:0xFF4B55),
         primaryContent: UIColor(rgb:0x17191C),
         secondaryContent: UIColor(rgb:0x737D8C),
@@ -35,6 +35,8 @@ public class LightColors {
         navigation: UIColor(rgb:0xF4F6FA),
         background: UIColor(rgb:0xFFFFFF),
         ems: UIColor(rgb: 0x7E69FF),
+        vibrantGreen: UIColor(rgb: 0x03E3AE),
+        cGreen:UIColor(rgb: 0x1ecbac),
         links: UIColor(rgb: 0x0086E6),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),

Podfile.lock

@@ -183,7 +183,7 @@ SPEC CHECKSUMS:
   KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
   KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
   KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
-  libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
+  libbase58: 8abc2a53ac38cd37720c0acbc53ef3660e9016c2
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b

Riot/Assets/Base.lproj/LaunchScreen.storyboard

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina5_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,31 +19,36 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" insetsLayoutMarginsFromSafeArea="NO" image="background" translatesAutoresizingMaskIntoConstraints="NO" id="Lll-dT-RYv">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                            </imageView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="launch_screen_logo" translatesAutoresizingMaskIntoConstraints="NO" id="IcW-17-3Qq">
                                 <rect key="frame" x="147" y="308" width="120" height="120"/>
-                                <color key="tintColor" red="0.050980392156862744" green="0.74117647058823533" blue="0.54509803921568623" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="IcW-17-3Qq" secondAttribute="height" multiplier="1:1" id="nyP-l5-s1B"/>
                                     <constraint firstAttribute="width" constant="120" id="v1s-rq-3ay"/>
                                 </constraints>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="Lll-dT-RYv" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="Czx-1f-7Mf"/>
                             <constraint firstItem="IcW-17-3Qq" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="F70-sn-ghB"/>
+                            <constraint firstItem="Lll-dT-RYv" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" constant="20" id="MPm-cD-jRp"/>
+                            <constraint firstAttribute="trailing" secondItem="Lll-dT-RYv" secondAttribute="trailing" id="MYW-pd-hBQ"/>
+                            <constraint firstItem="xb3-aO-Qok" firstAttribute="top" secondItem="Lll-dT-RYv" secondAttribute="bottom" id="QTQ-5g-KNN"/>
                             <constraint firstItem="IcW-17-3Qq" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="nJz-qK-nMP"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="52" y="374.66266866566718"/>
+            <point key="canvasLocation" x="50.724637681159422" y="374.18478260869568"/>
         </scene>
     </scenes>
     <resources>
-        <image name="launch_screen_logo" width="240" height="240"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
+        <image name="background" width="1024" height="1024"/>
+        <image name="launch_screen_logo" width="143.33332824707031" height="240"/>
     </resources>
 </document>

Riot/Assets/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -12,7 +12,7 @@
             <objects>
                 <navigationController id="RMx-3f-FxP" userLabel="HomeNav" customClass="RiotNavigationController" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="Pmd-2v-anx">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -356,7 +356,7 @@
             <objects>
                 <navigationController title="RoomNav" id="vC3-pB-5Vb" customClass="RiotNavigationController" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="DjV-YW-jjY">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="20" width="375" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -532,10 +532,10 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="rok-Xg-Mhx"/>
+        <segue reference="y6u-0X-urR"/>
     </inferredMetricsTieBreakers>
     <resources>
-        <image name="launch_screen_logo" width="240" height="240"/>
+        <image name="launch_screen_logo" width="72.5" height="120"/>
         <image name="search_icon" width="24" height="24"/>
         <image name="settings_icon" width="24" height="24"/>
         <image name="tab_favourites" width="24" height="24"/>

Riot/Assets/Images.xcassets/Home/background.imageset/Contents.json

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

Riot/Assets/Images.xcassets/Home/superheroLogoDark.imageset/Contents.json

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

Riot/Assets/Images.xcassets/Home/superheroLogoLight.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "superheroLogo.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Onboarding/loading1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "loading1.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Onboarding/loading2.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "loading2.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Onboarding/loading3.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "loading3.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Onboarding/loading4.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "loading4.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Onboarding/onboarding_splash_screen_page_1.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "OnboardingSplashScreenPage1.pdf",
+      "filename" : "Superhero (6) 1.png",
       "idiom" : "universal"
     }
   ],

Riot/Assets/Images.xcassets/Onboarding/onboarding_splash_screen_page_1_dark.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "OnboardingSplashScreenPage1-Dark.pdf",
+      "filename" : "Superhero (6) 1.png",
       "idiom" : "universal"
     }
   ],

Riot/Assets/Images.xcassets/Onboarding/onboarding_splash_screen_page_2.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "OnboardingSplashScreenPage2.pdf",
+      "filename" : "background image 1.png",
       "idiom" : "universal"
     }
   ],