Skip to content

Commit 302394b

Browse files
authored
Merge pull request #298 from teamterning/#297
[Fix] #297 - ํ‘ธ์‹œ์•Œ๋ฆผ ์˜จ์˜คํ”„ ๊ธฐ๋Šฅ ์ผ๋ถ€ ์ˆ˜์ • ๋ฐ v1.3.1 ๋ฐฐํฌ ํ–ˆ์Šต๋‹ˆ๋‹ค.
2 parents e18dc52 + 6de48bc commit 302394b

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

โ€ŽREADME.mdโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# ๐Ÿ‘” terning ํ„ฐ๋‹ - ๋Œ€ํ•™์ƒ ์ธํ„ด, ๊ณต๊ณ  ๊ด€๋ฆฌ ์บ˜๋ฆฐ๋”
55

6-
## ์•ฑ์Šคํ† ์–ด ๋งํฌ : [์•ฑ์Šคํ† ์–ด](https://apps.apple.com/kr/app/terning-%ED%84%B0%EB%8B%9D-%EB%8C%80%ED%95%99%EC%83%9D-%EC%9D%B8%ED%84%B4-%EA%B3%B5%EA%B3%A0-%EA%B4%80%EB%A6%AC-%EC%BA%98%EB%A6%B0%EB%8D%94/id6547866420) v1.1.4
6+
## ์•ฑ์Šคํ† ์–ด ๋งํฌ : [์•ฑ์Šคํ† ์–ด](https://apps.apple.com/kr/app/terning-%ED%84%B0%EB%8B%9D-%EB%8C%80%ED%95%99%EC%83%9D-%EC%9D%B8%ED%84%B4-%EA%B3%B5%EA%B3%A0-%EA%B4%80%EB%A6%AC-%EC%BA%98%EB%A6%B0%EB%8D%94/id6547866420) v1.3.1
77
<p align="left"><img width="900" src="https://github.com/user-attachments/assets/984e7795-3746-4e7a-ad6c-cb1cb376c481"></p>
88

99
**๋‚ด ๊ณ„ํš์— ๋”ฑ ๋งž๋Š” ๋Œ€ํ•™์ƒ ์ธํ„ด์˜ ์‹œ์ž‘, ํ„ฐ๋‹**

