Skip to content

Commit 1b027e0

Browse files
authored
Merge pull request #93 from EAT-SSU/feat/#78
[#78] ํ† ๊ธ€ ์Šค์œ„์น˜ ์•ฑ ์ €์žฅ์†Œ ๋ณด๊ด€ & ๋ฆฌ๋””์ž์ธ๋œ ๋งˆ์ดํŽ˜์ด์ง€ UI ๊ตฌ์ถ• ๋ฐ ๋น„์ฆˆ๋‹ˆ์Šค ๋กœ์ง ์—ฐ๊ฒฐ
2 parents f9151f0 + a1cab32 commit 1b027e0

21 files changed

+721
-722
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Unsubscribe.png",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
}
12+
}

โ€ŽEATSSU_MVC/EATSSU_MVC/Sources/Notification/NotificationManager.swift

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class NotificationManager {
1616

1717
// MARK: - Methods
1818

19-
/// ํ‰์ผ 11์‹œ์— ์•ฑ์˜ ์œ ์ž…์„ ์œ ๋„ํ•˜๋Š” ์•Œ๋ฆผ์„ ๋ฐœ์†กํ•˜๋Š” ๋ฉ”์†Œ๋“œ
19+
/// ํ‰์ผ 11์‹œ์— ์•ฑ์˜ ์œ ์ž…์„ ์œ ๋„ํ•˜๋Š” ํ‘ธ์‹œ ์•Œ๋ฆผ์„ ๋ฐœ์†กํ•˜๋Š” ๋ฉ”์†Œ๋“œ
2020
///
2121
/// - Title : ๐Ÿค” ์˜ค๋Š˜ ๋ฐฅ ๋ญ ๋จน์ง€โ€ฆ
2222
/// - Body : ์˜ค๋Š˜์˜ ํ•™์‹์„ ํ™•์ธํ•ด๋ณด์„ธ์š”!
@@ -31,7 +31,6 @@ class NotificationManager {
3131
content.sound = .default
3232

3333
// ๋ฐ˜๋ณตํ•  ์š”์ผ ๋ฐ ์‹œ๊ฐ„ ์„ค์ • (ํ‰์ผ ์˜ค์ „ 11์‹œ)
34-
let calendar = Calendar.current
3534
let weekdays = [2, 3, 4, 5, 6] // ์›”, ํ™”, ์ˆ˜, ๋ชฉ, ๊ธˆ (Calendar์—์„œ 1์ด ์ผ์š”์ผ)
3635

3736
for weekday in weekdays {
@@ -55,6 +54,15 @@ class NotificationManager {
5554
}
5655
}
5756
}
57+
58+
/// ํ‰์ผ 11์‹œ์— ์•ฑ์˜ ์œ ์ž…์„ ์œ ๋„ํ•˜๋Š” ํ‘ธ์‹œ ์•Œ๋ฆผ์„ ์ทจ์†Œํ•˜๋Š” ๋ฉ”์†Œ๋“œ
59+
func cancelWeekday11AMNotification() {
60+
let weekday = [2, 3, 4, 5, 6]
61+
let identifier = "weekdayNotification-\(weekday)"
62+
63+
let center = UNUserNotificationCenter.current()
64+
center.removePendingNotificationRequests(withIdentifiers: [identifier])
65+
}
5866

5967
/// ์•ฑ ์‹คํ–‰ ์‹œ ์•Œ๋ฆผ ๋ฐœ์†ก ๊ถŒํ•œ์„ ์š”์ฒญํ•˜๋Š” ํŒ์—… ํ˜ธ์ถœ ๋ฉ”์†Œ๋“œ
6068
func requestNotificationPermission() {

โ€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/Enum/MyPageLabels.swift

+20-24
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,24 @@ import Foundation
99

1010
/// "๋งˆ์ดํŒŒ์ด์ง€"์—์„œ ํ™•์ธํ•  ์ˆ˜ ์žˆ๋Š” ์„œ๋น„์Šค ๋ฆฌ์ŠคํŠธ
1111
enum MyPageLabels : Int {
12-
13-
/// ๋‚ด๊ฐ€ ์“ด ๋ฆฌ๋ทฐ
14-
case MyReview = 0
15-
16-
/// ๋ฌธ์˜ํ•˜๊ธฐ
17-
case Inquiry
18-
19-
/// ์„œ๋น„์Šค ์ด์šฉ์•ฝ๊ด€
20-
case TermsOfUse
21-
22-
/// ๊ฐœ์ธ์ •๋ณด ์ด์šฉ์•ฝ๊ด€
23-
case PrivacyTermsOfUse
24-
25-
/// ๋กœ๊ทธ์•„์›ƒ
26-
case Logout
27-
28-
/// ํƒˆํ‡ดํ•˜๊ธฐ
29-
case Withdraw
30-
31-
/// ๋งŒ๋“ ์‚ฌ๋žŒ๋“ค
32-
case Creator
33-
34-
/// ์•ฑ๋ฒ„์ „
35-
case AppVersion
12+
/// ํ‘ธ์‹œ ์•Œ๋ฆผ ์„ค์ •
13+
case NotificationSetting = 0
14+
15+
/// ๋‚ด๊ฐ€ ์“ด ๋ฆฌ๋ทฐ
16+
case MyReview
17+
18+
/// ๋ฌธ์˜ํ•˜๊ธฐ
19+
case Inquiry
20+
21+
/// ์„œ๋น„์Šค ์ด์šฉ์•ฝ๊ด€
22+
case TermsOfUse
23+
24+
/// ๊ฐœ์ธ์ •๋ณด ์ด์šฉ์•ฝ๊ด€
25+
case PrivacyTermsOfUse
26+
27+
/// ๋งŒ๋“ ์‚ฌ๋žŒ๋“ค
28+
case Creator
29+
30+
/// ๋กœ๊ทธ์•„์›ƒ
31+
case Logout
3632
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//
2+
// MyPageLocalData.swift
3+
// EATSSU_MVC
4+
//
5+
// Created by Jiwoong CHOI on 9/19/24.
6+
//
7+
8+
import Foundation
9+
10+
// TODO: ๊ตฌ์กฐ์ฒด์— ์ต์Šคํ…์…˜์œผ๋กœ ์ฝ”๋“œ๋ฅผ ์ž‘์„ฑํ•˜๋Š” ์ด์œ ์— ๋Œ€ํ•ด์„œ ์•Œ์•„๋ณด๊ธฐ
11+
12+
struct MyPageLocalData {
13+
let titleLabel: String
14+
}
15+
16+
extension MyPageLocalData {
17+
static let myPageTableLabelList = [
18+
19+
// "ํ‘ธ์‹œ ์•Œ๋ฆผ ์„ค์ •"
20+
MyPageLocalData(titleLabel: TextLiteral.MyPage.pushNotificationSetting),
21+
22+
// "๋‚ด๊ฐ€ ์“ด ๋ฆฌ๋ทฐ"
23+
MyPageLocalData(titleLabel: TextLiteral.MyPage.myReview),
24+
25+
// "๋ฌธ์˜ํ•˜๊ธฐ"
26+
MyPageLocalData(titleLabel: TextLiteral.MyPage.inquiry),
27+
28+
// "์„œ๋น„์Šค ์ด์šฉ์•ฝ๊ด€"
29+
MyPageLocalData(titleLabel: TextLiteral.MyPage.termsOfUse),
30+
31+
// "๊ฐœ์ธ์ •๋ณด ์ด์šฉ์•ฝ๊ด€"
32+
MyPageLocalData(titleLabel: TextLiteral.MyPage.privacyTermsOfUse),
33+
34+
// "๋งŒ๋“  ์‚ฌ๋žŒ๋“ค"
35+
MyPageLocalData(titleLabel: TextLiteral.MyPage.creators),
36+
37+
// "๋กœ๊ทธ์•„์›ƒ"
38+
MyPageLocalData(titleLabel: TextLiteral.MyPage.logout),
39+
]
40+
}

โ€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/Model/MyPageModel.swift

-42
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//
2+
// MyPageRightItemData.swift
3+
// EATSSU_MVC
4+
//
5+
// Created by Jiwoong CHOI on 9/19/24.
6+
//
7+
8+
import Foundation
9+
10+
/// "๋งˆ์ดํŽ˜์ด์ง€"์—์„œ ์‚ฌ์šฉํ•˜๋Š” ์…€์˜ ์˜ค๋ฅธ์ชฝ ๋ฐ์ดํ„ฐ
11+
struct MyPageRightItemData {
12+
13+
/// ์•ฑ์˜ ๋ฐฐํฌ ๋ฒ„์ „
14+
static var version: String? {
15+
if let info = Bundle.main.infoDictionary, let version = info["CFBundleShortVersionString"] as? String {
16+
return version
17+
} else {
18+
return nil
19+
}
20+
}
21+
}

โ€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/View/Cell/MyPageServiceCell.swift

-60
This file was deleted.

โ€ŽEATSSU_MVC/EATSSU_MVC/Sources/Presentation/MyPage/View/MyPageView.swift

-129
This file was deleted.

0 commit comments

Comments
ย (0)