Cleanup code

RiotSwiftUI/Modules/UserSessions/Common/View/Label+Style.swift

@@ -0,0 +1,25 @@
+// 
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+extension Label where Title == Text, Icon == Image  {
+    init(showLocationInfo: Bool) {
+        let text = showLocationInfo ? VectorL10n.userSessionsHideLocationInfo : VectorL10n.userSessionsShowLocationInfo
+        let image = showLocationInfo ? "eye.slash" : "eye"
+        self.init(text, systemImage: image)
+    }
+}

RiotSwiftUI/Modules/UserSessions/UserOtherSessions/View/UserOtherSessionsToolbar.swift

@@ -91,9 +91,7 @@ struct UserOtherSessionsToolbar: ToolbarContent {
                 Button {
                     isShowLocationEnabled.toggle()
                 } label: {
-                    let text = isShowLocationEnabled ? VectorL10n.userSessionsHideLocationInfo : VectorL10n.userSessionsShowLocationInfo
-                    let image = isShowLocationEnabled ? "eye.slash" : "eye"
-                    Label(text, systemImage: image)
+                    Label(showLocationInfo: isShowLocationEnabled)
                 }
                 
                 if sessionCount > 0 {

RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift

@@ -70,10 +70,10 @@ struct UserSessionOverview: View {
                         .accessibilityIdentifier(VectorL10n.manageSessionRename)
                         
                         if viewModel.viewState.isCurrentSession == false {
-                            Button { viewModel.showLocationInfo.toggle() } label: {
-                                let text = viewModel.showLocationInfo ? VectorL10n.userSessionsHideLocationInfo : VectorL10n.userSessionsShowLocationInfo
-                                let image = viewModel.showLocationInfo ? "eye.slash" : "eye"
-                                Label(text, systemImage: image)
+                            Button {
+                                viewModel.showLocationInfo.toggle()
+                            } label: {
+                                Label(showLocationInfo: viewModel.showLocationInfo)
                             }
                         }
                     }

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/View/UserSessionsOverview.swift

@@ -147,9 +147,7 @@ struct UserSessionsOverview: View {
             Button {
                 viewModel.showLocationInfo.toggle()
             } label: {
-                let text = viewModel.showLocationInfo ? VectorL10n.userSessionsHideLocationInfo : VectorL10n.userSessionsShowLocationInfo
-                let image = viewModel.showLocationInfo ? "eye.slash" : "eye"
-                Label(text, systemImage: image)
+                Label(showLocationInfo: viewModel.showLocationInfo)
             }
             
             signOutButton