superhero-com · choaibe-ifaoui · Sep 18, 2023 · Sep 18, 2023
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
@@ -1,7 +1,7 @@
 blank_issues_enabled: true
 contact_links:
  - name: Matrix Community Support
-   url: "https://matrix.to/#/#matrix:matrix.org"
+   url: "https://matrix.to/#/#matrix:superhero.com"
    about: General support questions can be asked here.
  - name: Matrix Security Policy
    url: https://www.matrix.org/security-disclosure-policy/

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/ElementX.xcscheme
@@ -4,8 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -16,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-               BuildableName = "ElementX.app"
+               BuildableName = "Superhero.app"
                BlueprintName = "ElementX"
                ReferencedContainer = "container:ElementX.xcodeproj">
             </BuildableReference>
@@ -30,34 +29,30 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES">
-      <TestPlans>
-         <TestPlanReference
-            default = "YES"
-            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan">
-         </TestPlanReference>
-      </TestPlans>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <Testables>
-      </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -74,13 +69,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "HTTPS_PROXY"
@@ -110,13 +103,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/IntegrationTests.xcscheme
@@ -4,8 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -30,12 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES">
-      <TestPlans>
-         <TestPlanReference
-            default = "YES"
-            reference = "container:IntegrationTests/SupportingFiles/IntegrationTests.xctestplan">
-         </TestPlanReference>
-      </TestPlans>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -45,19 +38,21 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <Testables>
-      </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:IntegrationTests/SupportingFiles/IntegrationTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -78,17 +73,13 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <CommandLineArguments>
-      </CommandLineArguments>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme b/ElementX.xcodeproj/xcshareddata/xcschemes/UnitTests.xcscheme
@@ -4,8 +4,7 @@
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES"
-      runPostActionsOnFailure = "NO">
+      buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"
@@ -30,12 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES">
-      <TestPlans>
-         <TestPlanReference
-            default = "YES"
-            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan">
-         </TestPlanReference>
-      </TestPlans>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -45,19 +38,21 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <Testables>
-      </Testables>
-      <CommandLineArguments>
-      </CommandLineArguments>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C0FAEB81CFD9776CD78CE489"
-            BuildableName = "ElementX.app"
+            BuildableName = "Superhero.app"
             BlueprintName = "ElementX"
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </CodeCoverageTargets>
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:UnitTests/SupportingFiles/UnitTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -78,17 +73,13 @@
             ReferencedContainer = "container:ElementX.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <CommandLineArguments>
-      </CommandLineArguments>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <CommandLineArguments>
-      </CommandLineArguments>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"

diff --git a/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png b/ElementX/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon.png
diff --git a/ElementX/Resources/Assets.xcassets/images/app-logo.imageset/app-logo.pdf b/ElementX/Resources/Assets.xcassets/images/app-logo.imageset/app-logo.pdf
diff --git a/ElementX/Resources/Localizations/de.lproj/Localizable.strings b/ElementX/Resources/Localizations/de.lproj/Localizable.strings
@@ -263,7 +263,7 @@
 "screen_create_poll_question_hint" = "Worum geht es bei der Umfrage?";
 "screen_create_poll_title" = "Umfrage erstellen";
 "screen_create_room_action_create_room" = "Neuer Raum";
-"screen_create_room_action_invite_people" = "Freunde zu Element einladen";
+"screen_create_room_action_invite_people" = "Freunde zu Superhero Chat einladen";
 "screen_create_room_add_people_title" = "Personen einladen";
 "screen_create_room_error_creating_room" = "Beim Erstellen des Raums ist ein Fehler aufgetreten";
 "screen_create_room_private_option_description" = "Die Nachrichten in diesem Raum sind verschlüsselt. Die Verschlüsselung kann nicht nachträglich deaktiviert werden.";
@@ -325,9 +325,9 @@
 "screen_onboarding_sign_in_with_qr_code" = "Mit QR-Code anmelden";
 "screen_onboarding_sign_up" = "Konto erstellen";
 "screen_onboarding_subtitle" = "Sicher kommunizieren und zusammenarbeiten";
