Skip to content
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

Jump to bottom

[Feat] 네트워크 오류시 띄우는 얼럿 뷰 추가 및 홈 컨트롤러 levelProgressView 이슈 (#210) #211

Merged
merged 6 commits into from
Jul 28, 2022
Merged

[Feat] 네트워크 오류시 띄우는 얼럿 뷰 추가 및 홈 컨트롤러 levelProgressView 이슈 (#210) #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9bc7a3
[Feat] makeAlert 함수 익스텐션에 추가
devxsby Jul 28, 2022
2f9d3fd
[Chore] SwiftLint 룰 반영
devxsby Jul 28, 2022
3179031
[Chore] makeAlert 함수 필요한 뷰에 연결
devxsby Jul 28, 2022
7a29ea9
[Fix] HomeController levelProgressView 이슈 수정
devxsby Jul 28, 2022
42fbd93
[Chore] alert함수 내부에 hideLoading 추가
devxsby Jul 28, 2022
2a435b8
[Chore] 함수명 변경
devxsby Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions Happic-iOS/Happic-iOS/Global/Extension/UIViewController+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,16 @@ extension UIViewController {
endPoint: CGPoint(x: 2.4, y: 0.4))
}

func showAlert(title: String, message: String? = nil,
okTitle: String = "확인", okAction: ((UIAlertAction) -> Void)? = nil,
completion : (() -> Void)? = nil) {
LoadingIndicator.hideLoading()
let generator = UIImpactFeedbackGenerator(style: .medium)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기에 hideLoading()을 넣어주는 것도 괜찮겠네요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넵 수정하겠습니다

generator.impactOccurred()
let alertVC = UIAlertController(title: title, message: message,
preferredStyle: .alert)
let okAction = UIAlertAction(title: okTitle, style: .default, handler: okAction)
alertVC.addAction(okAction)
self.present(alertVC, animated: true, completion: completion)
}
}
3 changes: 1 addition & 2 deletions Happic-iOS/Happic-iOS/Global/Util/LoadingIndicator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ class LoadingIndicator {
guard let window = UIApplication.shared.windows.last else { return }

let loadingIndicatorView: UIActivityIndicatorView
if let existedView = window.subviews.first(where: { $0 is UIActivityIndicatorView } ) as? UIActivityIndicatorView {
if let existedView = window.subviews.first(where: { $0 is UIActivityIndicatorView }) as? UIActivityIndicatorView {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

역시 인간 린트..

loadingIndicatorView = existedView
} else {
loadingIndicatorView = UIActivityIndicatorView(style: .large)
/// 다른 UI가 눌리지 않도록 indicatorView의 크기를 full로 할당
loadingIndicatorView.frame = window.frame
loadingIndicatorView.color = .lightGray
window.addSubview(loadingIndicatorView)
Expand Down
2 changes: 1 addition & 1 deletion Happic-iOS/Happic-iOS/Screens/Auth/Controller/AuthViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ extension AuthViewController {
LoadingIndicator.hideLoading()
self.dismiss(animated: true)
default:
LoadingIndicator.hideLoading()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hideLoading() 없애면 로딩 뷰가 계속 보이고 그 위에 Alert가 뜰 거 같은데 괜찮을까요?

self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
print(response)
}
}
Expand Down
5 changes: 3 additions & 2 deletions Happic-iOS/Happic-iOS/Screens/CreateCharacter/Controller/CharacterNameViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ extension CharacterNameViewController {
LoadingIndicator.hideLoading()
self.dismiss(animated: true)
default:
LoadingIndicator.hideLoading()
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
print(response)
}
}
Expand All @@ -139,11 +139,12 @@ extension CharacterNameViewController {
SignUpService.shared.changeCharacter(characterId: characterId, characterName: characterName) { response in
switch response {
case .success:
LoadingIndicator.hideLoading()
print("change character name success")
default:
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
print(response)
}
}
LoadingIndicator.hideLoading()
}
}
10 changes: 6 additions & 4 deletions Happic-iOS/Happic-iOS/Screens/CreateContents/Controller/CreateContentsController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,12 @@ extension CreateContentsController {
print(response)
guard let data = result as? UploadImageModel else { return }
self.photoURL = data.link
LoadingIndicator.hideLoading()
default:
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
print(response)
}
}
LoadingIndicator.hideLoading()
}