โ€ŽTerning-iOS/Terning-iOS.xcodeproj/project.pbxprojโ€Ž

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,7 +2024,7 @@
20242024
CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements";
20252025
CODE_SIGN_IDENTITY = "Apple Development";
20262026
CODE_SIGN_STYLE = Automatic;
2027-
CURRENT_PROJECT_VERSION = 2025.0512.0027;
2027+
CURRENT_PROJECT_VERSION = 2025.0513.2213;
20282028
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
20292029
ENABLE_USER_SCRIPT_SANDBOXING = NO;
20302030
GENERATE_INFOPLIST_FILE = YES;
@@ -2041,7 +2041,7 @@
20412041
"$(inherited)",
20422042
"@executable_path/Frameworks",
20432043
);
2044-
MARKETING_VERSION = 1.3.0;
2044+
MARKETING_VERSION = 1.3.1;
20452045
OTHER_LDFLAGS = (
20462046
"-Xlinker",
20472047
"-interposable",
@@ -2068,7 +2068,7 @@
20682068
CODE_SIGN_ENTITLEMENTS = "Terning-iOS/Terning-iOS.entitlements";
20692069
CODE_SIGN_IDENTITY = "Apple Development";
20702070
CODE_SIGN_STYLE = Automatic;
2071-
CURRENT_PROJECT_VERSION = 2025.0512.0027;
2071+
CURRENT_PROJECT_VERSION = 2025.0513.2213;
20722072
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
20732073
ENABLE_USER_SCRIPT_SANDBOXING = NO;
20742074
GENERATE_INFOPLIST_FILE = YES;
@@ -2085,7 +2085,7 @@
20852085
"$(inherited)",
20862086
"@executable_path/Frameworks",
20872087
);
2088-
MARKETING_VERSION = 1.3.0;
2088+
MARKETING_VERSION = 1.3.1;
20892089
PRODUCT_BUNDLE_IDENTIFIER = "com.terning.Terning-iOS";
20902090
PRODUCT_NAME = "$(TARGET_NAME)";
20912091
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2104,20 +2104,20 @@
21042104
buildSettings = {
21052105
CODE_SIGN_IDENTITY = "Apple Development";
21062106
CODE_SIGN_STYLE = Automatic;
2107-
CURRENT_PROJECT_VERSION = 2025.0512.0027;
2107+
CURRENT_PROJECT_VERSION = 2025.0513.2213;
21082108
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
21092109
ENABLE_USER_SCRIPT_SANDBOXING = YES;
21102110
GENERATE_INFOPLIST_FILE = YES;
21112111
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
21122112
INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
21132113
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2114-
IPHONEOS_DEPLOYMENT_TARGET = 18.4;
2114+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
21152115
LD_RUNPATH_SEARCH_PATHS = (
21162116
"$(inherited)",
21172117
"@executable_path/Frameworks",
21182118
"@executable_path/../../Frameworks",
21192119
);
2120-
MARKETING_VERSION = 1.0;
2120+
MARKETING_VERSION = 1.3.1;
21212121
PRODUCT_BUNDLE_IDENTIFIER = "com.terning.Terning-iOS.NotificationServiceExtension";
21222122
PRODUCT_NAME = "$(TARGET_NAME)";
21232123
SKIP_INSTALL = YES;
@@ -2132,20 +2132,20 @@
21322132
buildSettings = {
21332133
CODE_SIGN_IDENTITY = "Apple Development";
21342134
CODE_SIGN_STYLE = Automatic;
2135-
CURRENT_PROJECT_VERSION = 2025.0512.0027;
2135+
CURRENT_PROJECT_VERSION = 2025.0513.2213;
21362136
DEVELOPMENT_TEAM = 8Q4H7X3Q58;
21372137
ENABLE_USER_SCRIPT_SANDBOXING = YES;
21382138
GENERATE_INFOPLIST_FILE = YES;
21392139
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
21402140
INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
21412141
INFOPLIST_KEY_NSHumanReadableCopyright = "";
2142-
IPHONEOS_DEPLOYMENT_TARGET = 18.4;
2142+
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
21432143
LD_RUNPATH_SEARCH_PATHS = (
21442144
"$(inherited)",
21452145
"@executable_path/Frameworks",
21462146
"@executable_path/../../Frameworks",
21472147
);
2148-
MARKETING_VERSION = 1.0;
2148+
MARKETING_VERSION = 1.3.1;
21492149
PRODUCT_BUNDLE_IDENTIFIER = "com.terning.Terning-iOS.NotificationServiceExtension";
21502150
PRODUCT_NAME = "$(TARGET_NAME)";
21512151
SKIP_INSTALL = YES;

โ€ŽTerning-iOS/Terning-iOS/Presentation/MyPage/ViewModel/MyPageViewModel.swiftโ€Ž

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class MyPageViewModel: ViewModelType {
2929
}
3030

3131
private let sectionsRelay = BehaviorRelay<[SectionData]>(value: [])
32-
private let userInfoRelay = BehaviorRelay<UserProfileInfoModel>(value: UserProfileInfoModel(name: "ํšŒ์›", profileImage: "basic", authType: "UNKNOWN"))
32+
private let userInfoRelay = BehaviorRelay<UserProfileInfoModel>(value: UserProfileInfoModel(name: "ํšŒ์›", profileImage: "basic", authType: "UNKNOWN", pushStatus: "DISABLED"))
3333

3434
private let info = Bundle.main.infoDictionary
3535

@@ -55,7 +55,7 @@ final class MyPageViewModel: ViewModelType {
5555
func transform(input: Input, disposeBag: DisposeBag) -> Output {
5656
let navigateToProfileEdit = input.fixProfileTap
5757
.withLatestFrom(userInfoRelay.asObservable())
58-
.asDriver(onErrorJustReturn: UserProfileInfoModel(name: "", profileImage: "basic", authType: ""))
58+
.asDriver(onErrorJustReturn: UserProfileInfoModel(name: "", profileImage: "basic", authType: "", pushStatus: "DISABLED"))
5959
let showLogoutAlert = input.logoutTap.asDriver(onErrorJustReturn: ())
6060
let showWithdrawAlert = input.withdrawTap.asDriver(onErrorJustReturn: ())
6161

@@ -118,7 +118,10 @@ final class MyPageViewModel: ViewModelType {
118118
MyPageBasicCellModel(
119119
image: .icPushAlarm,
120120
title: "ํ‘ธ์‹œ ์•Œ๋ฆผ",
121-
accessoryType: .toggle(isOn: UserManager.shared.isPushEnabled ?? false, action: nil)
121+
accessoryType: .toggle(
122+
isOn: (userInfoRelay.value.pushStatus ?? "disabled") == "enabled",
123+
action: nil
124+
)
122125
)
123126
)
124127
]
@@ -162,11 +165,11 @@ extension MyPageViewModel {
162165
name: data.name,
163166
profileImage: data.profileImage,
164167
authType: data.authType,
165-
pushStatus: data.pushStatus ?? "false"
168+
pushStatus: data.pushStatus ?? "DISABLED"
166169
)
167170
self.userInfoRelay.accept(updatedUserInfo)
168171
UserManager.shared.userName = data.name
169-
UserManager.shared.isPushEnabled = data.pushStatus == "true"
172+
UserManager.shared.isPushEnabled = data.pushStatus == "ENABLED"
170173

171174
var updatedSections = self.sectionsRelay.value
172175
updatedSections[0] = SectionData(

0 commit comments

Comments
ย (0)