Skip to content

feat: refreshcontrol 추가 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noeyiz merged 3 commits into from
Mar 12, 2024
Merged

feat: refreshcontrol 추가 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
663f006
feat: WebView에 refreshControl 추가
noeyiz Mar 10, 2024
b6af21e
feat: FavoriteView에 refreshControl 추가
noeyiz Mar 10, 2024
c58b1c1
Merge branch 'develop' into dev/87-feat-refreshcontrol/#87
noeyiz Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ShareExtension/ShareViewController.swift → .../ShareExtension/ShareViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...n/View/ShareExtensionBackGroundView.swift → ...n/View/ShareExtensionBackGroundView.swift
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions iBox/Sources/Favorite/FavoriteView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ class FavoriteView: UIView {

private lazy var webView = WebViewPreloader.shared.getFavoriteView()

private let refreshControl = UIRefreshControl()

// MARK: - Initializer

override init(frame: CGRect) {
Expand All @@ -30,7 +32,10 @@ class FavoriteView: UIView {
// MARK: - Setup Methods

private func setupProperty() {
guard let webView else { return }
backgroundColor = .backgroundColor
webView.scrollView.refreshControl = refreshControl
refreshControl.addTarget(self, action: #selector(handleRefreshControl), for: .valueChanged)
}

private func setupHierarchy() {
Expand All @@ -45,4 +50,12 @@ class FavoriteView: UIView {
}
}

@objc private func handleRefreshControl() {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
guard let self = self , let webView = self.webView else { return }
webView.reload()
refreshControl.endRefreshing()
}
}

}
13 changes: 12 additions & 1 deletion iBox/Sources/Web/WebView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ class WebView: UIView {
$0.scrollView.contentInsetAdjustmentBehavior = .always
}

private let refreshControl = UIRefreshControl()

private let progressView = UIProgressView().then {
$0.progressViewStyle = .bar
$0.tintColor = .label
Expand Down Expand Up @@ -58,6 +60,8 @@ class WebView: UIView {
private func setupProperty() {
backgroundColor = .backgroundColor
webView.navigationDelegate = self
webView.scrollView.refreshControl = refreshControl
refreshControl.addTarget(self, action: #selector(handleRefreshControl), for: .valueChanged)
progressObserver = webView.observe(\.estimatedProgress, options: .new) { [weak self] webView, _ in
self?.progressView.setProgress(Float(webView.estimatedProgress), animated: true)
}
Expand Down Expand Up @@ -85,6 +89,13 @@ class WebView: UIView {
webView.allowsBackForwardNavigationGestures = true
}

@objc private func handleRefreshControl() {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.7) { [weak self] in
self?.webView.reload()
self?.refreshControl.endRefreshing()
}
}

}

extension WebView: WKNavigationDelegate {
Expand All @@ -96,7 +107,7 @@ extension WebView: WKNavigationDelegate {
self.progressView.isHidden = true
}
}

// func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) {
// print("웹뷰 로딩 실패: \(error.localizedDescription)")
// }
Expand Down