Make the app version and the device ID copyable in the Settings screen. (#1389)

ElementX/Sources/Screens/Settings/SettingsScreen/View/SettingsScreen.swift

@@ -165,9 +165,12 @@ struct SettingsScreen: View {
                 versionText
                     .frame(maxWidth: .infinity)
                 
-                context.viewState.deviceID.map(Text.init)
+                if let deviceID = context.viewState.deviceID {
+                    Text(deviceID)
+                }
             }
             .compoundFormSectionFooter()
+            .textSelection(.enabled)
             .padding(.top, 24)
         }
         .compoundFormSection()
@@ -201,7 +204,8 @@ private extension TimelineStyle {
 
 struct SettingsScreen_Previews: PreviewProvider {
     static let viewModel = {
-        let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com"),
+        let userSession = MockUserSession(clientProxy: MockClientProxy(userID: "@userid:example.com",
+                                                                       deviceID: "AAAAAAAAAAA"),
                                           mediaProvider: MockMediaProvider())
         ServiceLocator.shared.settings.notificationSettingsEnabled = true
         return SettingsScreenViewModel(userSession: userSession,

ElementX/Sources/Services/Client/ClientProxy.swift

@@ -87,7 +87,7 @@ class ClientProxy: ClientProxyProtocol {
         }
     }
 
-    var deviceId: String? {
+    var deviceID: String? {
         do {
             return try client.deviceId()
         } catch {

ElementX/Sources/Services/Client/ClientProxyProtocol.swift

@@ -68,7 +68,7 @@ protocol ClientProxyProtocol: AnyObject, MediaLoaderProtocol {
     
     var userID: String { get }
 
-    var deviceId: String? { get }
+    var deviceID: String? { get }
 
     var homeserver: String { get }
 

ElementX/Sources/Services/Client/MockClientProxy.swift

@@ -22,7 +22,7 @@ class MockClientProxy: ClientProxyProtocol {
     let callbacks = PassthroughSubject<ClientProxyCallback, Never>()
     
     let userID: String
-    let deviceId: String? = nil
+    let deviceID: String?
     let homeserver = ""
     let restorationToken: RestorationToken? = nil
     
@@ -34,8 +34,9 @@ class MockClientProxy: ClientProxyProtocol {
 
     var isSyncing: Bool { false }
     
-    internal init(userID: String, roomSummaryProvider: RoomSummaryProviderProtocol? = MockRoomSummaryProvider()) {
+    internal init(userID: String, deviceID: String? = nil, roomSummaryProvider: RoomSummaryProviderProtocol? = MockRoomSummaryProvider()) {
         self.userID = userID
+        self.deviceID = deviceID
         self.roomSummaryProvider = roomSummaryProvider
     }
 

ElementX/Sources/Services/Session/MockUserSession.swift

@@ -20,7 +20,7 @@ struct MockUserSession: UserSessionProtocol {
     let callbacks = PassthroughSubject<UserSessionCallback, Never>()
     let sessionVerificationController: SessionVerificationControllerProxyProtocol? = nil
     var userID: String { clientProxy.userID }
-    var deviceID: String? { clientProxy.deviceId }
+    var deviceID: String? { clientProxy.deviceID }
     var homeserver: String { clientProxy.homeserver }
     let clientProxy: ClientProxyProtocol
     let mediaProvider: MediaProviderProtocol

ElementX/Sources/Services/Session/UserSession.swift

@@ -23,7 +23,7 @@ class UserSession: UserSessionProtocol {
     private var authErrorCancellable: AnyCancellable?
     
     var userID: String { clientProxy.userID }
-    var deviceID: String? { clientProxy.deviceId }
+    var deviceID: String? { clientProxy.deviceID }
     var homeserver: String { clientProxy.homeserver }
 
     let clientProxy: ClientProxyProtocol

changelog.d/623.change

@@ -0,0 +1 @@
+Make the app version and the device ID copyable in the Settings screen.