func getRecommendTag() {
Expand All @@ -368,11 +369,11 @@ extension CreateContentsController {
self.whereTagView.setData(tags: data.place)
self.whoTagView.setData(tags: data.who)
self.whatTagView.setData(tags: data.what)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}

func createHaruHappic() {
Expand All @@ -397,11 +398,12 @@ extension CreateContentsController {
case .success:
self.dismissViewController()
self.delegate?.showToastAfterCreating("오늘의 해픽을 등록했어요")
LoadingIndicator.hideLoading()
default:
self.dismissViewController()
self.delegate?.showToastAfterCreating("\(response)")
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
8 changes: 4 additions & 4 deletions Happic-iOS/Happic-iOS/Screens/HappicCapsule/Controller/HappicCapsuleController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,11 @@ extension HappicCapsuleController {
self.capsuleView.whoLabel.text = "#\(data.who)"
self.capsuleView.whatLabel.text = "#\(data.what)"
self.capsuleView.whereLabel.text = "#\(data.place)"
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}

func canPost() {
Expand All @@ -166,10 +166,10 @@ extension HappicCapsuleController {
case .success(let result):
guard let data = result as? PostStatusModel else { return }
self.createContentsButton.isHidden = data.isPosted
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
4 changes: 2 additions & 2 deletions Happic-iOS/Happic-iOS/Screens/HappicReport/Controller/HappicReportController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ extension HappicReportController {
self.keywordRankView.setData(model: data.rank2S)
self.categoryRankView.setData(model: data.rank3S)
self.monthHappicRecordView.setData(model: data.rank4S)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
13 changes: 8 additions & 5 deletions ...Screens/HappicReport/Controller/OverallStats/StatsController/CategoryRankController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,9 @@ extension CategoryRankController {
guard let data = result as? [KeywordModel] else { return }
self.handleEmptyView(isEmpty: data.isEmpty)
self.categoryRankView.setWhenData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}

Expand All @@ -87,8 +88,9 @@ extension CategoryRankController {
case .success(let result):
guard let data = result as? [KeywordModel] else { return }
self.categoryRankView.setWhereData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}

Expand All @@ -97,8 +99,9 @@ extension CategoryRankController {
case .success(let result):
guard let data = result as? [KeywordModel] else { return }
self.categoryRankView.setWhoData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}

Expand All @@ -107,10 +110,10 @@ extension CategoryRankController {
case .success(let result):
guard let data = result as? [KeywordModel] else { return }
self.categoryRankView.setWhatData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
4 changes: 2 additions & 2 deletions .../Screens/HappicReport/Controller/OverallStats/StatsController/KeywordRankController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ extension KeywordRankController {
self.keywordRankView.isHidden = data.isEmpty
self.containerView.isHidden = !data.isEmpty
self.keywordRankView.setData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
4 changes: 2 additions & 2 deletions ...ns/HappicReport/Controller/OverallStats/StatsController/MonthHappicRecordController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ extension MonthHappicRecordController {
guard let data = result as? MonthlyCountModel else { return }
self.monthHappicRecordView.setData(model: data)
self.calendarView.setData(model: data)
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}
4 changes: 2 additions & 2 deletions Happic-iOS/Happic-iOS/Screens/HaruHappic/Controller/HaruHappicController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ extension HaruHappicController {
} else {
self.setActionSheet()
}
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}

Expand Down
12 changes: 7 additions & 5 deletions Happic-iOS/Happic-iOS/Screens/Home/Controller/HomeController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,11 @@ extension HomeController {
} else {
self.setActionSheet()
}
LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}

Expand Down Expand Up @@ -214,11 +214,13 @@ extension HomeController {
}
self.progressLabel.text = "\(data.growthRate)/6"
self.nameLabel.text = data.characterName
self.levelProgressView.progress = Float(data.growthRate / 6)
let progressValue: Float = Float(data.growthRate) / 6
self.levelProgressView.setProgress(progressValue, animated: true)

LoadingIndicator.hideLoading()
default:
break
self.showAlert(title: "네트워크 오류로 인해\n데이터를 불러올 수 없습니다.\n다시 시도해 주세요.")
}
}
LoadingIndicator.hideLoading()
}
}