Skip to content

Commit 0eaa763

Browse files
Merge pull request #115 from TeamDMU/fix-#114/feedback
[FIX] 사용자 피드백 반영
2 parents eb81fda + dbe32af commit 0eaa763

File tree

2 files changed

+40
-28
lines changed

2 files changed

+40
-28
lines changed

DMU-iOS/DMU-iOS.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@
11181118
"$(inherited)",
11191119
"@executable_path/Frameworks",
11201120
);
1121-
MARKETING_VERSION = 1.0.3;
1121+
MARKETING_VERSION = 1.0.4;
11221122
PRODUCT_BUNDLE_IDENTIFIER = "com.leeyebeen.DMU-iOS";
11231123
PRODUCT_NAME = "$(TARGET_NAME)";
11241124
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1158,7 +1158,7 @@
11581158
"$(inherited)",
11591159
"@executable_path/Frameworks",
11601160
);
1161-
MARKETING_VERSION = 1.0.3;
1161+
MARKETING_VERSION = 1.0.4;
11621162
PRODUCT_BUNDLE_IDENTIFIER = "com.leeyebeen.DMU-iOS";
11631163
PRODUCT_NAME = "$(TARGET_NAME)";
11641164
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

DMU-iOS/DMU-iOS/Features/Setting/Views/SettingView.swift

Lines changed: 38 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ struct SettingView: View {
5353
Button(action: {
5454
self.isNavigatingSettingToKeywordEditView.toggle()
5555
}) {
56-
Text("키워드 설정")
57-
.font(.Medium18)
58-
.foregroundColor(Color.Gray500)
59-
.environment(\.sizeCategory, .large)
56+
HStack {
57+
Text("키워드 설정")
58+
.font(.Medium18)
59+
.foregroundColor(Color.Gray500)
60+
.environment(\.sizeCategory, .large)
61+
}
62+
.frame(maxWidth: .infinity, alignment: .leading)
6063
}
6164
.padding(.horizontal, 20)
62-
.frame(maxWidth: .infinity, alignment: .leading)
6365
.fullScreenCover(isPresented: $isNavigatingSettingToKeywordEditView) {
6466
NotificationKeywordEditView(viewModel: viewModel, isNavigatingToKeywordEditView: $isNavigatingSettingToKeywordEditView)
6567
}
@@ -89,24 +91,25 @@ struct SettingView: View {
8991
}
9092

9193
HStack {
92-
Text("학과 설정")
93-
.font(.Medium18)
94-
.foregroundColor(Color.Gray500)
95-
.environment(\.sizeCategory, .large)
96-
97-
Spacer()
98-
9994
Button(action: {
10095
self.isNavigationSettingToDepartmentSettingView.toggle()
10196
}) {
10297
HStack {
98+
Text("학과 설정")
99+
.font(.Medium18)
100+
.foregroundColor(Color.Gray500)
101+
.environment(\.sizeCategory, .large)
102+
103+
Spacer()
104+
103105
Text(viewModel.userSettings.selectedDepartment)
104106
.font(.Medium14)
105107
.foregroundColor(Color.Gray400)
106108
.environment(\.sizeCategory, .large)
107109
Image(systemName: "chevron.right")
108110
.foregroundColor(Color.Gray500)
109111
}
112+
.frame(maxWidth: .infinity, alignment: .leading)
110113
}
111114
}
112115
.padding(.horizontal, 20)
@@ -120,32 +123,41 @@ struct SettingView: View {
120123
.padding(.horizontal, 20)
121124

122125
Link(destination: URL(string: "https://forms.gle/dKdiLdKwNGmQdb11A")!) {
123-
Text("문의하기")
124-
.font(.Medium18)
125-
.foregroundColor(Color.Gray500)
126-
.environment(\.sizeCategory, .large)
126+
HStack {
127+
Text("문의하기")
128+
.font(.Medium18)
129+
.foregroundColor(Color.Gray500)
130+
.environment(\.sizeCategory, .large)
131+
}
132+
.frame(maxWidth: .infinity, alignment: .leading)
127133
}
128134
.padding(.horizontal, 20)
129135

130136
NavigationLink(destination:
131137
SettingWebViewDetail(urlString: "https://sites.google.com/view/dmforu-privacy-policy/%ED%99%88")){
132-
Text("개인정보 처리방침")
133-
.font(.Medium18)
134-
.foregroundColor(Color.Gray500)
135-
.environment(\.sizeCategory, .large)
136-
.padding(.horizontal, 20)
138+
HStack {
139+
Text("개인정보 처리방침")
140+
.font(.Medium18)
141+
.foregroundColor(Color.Gray500)
142+
.environment(\.sizeCategory, .large)
143+
.padding(.horizontal, 20)
144+
}
145+
.frame(maxWidth: .infinity, alignment: .leading)
137146
}
138147

139148
Button(action: {
140149
if let url = URL(string: UIApplication.openSettingsURLString), UIApplication.shared.canOpenURL(url) {
141150
openURL(url)
142151
}
143152
}, label: {
144-
Text("오픈소스 라이선스")
145-
.font(.Medium18)
146-
.foregroundColor(Color.Gray500)
147-
.environment(\.sizeCategory, .large)
148-
.padding(.horizontal, 20)
153+
HStack {
154+
Text("오픈소스 라이선스")
155+
.font(.Medium18)
156+
.foregroundColor(Color.Gray500)
157+
.environment(\.sizeCategory, .large)
158+
.padding(.horizontal, 20)
159+
}
160+
.frame(maxWidth: .infinity, alignment: .leading)
149161
})
150162

151163
HStack {

0 commit comments

Comments
 (0)