From f84b2ebbb04582fad7caeb372afd884ee8bf2f53 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 27 Jun 2023 16:37:17 +0200
Subject: [PATCH] Rename `ElementX` to `Element X`. Only for user facing value.
 In the doc I prefer to keep `ElementX`.

---
 app/build.gradle.kts                                        | 6 +++---
 .../api/preferences/AnalyticsPreferencesStateProvider.kt    | 2 +-
 .../features/analytics/impl/AnalyticsOptInStateProvider.kt  | 4 +---
 .../matrix/impl/auth/RustMatrixAuthenticationService.kt     | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 333a9e5793..9fc8d7a20f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -92,13 +92,13 @@ android {
 
     buildTypes {
         named("debug") {
-            resValue("string", "app_name", "ElementX dbg")
+            resValue("string", "app_name", "Element X dbg")
             applicationIdSuffix = ".debug"
             signingConfig = signingConfigs.getByName("debug")
         }
 
         named("release") {
-            resValue("string", "app_name", "ElementX")
+            resValue("string", "app_name", "Element X")
             signingConfig = signingConfigs.getByName("debug")
 
             postprocessing {
@@ -115,7 +115,7 @@ android {
             initWith(release)
             applicationIdSuffix = ".nightly"
             versionNameSuffix = "-nightly"
-            resValue("string", "app_name", "ElementX nightly")
+            resValue("string", "app_name", "Element X nightly")
             matchingFallbacks += listOf("release")
             signingConfig = signingConfigs.getByName("nightly")
 
diff --git a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
index 7ff4a5d1a7..ea397b4d67 100644
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/preferences/AnalyticsPreferencesStateProvider.kt
@@ -26,7 +26,7 @@ open class AnalyticsPreferencesStateProvider : PreviewParameterProvider<Analytic
 }
 
 fun aAnalyticsPreferencesState() = AnalyticsPreferencesState(
-    applicationName = "ElementX",
+    applicationName = "Element X",
     isEnabled = false,
     eventSink = {}
 )
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
index e0e3450ca3..544e4a5649 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
@@ -17,8 +17,6 @@
 package io.element.android.features.analytics.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.core.meta.BuildMeta
 import javax.inject.Inject
 
 open class AnalyticsOptInStateProvider @Inject constructor(
@@ -30,6 +28,6 @@ open class AnalyticsOptInStateProvider @Inject constructor(
 }
 
 fun aAnalyticsOptInState() = AnalyticsOptInState(
-    applicationName = "ElementX",
+    applicationName = "Element X",
     eventSink = {}
 )
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
index 853b915784..bdb87b298c 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
@@ -116,7 +116,7 @@ class RustMatrixAuthenticationService @Inject constructor(
     override suspend fun login(username: String, password: String): Result<SessionId> =
         withContext(coroutineDispatchers.io) {
             runCatching {
-                val client = authService.login(username, password, "ElementX Android", null)
+                val client = authService.login(username, password, "Element X Android", null)
                 val sessionData = client.use { it.session().toSessionData() }
                 sessionStore.storeData(sessionData)
                 SessionId(sessionData.userId)