kiwix/kiwix-apple
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-apple.git synced 2025-09-28 22:43:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change buttons

Browse Source
This commit is contained in:
Balazs Perlaki-Horvath 2024-03-16 13:24:42 +01:00 committed by Kelson
parent fbdc4cce01
commit 39688276ff
2 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
App/CompactViewController.swift
View File

@ -10,18 +10,29 @@
import Combine import Combine
import SwiftUI import SwiftUI
import UIKit import UIKit
import SwiftBackports
final class CompactViewController: UIHostingController<AnyView>, UISearchControllerDelegate, UISearchResultsUpdating { final class CompactViewController: UIHostingController<AnyView>, UISearchControllerDelegate, UISearchResultsUpdating {
private enum Const {
#if os(macOS)
static let randomButtonTitle: String = "article_shortcut.random.button.title.mac".localized
#else
static let randomButtonTitle: String = "article_shortcut.random.button.title.ios".localized
#endif
}
private let searchViewModel: SearchViewModel private let searchViewModel: SearchViewModel
private let searchController: UISearchController private let searchController: UISearchController
private var searchTextObserver: AnyCancellable? private var searchTextObserver: AnyCancellable?
private var openURLObserver: NSObjectProtocol? private var openURLObserver: NSObjectProtocol?
private var loadRandomArticle: (() -> Void)?
init() { init() {
searchViewModel = SearchViewModel() searchViewModel = SearchViewModel()
let searchResult = SearchResults().environmentObject(searchViewModel) let searchResult = SearchResults().environmentObject(searchViewModel)
searchController = UISearchController(searchResultsController: UIHostingController(rootView: searchResult)) searchController = UISearchController(searchResultsController: UIHostingController(rootView: searchResult))
super.init(rootView: AnyView(CompactView())) let compactView = CompactView()
loadRandomArticle = compactView.loadRandomArticle
super.init(rootView: AnyView(compactView))
searchController.searchResultsUpdater = self searchController.searchResultsUpdater = self
} }
@ -46,6 +57,7 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
}() }()
searchController.searchBar.autocorrectionType = .no searchController.searchBar.autocorrectionType = .no
navigationItem.titleView = searchController.searchBar navigationItem.titleView = searchController.searchBar
navigationItem.rightBarButtonItem = randomArticleButton()
searchController.automaticallyShowsCancelButton = false searchController.automaticallyShowsCancelButton = false
searchController.delegate = self searchController.delegate = self
searchController.hidesNavigationBarDuringPresentation = false searchController.hidesNavigationBarDuringPresentation = false
@ -60,7 +72,7 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
forName: .openURL, object: nil, queue: nil forName: .openURL, object: nil, queue: nil
) { [weak self] _ in ) { [weak self] _ in
self?.searchController.isActive = false self?.searchController.isActive = false
self?.navigationItem.setRightBarButton(nil, animated: true) self?.navigationItem.setRightBarButton(self?.randomArticleButton(), animated: true)
} }
} }
@ -82,7 +94,18 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
} }
@objc func onSearchCancelled() { @objc func onSearchCancelled() {
searchController.isActive = false searchController.isActive = false
navigationItem.setRightBarButton(nil, animated: true) navigationItem.setRightBarButton(randomArticleButton(), animated: true)
}
@objc func onRandomTapped(_ target: UIButton) {
loadRandomArticle?()
}
private func randomArticleButton() -> UIBarButtonItem {
UIBarButtonItem(image: .init(systemName: "die.face.5"),
style: .plain,
target: self,
action: #selector(onRandomTapped))
} }
func willDismissSearchController(_ searchController: UISearchController) { func willDismissSearchController(_ searchController: UISearchController) {
@ -97,7 +120,17 @@ final class CompactViewController: UIHostingController<AnyView>, UISearchControl
private struct CompactView: View { private struct CompactView: View {
@EnvironmentObject private var navigation: NavigationViewModel @EnvironmentObject private var navigation: NavigationViewModel
func loadRandomArticle() {
if case let .tab(tabID) = navigation.currentItem {
BrowserViewModel(tabID: tabID).loadRandomArticle()
}
}
init() {
debugPrint("Create CompactView")
}
var body: some View { var body: some View {
if case let .tab(tabID) = navigation.currentItem { if case let .tab(tabID) = navigation.currentItem {
Content().id(tabID).toolbar { Content().id(tabID).toolbar {
@ -109,9 +142,23 @@ private struct CompactView: View {
Spacer() Spacer()
BookmarkButton() BookmarkButton()
Spacer() Spacer()
ArticleShortcutButtons(displayMode: .randomArticle)
Spacer()
TabsManagerButton() TabsManagerButton()
// Spacer()
// ArticleShortcutButtons(displayMode: .randomArticle)
if FeatureFlags.hasLibrary {
Spacer()
Button {
// presentedSheet = .library
} label: {
Label("common.tab.menu.library".localized, systemImage: "folder")
}
}
Spacer()
Button {
// presentedSheet = .settings
} label: {
Label("common.tab.menu.settings".localized, systemImage: "gear")
}
} }
} }
} }
@ -122,7 +169,7 @@ private struct CompactView: View {
private struct Content: View { private struct Content: View {
@EnvironmentObject private var browser: BrowserViewModel @EnvironmentObject private var browser: BrowserViewModel
var body: some View { var body: some View {
Group { Group {
if browser.url == nil { if browser.url == nil {

42
Views/Buttons/TabsManagerButton.swift
View File

@ -43,27 +43,27 @@ struct TabsManagerButton: View {
Label("common.tab.menu.close_all".localized, systemImage: "xmark.square.fill") Label("common.tab.menu.close_all".localized, systemImage: "xmark.square.fill")
} }
} }
Section { // Section {
ForEach(zimFiles.prefix(5)) { zimFile in // ForEach(zimFiles.prefix(5)) { zimFile in
Button { // Button {
browser.loadMainArticle(zimFileID: zimFile.fileID) // browser.loadMainArticle(zimFileID: zimFile.fileID)
} label: { Label(zimFile.name, systemImage: "house") } // } label: { Label(zimFile.name, systemImage: "house") }
} // }
} // }
Section { // Section {
if FeatureFlags.hasLibrary { // if FeatureFlags.hasLibrary {
Button { // Button {
presentedSheet = .library // presentedSheet = .library
} label: { // } label: {
Label("common.tab.menu.library".localized, systemImage: "folder") // Label("common.tab.menu.library".localized, systemImage: "folder")
} // }
} // }
Button { // Button {
presentedSheet = .settings // presentedSheet = .settings
} label: { // } label: {
Label("common.tab.menu.settings".localized, systemImage: "gear") // Label("common.tab.menu.settings".localized, systemImage: "gear")
} // }
} // }
} label: { } label: {
Label("common.tab.manager.title".localized, systemImage: "square.stack") Label("common.tab.manager.title".localized, systemImage: "square.stack")
} primaryAction: { } primaryAction: {