Change to one loader, and Fetching Catalog text

kiwix · Sep 29, 2024 · 0009ba4 · 0009ba4
1 parent b127452
commit 0009ba4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Support/en.lproj/Localizable.strings b/Support/en.lproj/Localizable.strings
@@ -223,7 +223,7 @@
 "welcome.main_page.title" = "Main Page";
 "welcome.grid.bookmarks.title" = "Bookmarks";
 "welcome.actions.open_file" = "Open File";
-"welcome.button.status.fetching.text" = "Fetching...";
+"welcome.button.status.fetching_catalog.text" = "Fetching Catalog...";
 "welcome.button.status.fetch_catalog.text" = "Fetch Catalog";
 
 "commands.button.actual_size" = "Actual Size";

diff --git a/Views/Welcome.swift b/Views/Welcome.swift
@@ -37,6 +37,9 @@ struct Welcome: View {
             ZStack {
                 LogoView()
                 welcomeContent
+                if library.state == .inProgress {
+                    LoadingView()
+                }
             }.ignoresSafeArea()
         } else {
             LazyVGrid(
@@ -82,7 +85,6 @@ struct Welcome: View {
                 VStack(spacing: 20) {
                     Spacer()
                         .frame(height: geometry.size.height * 0.618)
-                    Divider()
                     actions
                     Text("library_refresh_error.retrieve.description".localized)
                         .foregroundColor(.red)
@@ -114,7 +116,7 @@ struct Welcome: View {
 
     /// Onboarding actions, open a zim file or refresh catalog
     private var actions: some View {
-        HStack {
+        VStack {
             OpenFileButton(context: .onBoarding) {
                 HStack {
                     Spacer()
@@ -128,14 +130,7 @@ struct Welcome: View {
                 HStack {
                     Spacer()
                     if library.state == .inProgress {
-                        #if os(macOS)
-                        Text("welcome.button.status.fetching.text".localized)
-                        #elseif os(iOS)
-                        HStack(spacing: 6) {
-                            ProgressView().frame(maxHeight: 10)
-                            Text("welcome.button.status.fetching.text".localized)
-                        }
-                        #endif
+                        Text("welcome.button.status.fetching_catalog.text".localized)
                     } else {
                         Text("welcome.button.status.fetch_catalog.text".localized)
                     }