Update some button styles and placeholder screen usages.

element-hq · Jul 20, 2023 · 8d34a13 · 8d34a13
1 parent e7a7a8c
commit 8d34a13
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift
@@ -503,7 +503,7 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationCoordinatorDelegate,
 
         showLoadingIndicator()
 
-        navigationRootCoordinator.setRootCoordinator(SplashScreenCoordinator())
+        navigationRootCoordinator.setRootCoordinator(PlaceholderScreenCoordinator())
 
         stopSync()
         userSessionFlowCoordinator?.stop()

diff --git a/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift b/ElementX/Sources/Other/SwiftUI/Form Styles/FormButtonStyles.swift
@@ -152,15 +152,21 @@ struct FormButtonStyles_Previews: PreviewProvider {
                 }
                 .buttonStyle(FormButtonStyle())
 
+                Button { } label: {
+                    Label("Block user", systemImage: "circle.slash")
+                }
+                .buttonStyle(FormButtonStyle(accessory: .progressView))
+                .disabled(true)
+
                 Button { } label: {
                     Label("Show something", systemImage: "rectangle.portrait")
                 }
                 .buttonStyle(FormButtonStyle(accessory: .navigationLink))
 
                 Button(role: .destructive) { } label: {
-                    Label("Show destruction", systemImage: "rectangle.portrait")
+                    Label("Destroy", systemImage: "trash")
                 }
-                .buttonStyle(FormButtonStyle(accessory: .navigationLink))
+                .buttonStyle(FormButtonStyle())
 
                 ShareLink(item: "test")
                     .buttonStyle(FormButtonStyle())

diff --git a/UnitTests/Sources/RoomFlowCoordinatorTests.swift b/UnitTests/Sources/RoomFlowCoordinatorTests.swift
@@ -30,7 +30,7 @@ class RoomFlowCoordinatorTests: XCTestCase {
         let mediaProvider = MockMediaProvider()
         let userSession = MockUserSession(clientProxy: clientProxy, mediaProvider: mediaProvider)
 
-        let navigationSplitCoordinator = NavigationSplitCoordinator(placeholderCoordinator: SplashScreenCoordinator())
+        let navigationSplitCoordinator = NavigationSplitCoordinator(placeholderCoordinator: PlaceholderScreenCoordinator())
         navigationStackCoordinator = NavigationStackCoordinator()
         navigationSplitCoordinator.setDetailCoordinator(navigationStackCoordinator)
 

diff --git a/UnitTests/Sources/UserIndicatorControllerTests.swift b/UnitTests/Sources/UserIndicatorControllerTests.swift
@@ -25,7 +25,7 @@ class UserIndicatorControllerTests: XCTestCase {
     private var indicatorController: UserIndicatorController!
 
     override func setUp() {
-        indicatorController = UserIndicatorController(rootCoordinator: SplashScreenCoordinator())
+        indicatorController = UserIndicatorController(rootCoordinator: PlaceholderScreenCoordinator())
     }
 
     func testIndicatorQueueing() {