renamings and fixes

wireapp · Jan 14, 2025 · 727bc20 · 727bc20
1 parent 9ad9934
commit 727bc20
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 23 deletions.
diff --git a/...p/Protocols/BackupPasswordValidator.swift → ...ols/BackupPasswordValidatorProtocol.swift b/...p/Protocols/BackupPasswordValidator.swift → ...ols/BackupPasswordValidatorProtocol.swift
diff --git a/...I/Sources/WireSettingsUI/Account/Backup/ViewControllers/BackupRestoreViewController.swift b/...I/Sources/WireSettingsUI/Account/Backup/ViewControllers/BackupRestoreViewController.swift
@@ -38,7 +38,7 @@ public final class BackupRestoreViewController: UIViewController {
     }
 
     private func setupView() {
-        let hostingController = UIHostingController(rootView: BackupActionsView(viewModel: viewModel))
+        let hostingController = UIHostingController(rootView: BackupRestoreView(viewModel: viewModel))
         addChild(hostingController)
         hostingController.view.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(hostingController.view)

diff --git a/...ount/Backup/Views/BackupActionsView.swift → ...ount/Backup/Views/BackupRestoreView.swift b/...ount/Backup/Views/BackupActionsView.swift → ...ount/Backup/Views/BackupRestoreView.swift
@@ -20,9 +20,10 @@ import SwiftUI
 import WireDesign
 import WireReusableUIComponents
 
-struct BackupActionsView: View {
+struct BackupRestoreView: View {
+
+    @ObservedObject private(set) var viewModel: BackupRestoreViewModel
 
-    @ObservedObject private var viewModel: BackupRestoreViewModel
     @State private var isExportBackupSheetPresented: Bool = false
     @State private var isBackupPickerPresented: Bool = false
     @State private var isRestoreBackupSheetPresented: Bool = false
@@ -34,13 +35,9 @@ struct BackupActionsView: View {
                 Button {
                     isExportBackupSheetPresented.toggle()
                 } label: {
-                    HStack {
-                        Text(L10n.Localizable.Settings.ExportBackup.action)
-                            .wireTextStyle(.body2)
-                            .foregroundStyle(Color.primaryText)
-                        Spacer()
-                        Image(systemName: "chevron.right").foregroundStyle(Color.primary)
-                    }
+                    Text(L10n.Localizable.Settings.ExportBackup.action)
+                        .wireTextStyle(.body2)
+                        .foregroundStyle(Color.primaryText)
                 }
                 .sheet(isPresented: $isExportBackupSheetPresented) {
                     NavigationStack {
@@ -54,21 +51,16 @@ struct BackupActionsView: View {
                     .presentationDetents([.medium])
                 }
             }
-            .listRowBackground(Color(ColorTheme.Backgrounds.surface))
 
             Section(footer: Text(L10n.Localizable.Settings.RestoreFromBackup.description)) {
                 Button {
                     viewModel.confirmBackupRestore {
                         isBackupPickerPresented.toggle()
                     }
                 } label: {
-                    HStack {
-                        Text(L10n.Localizable.Settings.RestoreFromBackup.action)
-                            .font(.textStyle(.body2))
-                            .foregroundStyle(Color.primaryText)
-                        Spacer()
-                        Image(systemName: "chevron.right").foregroundStyle(Color.primary)
-                    }
+                    Text(L10n.Localizable.Settings.RestoreFromBackup.action)
+                        .font(.textStyle(.body2))
+                        .foregroundStyle(Color.primaryText)
                 }
                 .fullScreenCover(isPresented: $isBackupPickerPresented) {
                     BackupPicker { url in
@@ -93,13 +85,13 @@ struct BackupActionsView: View {
                     .presentationDetents([.medium])
                 }
             }
-            .listRowBackground(Color(ColorTheme.Backgrounds.surface))
         }
         .listStyle(.grouped)
+        .background(Color(ColorTheme.Backgrounds.background))
         .scrollContentBackground(.hidden)
     }
 }
 
 #Preview {
-    BackupActionsPreview()
+    BackupRestoreViewPreview()
 }
diff --git a/.../Views/Preview/BackupActionsPreview.swift → ...ws/Preview/BackupRestoreViewPreview.swift b/.../Views/Preview/BackupActionsPreview.swift → ...ws/Preview/BackupRestoreViewPreview.swift
@@ -20,8 +20,8 @@ import WireFoundation
 import SwiftUI
 
 @ViewBuilder @MainActor
-func BackupActionsPreview() -> some View {
-    BackupActionsView(viewModel: BackupRestoreViewModel(
+func BackupRestoreViewPreview() -> some View {
+    BackupRestoreView(viewModel: BackupRestoreViewModel(
         backupSource: MockBackupSource(),
         restoreSource: MockRestoreSource(),
         backupResultHandler: BackupResultHandler(

diff --git a/...ckup/BackupActionsViewSnapshotTests.swift → ...ckup/BackupRestoreViewSnapshotTests.swift b/...ckup/BackupActionsViewSnapshotTests.swift → ...ckup/BackupRestoreViewSnapshotTests.swift
@@ -38,7 +38,7 @@ final class BackupActionsViewSnapshotTests: XCTestCase {
     @MainActor
     func testBackupActions() {
         let screenBounds = UIScreen.main.bounds
-        let sut = BackupActionsPreview()
+        let sut = BackupRestoreViewPreview()
             .frame(width: screenBounds.width, height: screenBounds.height)
 
         snapshotHelper