-"screen_onboarding_welcome_message" = "Willkommen beim schnellsten Element aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit.";
+"screen_onboarding_welcome_message" = "Willkommen beim schnellsten Superhero Chat aller Zeiten. Optimiert für Geschwindigkeit und Einfachheit.";
 "screen_onboarding_welcome_subtitle" = "Willkommen zu %1$@. Aufgeladen, für Geschwindigkeit und Einfachheit.";
-"screen_onboarding_welcome_title" = "Seien Sie in Ihrem Element";
+"screen_onboarding_welcome_title" = "Seien Sie in Ihrem Superhero Chat";
 "screen_report_content_block_user_hint" = "Prüfen Sie, ob Sie alle aktuellen und zukünftigen Nachrichten dieses Benutzers ausblenden möchten";
 "screen_room_attachment_source_camera" = "Kamera";
 "screen_room_attachment_source_camera_photo" = "Foto machen";
@@ -393,7 +393,7 @@
 "screen_roomlist_empty_title" = "Noch keine Chats.";
 "screen_roomlist_main_space_title" = "Alle Chats";
 "screen_server_confirmation_change_server" = "Kontoanbieter wechseln";
-"screen_server_confirmation_message_login_element_dot_io" = "Ein privater Server für die Mitarbeiter von Element.";
+"screen_server_confirmation_message_login_element_dot_io" = "Ein privater Server für die Mitarbeiter von Superhero Chat.";
 "screen_server_confirmation_message_login_matrix_dot_org" = "Matrix ist ein offenes Netzwerk für eine sichere, dezentrale Kommunikation.";
 "screen_server_confirmation_message_register" = "Hier werden Ihre Gespräche gespeichert - so wie Sie Ihre E-Mails bei einem E-Mail-Anbieter aufbewahren würden.";
 "screen_server_confirmation_title_login" = "Sie sind dabei, sich bei %1$@ anzumelden";

diff --git a/ElementX/Resources/Localizations/en.lproj/Localizable.strings b/ElementX/Resources/Localizations/en.lproj/Localizable.strings
@@ -327,7 +327,7 @@
 "screen_onboarding_subtitle" = "Communicate and collaborate securely";
 "screen_onboarding_welcome_message" = "Welcome to the fastest Element ever. Supercharged for speed and simplicity.";
 "screen_onboarding_welcome_subtitle" = "Welcome to %1$@. Supercharged, for speed and simplicity.";
-"screen_onboarding_welcome_title" = "Be in your element";
+"screen_onboarding_welcome_title" = "Be in your Superhero Chat";
 "screen_report_content_block_user_hint" = "Check if you want to hide all current and future messages from this user";
 "screen_room_attachment_source_camera" = "Camera";
 "screen_room_attachment_source_camera_photo" = "Take photo";

diff --git a/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.strings b/ElementX/Resources/Localizations/zh-Hant-TW.lproj/Localizable.strings
@@ -327,7 +327,7 @@
 "screen_onboarding_subtitle" = "Communicate and collaborate securely";
 "screen_onboarding_welcome_message" = "歡迎使用有史以來最快的 Element。速度超快，操作簡便。";
 "screen_onboarding_welcome_subtitle" = "Welcome to %1$@. Supercharged, for speed and simplicity.";
-"screen_onboarding_welcome_title" = "Be in your element";
+"screen_onboarding_welcome_title" = "Be in your Superhero Chat";
 "screen_report_content_block_user_hint" = "Check if you want to hide all current and future messages from this user";
 "screen_room_attachment_source_camera" = "照相機";
 "screen_room_attachment_source_camera_photo" = "拍照";

diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
@@ -88,7 +88,7 @@ final class AppSettings {
 
     /// The default homeserver address used. This is intentionally a string without a scheme
     /// so that it can be passed to Rust as a ServerName for well-known discovery.
-    let defaultHomeserverAddress = "matrix.org"
+    let defaultHomeserverAddress = "superhero.com"
 
     /// An override of the homeserver's Sliding Sync proxy URL. This allows development against servers
     /// that don't yet have an officially trusted proxy configured in their well-known.

diff --git a/ElementX/Sources/Mocks/AggregatedReactionMock.swift b/ElementX/Sources/Mocks/AggregatedReactionMock.swift
@@ -19,7 +19,7 @@ import Foundation
 extension AggregatedReaction {
     private static func mockIds(_ count: Int) -> [String] {
         Array(1...count).map {
-            "@user\($0):matrix.org"
+            "@user\($0):superhero.com"
         }
     }
 

diff --git a/ElementX/Sources/Mocks/RoomMemberProxyMock.swift b/ElementX/Sources/Mocks/RoomMemberProxyMock.swift
@@ -49,42 +49,42 @@ extension RoomMemberProxyMock {
 
     // Mocks
     static var mockAlice: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@alice:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@alice:superhero.com",
                                         displayName: "Alice",
                                         avatarURL: nil,
                                         membership: .join))
     }
 
     static var mockInvitedAlice: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@alice:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@alice:superhero.com",
                                         displayName: "Alice",
                                         avatarURL: nil,
                                         membership: .invite))
     }
 
     static var mockBob: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@bob:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@bob:superhero.com",
                                         displayName: "Bob",
                                         avatarURL: nil,
                                         membership: .join))
     }
 
     static var mockCharlie: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@charlie:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@charlie:superhero.com",
                                         displayName: "Charlie",
                                         avatarURL: nil,
                                         membership: .join))
     }
 
     static var mockDan: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@dan:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@dan:superhero.com",
                                         displayName: "Dan",
                                         avatarURL: URL.picturesDirectory,
                                         membership: .join))
     }
 
     static var mockMe: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@me:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@me:superhero.com",
                                         displayName: "Me",
                                         avatarURL: URL.picturesDirectory,
                                         membership: .join,
@@ -93,7 +93,7 @@ extension RoomMemberProxyMock {
     }
 
     static var mockIgnored: RoomMemberProxyMock {
-        RoomMemberProxyMock(with: .init(userID: "@ignored:matrix.org",
+        RoomMemberProxyMock(with: .init(userID: "@ignored:superhero.com",
                                         displayName: "Ignored",
                                         avatarURL: nil,
                                         membership: .join,

diff --git a/ElementX/Sources/Mocks/UserProfile+Mock.swift b/ElementX/Sources/Mocks/UserProfile+Mock.swift
@@ -19,22 +19,22 @@ import Foundation
 extension UserProfileProxy {
     // Mocks
     static var mockAlice: UserProfileProxy {
-        .init(userID: "@alice:matrix.org", displayName: "Alice", avatarURL: "mxc://matrix.org/UcCimidcvpFvWkPzvjXMQPHA")
+        .init(userID: "@alice:superhero.com", displayName: "Alice", avatarURL: "mxc://matrix.org/UcCimidcvpFvWkPzvjXMQPHA")
     }
 
     static var mockBob: UserProfileProxy {
-        .init(userID: "@bob:matrix.org", displayName: "Bob", avatarURL: nil)
+        .init(userID: "@bob:superhero.com", displayName: "Bob", avatarURL: nil)
     }
 
     static var mockBobby: UserProfileProxy {
-        .init(userID: "@bobby:matrix.org", displayName: "Bobby", avatarURL: nil)
+        .init(userID: "@bobby:superhero.com", displayName: "Bobby", avatarURL: nil)
     }
 
     static var mockCharlie: UserProfileProxy {
-        .init(userID: "@charlie:matrix.org", displayName: "Charlie", avatarURL: nil)
+        .init(userID: "@charlie:superhero.com", displayName: "Charlie", avatarURL: nil)
     }
 
     static var mockVerbose: UserProfileProxy {
-        .init(userID: "@charlie:matrix.org", displayName: "Charlie is the best display name", avatarURL: nil)
+        .init(userID: "@charlie:superhero.com", displayName: "Charlie is the best display name", avatarURL: nil)
     }
 }
diff --git a/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift b/ElementX/Sources/Other/SwiftUI/Views/AvatarHeaderView.swift
@@ -67,7 +67,7 @@ struct HeaderView_Previews: PreviewProvider {
                              id: "test",
                              avatarSize: .room(on: .details),
                              imageProvider: MockMediaProvider(),
-                             subtitle: "#test:matrix.org") {
+                             subtitle: "#test:superhero.com") {
                 HStack(spacing: 32) {
                     ShareLink(item: "test") {
                         Image(systemName: "square.and.arrow.up")