open-eid · chirbard · Dec 3, 2025
diff --git a/RIADigiDoc.xcodeproj/project.pbxproj b/RIADigiDoc.xcodeproj/project.pbxproj
@@ -204,7 +204,6 @@
 				Util/Theme/ThemeSettingsProtocol.swift,
 				ViewModel/AdvancedSettingsViewModel.swift,
 				ViewModel/CertificateDetailViewModel.swift,
-				ViewModel/ContentViewModel.swift,
 				ViewModel/Crypto/DecryptRootViewModel.swift,
 				ViewModel/Crypto/DecryptRootViewModelProtocol.swift,
 				ViewModel/CryptoFileOpeningViewModel.swift,
@@ -226,7 +225,6 @@
 				ViewModel/MyEid/Shared/SharedMyEidSessionProtocol.swift,
 				ViewModel/Protocols/AdvancedSettingsViewModelProtocol.swift,
 				ViewModel/Protocols/CertificateDetailViewModelProtocol.swift,
-				ViewModel/Protocols/ContentViewModelProtocol.swift,
 				ViewModel/Protocols/CryptoFileOpeningViewModelProtocol.swift,
 				ViewModel/Protocols/CryptoHomeViewModelProtocol.swift,
 				ViewModel/Protocols/DataFilesViewModelProtocol.swift,

diff --git a/RIADigiDoc/ContentView.swift b/RIADigiDoc/ContentView.swift
@@ -19,92 +19,10 @@
 
 import FactoryKit
 import SwiftUI
-import UtilsLib
 
 struct ContentView: View {
-    @Environment(\.scenePhase) private var scenePhase
-    @AppTheme private var theme
-    @AppTypography private var typography
-    @Environment(LanguageSettings.self) private var languageSettings
-
-    @Environment(NavigationPathManager.self) private var pathManager
-
-    @State private var viewModel: ContentViewModel
-
-    @State private var openedUrls: [URL] = []
-    @State private var showHomeMenuBottomSheetFromButton = false
-    @State private var showSettingsBottomSheetFromButton = false
-
-    @State private var navigateToAccessibility = false
-    @State private var navigateToInfo = false
-    @State private var navigateToDiagnostics = false
-
-    @State private var sharedFilesLoadingTask: Task<Void, Never>?
-
-    private var homeMenuBottomSheetActions: [BottomSheetButton] {
-        HomeMenuBottomSheetActions.actions(
-            onInfoClick: {
-                pathManager.navigate(to: .infoView)
-            },
-            onAccessibilityClick: {
-                pathManager.navigate(to: .accessibilityView)
-            },
-            onDiagnosticsClick: {
-                pathManager.navigate(to: .diagnosticsView)
-            }
-        )
-    }
-
-    init() {
-        _viewModel = State(wrappedValue: Container.shared.contentViewModel())
-    }
-
     var body: some View {
-        TopBarContainer(
-            leftIcon: "ic_m3_menu_48pt_wght400",
-            leftIconAccessibility: "Menu",
-            onLeftClick: {
-                showHomeMenuBottomSheetFromButton = true
-            },
-            content: {
-                ScrollView {
-                    VStack {
-                        HomeView(externalFiles: $openedUrls)
-                        Spacer()
-                    }
-                }
-                .background(theme.surface)
-                .onOpenURL { url in
-                    openedUrls = [url]
-                }
-                .onAppear {
-                    if scenePhase == .active {
-                        sharedFilesLoadingTask = Task {
-                            let sharedFiles = await viewModel.getSharedFiles()
-                            if !sharedFiles.isEmpty {
-                                openedUrls = sharedFiles
-                            }
-                        }
-                    }
-                }
-                .onChange(of: scenePhase) { _, newPhase in
-                    if newPhase == .active {
-                        sharedFilesLoadingTask?.cancel()
-
-                        sharedFilesLoadingTask = Task {
-                            let sharedFiles = await viewModel.getSharedFiles()
-                            if !sharedFiles.isEmpty {
-                                openedUrls = sharedFiles
-                            }
-                        }
-                    }
-                }
-                .onDisappear {
-                    sharedFilesLoadingTask?.cancel()
-                }
-            }
-        )
-        .bottomSheet(isPresented: $showHomeMenuBottomSheetFromButton, actions: homeMenuBottomSheetActions)
+        HomeView()
     }
 }
 

