Merge pull request #886 from kiwix/883-increased-text-size-setting-in…

…-ios-cuts-off-items-in-the-bottom-menu Fix Accessibility of icons when large text is set
kiwix · Jul 28, 2024 · c0539cc · c0539cc
2 parents 68613a9 + dfa20ea
commit c0539cc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 29 deletions.
diff --git a/App/CompactViewController.swift b/App/CompactViewController.swift
@@ -130,31 +130,31 @@ private struct CompactView: View {
                 .id(tabID)
                 .toolbar {
                     ToolbarItemGroup(placement: .bottomBar) {
-                        HStack {
-                            NavigationButtons()
-                            Spacer()
-                            OutlineButton()
-                            Spacer()
-                            BookmarkButton()
-                            Spacer()
-                            ExportButton()
-                            Spacer()
-                            TabsManagerButton()
-                            if FeatureFlags.hasLibrary {
-                                Spacer()
-                                Button {
-                                    presentedSheet = .library
-                                } label: {
-                                    Label("common.tab.menu.library".localized, systemImage: "folder")
-                                }
-                            }
-                            Spacer()
+                        Spacer()
+                        NavigationButtons()
+                        Spacer()
+                        OutlineButton()
+                        Spacer()
+                        BookmarkButton()
+                        Spacer()
+                        ExportButton()
+                        Spacer()
+                        TabsManagerButton()
+                        Spacer()
+                        if FeatureFlags.hasLibrary {
                             Button {
-                                presentedSheet = .settings
+                                presentedSheet = .library
                             } label: {
-                                Label("common.tab.menu.settings".localized, systemImage: "gear")
+                                Label("common.tab.menu.library".localized, systemImage: "folder")
                             }
+                            Spacer()
+                        }
+                        Button {
+                            presentedSheet = .settings
+                        } label: {
+                            Label("common.tab.menu.settings".localized, systemImage: "gear")
                         }
+                        Spacer()
                     }
                 }
                 .environmentObject(BrowserViewModel.getCached(tabID: tabID))

diff --git a/Views/Buttons/NavigationButtons.swift b/Views/Buttons/NavigationButtons.swift
@@ -21,14 +21,9 @@ struct NavigationButtons: View {
     @EnvironmentObject private var browser: BrowserViewModel
 
     var body: some View {
-        if horizontalSizeClass == .regular {
-            goBackButton
-            goForwardButton
-        } else {
-            goBackButton
-            Spacer()
-            goForwardButton
-        }
+        goBackButton
+        Spacer()
+        goForwardButton
     }
 
     var goBackButton: some View {