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] #230 - 앱 피드백 창구 추가 #235

Merged
merged 2 commits into from
Feb 18, 2024
Merged

[Feat] #230 - 앱 피드백 창구 추가 #235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c1819
[Feat] #230 - 앱 피드백 창구 추가
yungu0010 Feb 16, 2024
d999a33
Merge branch 'develop' into feature/#230
yungu0010 Feb 18, 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
1 change: 1 addition & 0 deletions iOS-NOTTODO/iOS-NOTTODO/Global/Enum/AnalyticsEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ enum AnalyticsEvent {
case clickGuide = "click_guide"
case clickFaq = "click_faq"
case clickNotice = "click_notice"
case clickSuggestion = "click_suggestion"
case clickQuestion = "click_question"
case clickTerms = "click_terms"
case clickOpenSource = "click_opensource"
Expand Down
4 changes: 3 additions & 1 deletion iOS-NOTTODO/iOS-NOTTODO/Global/Enum/MyInfoURL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import SafariServices

enum MyInfoURL {
case guid, faq, notice, question, service, personalInfo, googleForm
case guid, faq, notice, suggestoin, question, service, personalInfo, googleForm
var url: String {
switch self {
case .guid:
Expand All @@ -19,6 +19,8 @@ enum MyInfoURL {
return "https://teamnottodo.notion.site/a6ef7036bde24e289e576ace099f39dc"
case .notice:
return "https://teamnottodo.notion.site/a5dbb310ec1d43baae02b7e9bf0b3411"
case .suggestoin:
return "https://forms.gle/xKq4oV8u7TQawKtE6"
case .question:
return "http://pf.kakao.com/_fUIQxj/chat"
case .service:
Expand Down
7 changes: 7 additions & 0 deletions iOS-NOTTODO/iOS-NOTTODO/Global/Literals/Strings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,13 @@ struct I18N {
static let withdraw = "회원 탈퇴"
static let logoutAlertTitle = "로그아웃 하시겠습니까?"
static let logoutAlertmessage = "로그아웃을 하면\n다른 기기와 낫투두 기록을 연동하지 못해요."
static let guide = "낫투두 가이드"
static let oftenQuestion = "자주 묻는 질문"
static let notice = "공지사항"
static let sendFeedback = "의견 보내기"
static let inquiry = "1:1 문의"
static let version = "버전 정보"
static let policies = "약관 및 정책"

/// Onboarding

Expand Down
13 changes: 7 additions & 6 deletions iOS-NOTTODO/iOS-NOTTODO/Presentation/MyInfo/Model/MyInfoModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ struct InfoModel: Hashable {
user: UserDefaults.standard.bool(forKey: DefaultKeys.isAppleLogin) ? KeychainUtil.getAppleUsername() : KeychainUtil.getKakaoNickname(),
email: UserDefaults.standard.bool(forKey: DefaultKeys.isAppleLogin) ? KeychainUtil.getAppleEmail() : KeychainUtil.getKakaoEmail())]

static let support: [InfoModel] = [InfoModel(image: .icGuide, title: "낫투두 가이드"),
InfoModel(image: .icQuestion1, title: "자주 묻는 질문")
static let support: [InfoModel] = [InfoModel(image: .icGuide, title: I18N.guide),
InfoModel(image: .icQuestion1, title: I18N.oftenQuestion)
]
static let info: [InfoModel] = [InfoModel(title: "공지사항"),
InfoModel(title: "문의하기"),
InfoModel(title: "약관 및 정책")
static let info: [InfoModel] = [InfoModel(title: I18N.notice),
InfoModel(title: I18N.sendFeedback),
InfoModel(title: I18N.inquiry),
InfoModel(title: I18N.policies)
]
static func version() -> [InfoModel] { return [InfoModel(title: "버전 정보 "+(Utils.version ?? "1.0.0"))] }
static func version() -> [InfoModel] { return [InfoModel(title: I18N.version+(Utils.version ?? "1.0.0"))] }
}
11 changes: 4 additions & 7 deletions iOS-NOTTODO/iOS-NOTTODO/Presentation/MyInfo/Viewcontrollers/MyInfoViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ extension MyInfoViewController {
})

dataSource?.supplementaryViewProvider = { collectionView, _, indexPath in
return collectionView.dequeueConfiguredReusableSupplementary(using: headerRegistration,
for: indexPath)
return collectionView.dequeueConfiguredReusableSupplementary(using: headerRegistration, for: indexPath)
}
}

Expand Down Expand Up @@ -169,8 +168,8 @@ extension MyInfoViewController: UICollectionViewDelegate {
urls: [.guid, .faq])
case 2:
infoSectionSelection(for: indexPath,
events: [.clickNotice, .clickQuestion, .clickTerms],
urls: [.notice, .question, .service])
events: [.clickNotice, .clickSuggestion, .clickQuestion, .clickTerms],
urls: [.notice, .suggestoin, .question, .service])
default:
return
}
Expand All @@ -189,9 +188,7 @@ extension MyInfoViewController: UICollectionViewDelegate {
events: [AnalyticsEvent.MyInfo],
urls: [MyInfoURL]) {
guard let item = urls.indices.contains(indexPath.item) ? urls[indexPath.item] : nil,
let event = events.indices.contains(indexPath.item) ? events[indexPath.item] : nil else {
return
}
let event = events.indices.contains(indexPath.item) ? events[indexPath.item] : nil else { return }

sendAnalyticsEvent(event) {
Utils.myInfoUrl(vc: self, url: item.url)
Expand Down