diff --git a/RIADigiDoc/DI/AppContainer.swift b/RIADigiDoc/DI/AppContainer.swift
@@ -88,7 +88,8 @@ extension Container {
         self { @MainActor in
             HomeViewModel(
                 sharedContainerViewModel: self.sharedContainerViewModel(),
-                fileManager: self.fileManager()
+                fileManager: self.fileManager(),
+                fileUtil: self.fileUtil()
             )
         }
     }
@@ -207,17 +208,6 @@ extension Container {
         }
     }
 
-    @MainActor
-    var contentViewModel: Factory<ContentViewModel> {
-        self {
-            @MainActor in
-            ContentViewModel(
-                fileUtil: self.fileUtil(),
-                fileManager: self.fileManager()
-            )
-        }
-    }
-
     @MainActor
     var recentDocumentsViewModel: Factory<RecentDocumentsViewModel> {
         self {

diff --git a/RIADigiDoc/Supporting files/Localizable.xcstrings b/RIADigiDoc/Supporting files/Localizable.xcstrings
@@ -4424,74 +4424,74 @@
         }
       }
     },
-    "Menu language" : {
-      "comment" : "Menu language",
+    "Menu language selected" : {
+      "comment" : "Menu language selected",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Language"
+            "value" : "selected"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Keel"
+            "value" : "valitud"
           }
         }
       }
     },
-    "Menu language selected" : {
-      "comment" : "Menu language selected",
+    "Menu language unselected" : {
+      "comment" : "Menu language",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Language selected"
+            "value" : "unselected"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Keel valitud"
+            "value" : "valimata"
           }
         }
       }
     },
-    "Menu theme" : {
-      "comment" : "Menu theme for accessibility",
+    "Menu theme selected" : {
+      "comment" : "Menu theme selected for accessibility",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Theme"
+            "value" : "Theme selected"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Teema"
+            "value" : "Teema valitud"
           }
         }
       }
     },
-    "Menu theme selected" : {
-      "comment" : "Menu theme selected for accessibility",
+    "Menu theme unselected" : {
+      "comment" : "Menu theme for accessibility",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Theme selected"
+            "value" : "Theme unselected"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Teema valitud"
+            "value" : "Teema valimata"
           }
         }
       }

diff --git a/RIADigiDoc/UI/Component/AccessibilityView.swift b/RIADigiDoc/UI/Component/AccessibilityView.swift
@@ -54,4 +54,5 @@ struct AccessibilityView: View {
     AccessibilityView()
         .environment(Container.shared.languageSettings())
         .environment(Container.shared.themeSettings())
+        .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/AdvancedSettingsView.swift b/RIADigiDoc/UI/Component/AdvancedSettingsView.swift
@@ -24,10 +24,9 @@ struct AdvancedSettingsView: View {
     @AppTheme private var theme
     @AppTypography private var typography
 
+    @Environment(\.accessibilityVoiceOverEnabled) private var voiceOverEnabled
     @Environment(LanguageSettings.self) private var languageSettings
-
     @Environment(\.dismiss) private var dismiss
-
     @Environment(NavigationPathManager.self) private var pathManager
 
     @State private var checkedAskRoleAndAddress = false
@@ -105,14 +104,7 @@ struct AdvancedSettingsView: View {
                         }
 
                         Button(
-                            action: {
-                                Task {
-                                    await viewModel.restoreDefaultSettings()
-                                    Toast.show(
-                                        languageSettings.localized("Main settings use default settings message")
-                                    )
-                                }
-                            },
+                            action: onRestoreDefaultSettingsClick,
                             label: {
                                 Text(languageSettings.localized("Main settings use default settings button title"))
                                     .font(typography.labelLarge)
@@ -128,6 +120,20 @@ struct AdvancedSettingsView: View {
             }
         )
     }
+
+    private func onRestoreDefaultSettingsClick() {
+        Task {
+            await viewModel.restoreDefaultSettings()
+            let message =
+                languageSettings.localized("Main settings use default settings message")
+            if voiceOverEnabled {
+                var saveButtonAccessibilityAnnouncement = AttributedString(message)
+                saveButtonAccessibilityAnnouncement.accessibilitySpeechAnnouncementPriority = .high
+                AccessibilityNotification.Announcement(saveButtonAccessibilityAnnouncement).post()
+            }
+            Toast.show(message)
+        }
+    }
 }
 
 // MARK: - Preview

diff --git a/RIADigiDoc/UI/Component/AdvancedSettingsView/AdvancedSettingsLinkRow.swift b/RIADigiDoc/UI/Component/AdvancedSettingsView/AdvancedSettingsLinkRow.swift
@@ -41,12 +41,13 @@ struct AdvancedSettingsLinkRow: View {
                     .scaledToFit()
                     .frame(width: Dimensions.Icon.IconSizeXXS, height: Dimensions.Icon.IconSizeXXS)
                     .foregroundStyle(theme.onSurface)
-                    .accessibilityLabel(label.lowercased())
+                    .accessibilityHidden(true)
             }
             .contentShape(Rectangle())
             .padding(.vertical, Dimensions.Padding.SPadding)
         }
         .buttonStyle(.plain)
+        .accessibilityLabel(label.lowercased())
     }
 }
 

diff --git a/RIADigiDoc/UI/Component/Container/CertificateDetailView.swift b/RIADigiDoc/UI/Component/Container/CertificateDetailView.swift
@@ -436,4 +436,5 @@ struct CertificateDetailView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/ContainerNotificationsView.swift b/RIADigiDoc/UI/Component/Container/ContainerNotificationsView.swift
@@ -100,4 +100,5 @@ struct ContainerNotificationsView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Crypto/EncryptView.swift b/RIADigiDoc/UI/Component/Container/Crypto/EncryptView.swift
@@ -530,4 +530,5 @@ struct EncryptView: View {
     EncryptView()
         .environment(Container.shared.languageSettings())
         .environment(Container.shared.themeSettings())
+        .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Crypto/RecipientDetailView.swift b/RIADigiDoc/UI/Component/Container/Crypto/RecipientDetailView.swift
@@ -177,4 +177,5 @@ struct RecipientDetailView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/SignatureDetailView.swift b/RIADigiDoc/UI/Component/Container/SignatureDetailView.swift
@@ -361,4 +361,5 @@ struct SignatureDetailView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/ActionMethodSelectionView.swift b/RIADigiDoc/UI/Component/Container/Signing/ActionMethodSelectionView.swift
@@ -183,4 +183,5 @@ struct ActionMethodSelectionView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/IdCard/IdCardView.swift b/RIADigiDoc/UI/Component/Container/Signing/IdCard/IdCardView.swift
@@ -170,4 +170,5 @@ struct IdCardView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/MobileId/MobileIdView.swift b/RIADigiDoc/UI/Component/Container/Signing/MobileId/MobileIdView.swift
@@ -216,4 +216,5 @@ struct MobileIdView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift b/RIADigiDoc/UI/Component/Container/Signing/NFC/NFCView.swift
@@ -297,4 +297,5 @@ struct NFCView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/RoleView/RoleView.swift b/RIADigiDoc/UI/Component/Container/Signing/RoleView/RoleView.swift
@@ -171,4 +171,5 @@ struct RoleView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/SigningRootView.swift b/RIADigiDoc/UI/Component/Container/Signing/SigningRootView.swift
@@ -116,4 +116,7 @@ struct SigningRootView: View {
 
 #Preview {
     SigningRootView()
+        .environment(Container.shared.languageSettings())
+        .environment(Container.shared.themeSettings())
+        .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/Container/Signing/SmartId/SmartIdView.swift b/RIADigiDoc/UI/Component/Container/Signing/SmartId/SmartIdView.swift
@@ -224,4 +224,5 @@ struct SmartIdView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }
diff --git a/RIADigiDoc/UI/Component/CryptoFileOpeningView.swift b/RIADigiDoc/UI/Component/CryptoFileOpeningView.swift
@@ -105,4 +105,5 @@ struct CryptoFileOpeningView: View {
     )
     .environment(Container.shared.languageSettings())
     .environment(Container.shared.themeSettings())
+    .environment(NavigationPathManager())
 }