Accessibility 추가 지원 #214
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -153,7 +153,7 @@ public struct WeeklyMealView: View { | |||||||||
| let calText: String = String(format: "%.1f", subMeal.cal) | ||||||||||
| let calLabel: String = "\(calText) Kcal" | ||||||||||
| let titleText: String = relativeTitle(for: dayMeal.date, mealType: type) | ||||||||||
| let accessibilityText: String = "\(titleText) \(calText) 칼로리. \(mealTexts.joined(separator: ", "))" | ||||||||||
| let mealTexts: [String] = subMeal.meals.map { mealDisplay(meal: $0) } | ||||||||||
|
Contributor
There was a problem hiding this comment. 상수
Suggested change
|
||||||||||
| let dateText: String = "\(dayMeal.date.formatted(.dateTime.month().day().weekday(.wide))) \(type.display)" | ||||||||||
| let joinedMeals: String = mealTexts.joined(separator: "\n") | ||||||||||
|
|
@@ -213,6 +213,20 @@ public struct WeeklyMealView: View { | |||||||||
| mealCardView | ||||||||||
| .accessibilityElement(children: .combine) | ||||||||||
| .accessibilityLabel(accessibilityText) | ||||||||||
| .accessibilityAction(named: "텍스트로 복사") { | ||||||||||
| UIPasteboard.general.string = shareText | ||||||||||
| TWLog.event(ShareMealEventLog()) | ||||||||||
| } | ||||||||||
| .accessibilityAction(named: "이미지로 복사") { | ||||||||||
| if #available(iOS 16.0, *) { | ||||||||||
| let renderer = ImageRenderer(content: mealCardView) | ||||||||||
| renderer.scale = displayScale | ||||||||||
| if let image = renderer.uiImage { | ||||||||||
| UIPasteboard.general.image = image | ||||||||||
| TWLog.event(ShareMealImageEventLog()) | ||||||||||
| } | ||||||||||
| } | ||||||||||
| } | ||||||||||
|
Comment on lines
+220
to
+229
Contributor
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# 접근성 액션의 가용성 처리 위치 확인
nl -ba Projects/Feature/MealFeature/Sources/Weekly/WeeklyMealView.swift | sed -n '214,232p'
# 기대 결과:
# - accessibilityAction(named: "이미지로 복사") modifier가 조건 없이 붙어 있음
# - `#available`(iOS 16.0, *) 체크가 액션 클로저 내부에만 존재
# 이 경우 iOS 16 미만에서 no-op 액션 노출 가능성 있음Repository: todaywhat/TodayWhat-iOS Length of output: 107 🏁 Script executed: cat -n Projects/Feature/MealFeature/Sources/Weekly/WeeklyMealView.swift | sed -n '214,232p'Repository: todaywhat/TodayWhat-iOS Length of output: 1037 iOS 16 미만에서 Line 220의 제안 수정안- mealCardView
- .accessibilityElement(children: .combine)
- .accessibilityLabel(accessibilityText)
- .accessibilityAction(named: "텍스트로 복사") {
- UIPasteboard.general.string = shareText
- TWLog.event(ShareMealEventLog())
- }
- .accessibilityAction(named: "이미지로 복사") {
- if `#available`(iOS 16.0, *) {
- let renderer = ImageRenderer(content: mealCardView)
- renderer.scale = displayScale
- if let image = renderer.uiImage {
- UIPasteboard.general.image = image
- TWLog.event(ShareMealImageEventLog())
- }
- }
- }
+ let baseCard = mealCardView
+ .accessibilityElement(children: .combine)
+ .accessibilityLabel(accessibilityText)
+ .accessibilityAction(named: "텍스트로 복사") {
+ UIPasteboard.general.string = shareText
+ TWLog.event(ShareMealEventLog())
+ }
+
+ Group {
+ if `#available`(iOS 16.0, *) {
+ baseCard
+ .accessibilityAction(named: "이미지로 복사") {
+ let renderer = ImageRenderer(content: mealCardView)
+ renderer.scale = displayScale
+ if let image = renderer.uiImage {
+ UIPasteboard.general.image = image
+ TWLog.event(ShareMealImageEventLog())
+ }
+ }
+ } else {
+ baseCard
+ }
+ }
.contextMenu {🤖 Prompt for AI Agents |
||||||||||
| .contextMenu { | ||||||||||
| Button { | ||||||||||
| UIPasteboard.general.string = shareText | ||||||||||
|
|
||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ public struct SchoolSettingView: View { | |
| private let isNavigationPushed: Bool | ||
| @FocusState private var focusField: FocusField? | ||
| @Environment(\.dismiss) var dismiss | ||
| @Environment(\.accessibilityReduceMotion) private var reduceMotion | ||
|
|
||
| public init( | ||
| store: StoreOf<SchoolSettingCore>, | ||
|
|
@@ -46,9 +47,9 @@ public struct SchoolSettingView: View { | |
| schoolSearchResults(viewStore: viewStore) | ||
| } | ||
| } | ||
| .animation(reduceMotion ? .none : .default, value: viewStore.grade) | ||
| .animation(reduceMotion ? .none : .default, value: viewStore.class) | ||
| .animation(reduceMotion ? .none : .default, value: viewStore.school) | ||
|
Comment on lines
+50
to
+52
Contributor
There was a problem hiding this comment. 감소된 모션 처리가 일부 경로에서만 적용됩니다. Line 50~52는 잘 반영됐지만, Line 56/71/131/222/245의 🔧 제안 수정 .onChange(of: focusField) { newValue in
- viewStore.send(.schoolFocusedChanged(newValue == .school), animation: .default)
+ viewStore.send(.schoolFocusedChanged(newValue == .school), animation: reduceMotion ? .none : .default)
}
...
.onAppear {
viewStore.send(.onAppear)
- withAnimation {
+ withAnimation(reduceMotion ? .none : .default) {
focusField = .school
}
}
...
.onTapGesture {
- viewStore.send(.majorTextFieldDidTap, animation: .default)
+ viewStore.send(.majorTextFieldDidTap, animation: reduceMotion ? .none : .default)
focusField = nil
}
...
.onTapGesture {
- viewStore.send(.schoolRowDidSelect(school), animation: .default)
+ viewStore.send(.schoolRowDidSelect(school), animation: reduceMotion ? .none : .default)
focusField = .grade
}
...
TWButton(title: viewStore.nextButtonTitle, style: .wide) {
- viewStore.send(.nextButtonDidTap, animation: .default)
+ viewStore.send(.nextButtonDidTap, animation: reduceMotion ? .none : .default)
focusField = nil
}🤖 Prompt for AI Agents |
||
| .padding(.horizontal, 16) | ||
| .padding(.top, 24) | ||
| .onChange(of: focusField) { newValue in | ||
|
|
@@ -124,14 +125,16 @@ public struct SchoolSettingView: View { | |
| ) | ||
| ) | ||
| .disabled(true) | ||
| } | ||
| .padding(.bottom, 16) | ||
| .onTapGesture { | ||
| viewStore.send(.majorTextFieldDidTap, animation: .default) | ||
| focusField = nil | ||
| } | ||
| .accessibilityElement(children: .ignore) | ||
| .accessibilityLabel(viewStore.major.isEmpty ? "학과 선택" : "학과: \(viewStore.major)") | ||
| .accessibilityHint("탭하면 학과 선택 시트가 열립니다") | ||
| .accessibilityAddTraits(.isButton) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -210,7 +213,7 @@ public struct SchoolSettingView: View { | |
|
|
||
| Spacer() | ||
| } | ||
| .frame(maxWidth: .infinity, minHeight: 44) | ||
| .background { | ||
| Color.backgroundMain | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -206,6 +206,21 @@ public struct SettingsView: View { | |
| .labelsHidden() | ||
| .tint(.textPrimary) | ||
| } | ||
| .accessibilityElement(children: .ignore) | ||
| .accessibilityLabel(text) | ||
| .accessibilityValue(isOn.wrappedValue ? "활성화됨" : "비활성화됨") | ||
| .accessibilityAddTraits(isToggleTraits) | ||
| .accessibilityAction { | ||
| isOn.wrappedValue.toggle() | ||
| } | ||
| } | ||
|
|
||
| private var isToggleTraits: AccessibilityTraits { | ||
| if #available(iOS 17.0, *) { | ||
| return .isToggle | ||
| } else { | ||
| return .isButton | ||
| } | ||
| } | ||
|
|
||
| @ViewBuilder | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -27,19 +27,22 @@ public struct WeeklyTimeTableCore: Reducer { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public struct WeeklyTimeTable: Equatable { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let weekdays: [String] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let fullWeekdays: [String] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let dates: [String] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let periods: [Int] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let subjects: [[String]] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public let todayIndex: Int? | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| public init( | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| weekdays: [String], | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| fullWeekdays: [String], | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| dates: [String], | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| periods: [Int], | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| subjects: [[String]], | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| todayIndex: Int? = nil | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ) { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| self.weekdays = weekdays | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| self.fullWeekdays = fullWeekdays | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
36
to
+45
Contributor
There was a problem hiding this comment.
수정 예시 public init(
weekdays: [String],
fullWeekdays: [String],
dates: [String],
periods: [Int],
subjects: [[String]],
todayIndex: Int? = nil
) {
+ precondition(weekdays.count == fullWeekdays.count, "weekdays/fullWeekdays count mismatch")
+ precondition(weekdays.count == dates.count, "weekdays/dates count mismatch")
+ precondition(weekdays.count == subjects.count, "weekdays/subjects count mismatch")
+
self.weekdays = weekdays
self.fullWeekdays = fullWeekdays
self.dates = dates
self.periods = periods
self.subjects = subjects
self.todayIndex = todayIndex
}📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| self.dates = dates | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| self.periods = periods | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| self.subjects = subjects | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -203,6 +206,10 @@ public struct WeeklyTimeTableCore: Reducer { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| let weekdays = | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| showWeekend | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ? ["월", "화", "수", "목", "금", "토", "일"] : ["월", "화", "수", "목", "금"] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| let fullWeekdays = | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| showWeekend | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ? ["월요일", "화요일", "수요일", "목요일", "금요일", "토요일", "일요일"] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| : ["월요일", "화요일", "수요일", "목요일", "금요일"] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| var dates: [String] = [] | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| let dateFormatter = DateFormatter() | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -274,6 +281,7 @@ public struct WeeklyTimeTableCore: Reducer { | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| return WeeklyTimeTable( | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| weekdays: weekdays, | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| fullWeekdays: fullWeekdays, | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| dates: dates, | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| periods: periods, | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| subjects: weeklySubjects, | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -226,11 +226,17 @@ public struct WeeklyTimeTableView: View { | |||||||||||||||
| .frame(width: firstColumnWidth, height: headerHeight) | ||||||||||||||||
|
|
||||||||||||||||
| ForEach(0..<weeklyTimeTable.weekdays.count, id: \.self) { index in | ||||||||||||||||
| let isToday = weeklyTimeTable.isToday(weekdayIndex: index) | ||||||||||||||||
| VStack(spacing: 2) { | ||||||||||||||||
| Text(weeklyTimeTable.weekdays[index]) | ||||||||||||||||
| .twFont(horizontalSizeClass == .regular ? .body1 : .body2, color: .textSecondary) | ||||||||||||||||
| } | ||||||||||||||||
| .frame(width: cellWidth, height: headerHeight) | ||||||||||||||||
| .accessibilityLabel( | ||||||||||||||||
| isToday | ||||||||||||||||
| ? "\(weeklyTimeTable.fullWeekdays[index]), 오늘" | ||||||||||||||||
| : weeklyTimeTable.fullWeekdays[index] | ||||||||||||||||
| ) | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
|
|
@@ -247,20 +253,26 @@ public struct WeeklyTimeTableView: View { | |||||||||||||||
| Text("\(period)") | ||||||||||||||||
| .twFont(.body2, color: .textSecondary) | ||||||||||||||||
| .frame(width: firstColumnWidth, height: cellSide) | ||||||||||||||||
| .accessibilityLabel("\(period)교시") | ||||||||||||||||
|
|
||||||||||||||||
| ForEach(0..<weeklyTimeTable.weekdays.count, id: \.self) { weekdayIndex in | ||||||||||||||||
| let subject = weeklyTimeTable.subject( | ||||||||||||||||
| for: period - 1, | ||||||||||||||||
| weekday: weekdayIndex | ||||||||||||||||
| ) | ||||||||||||||||
| let isToday = weeklyTimeTable.isToday(weekdayIndex: weekdayIndex) | ||||||||||||||||
| let fullWeekdayName = weeklyTimeTable.fullWeekdays[weekdayIndex] | ||||||||||||||||
| let accessLabel: String = subject.isEmpty | ||||||||||||||||
| ? "\(fullWeekdayName) \(period)교시 수업 없음" | ||||||||||||||||
| : "\(fullWeekdayName) \(period)교시 \(subject)\(isToday ? ", 오늘" : "")" | ||||||||||||||||
|
Comment on lines
+265
to
+267
Contributor
There was a problem hiding this comment. 빈 셀 접근성 라벨에도 ‘오늘’ 맥락을 일관되게 포함해주세요. 현재는 과목이 있을 때만 수정 예시- let accessLabel: String = subject.isEmpty
- ? "\(fullWeekdayName) \(period)교시 수업 없음"
- : "\(fullWeekdayName) \(period)교시 \(subject)\(isToday ? ", 오늘" : "")"
+ let todaySuffix = isToday ? ", 오늘" : ""
+ let accessLabel: String = subject.isEmpty
+ ? "\(fullWeekdayName) \(period)교시 수업 없음\(todaySuffix)"
+ : "\(fullWeekdayName) \(period)교시 \(subject)\(todaySuffix)"📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||
|
|
||||||||||||||||
| Text(subject) | ||||||||||||||||
| .twFont( | ||||||||||||||||
| fontForCell( | ||||||||||||||||
| isToday: isToday, | ||||||||||||||||
| horizontalSizeClass: horizontalSizeClass | ||||||||||||||||
| ), | ||||||||||||||||
| color: isToday ? Color.extraBlack : .textSecondary | ||||||||||||||||
| ) | ||||||||||||||||
| .multilineTextAlignment(.center) | ||||||||||||||||
| .minimumScaleFactor(0.3) | ||||||||||||||||
|
|
@@ -274,6 +286,7 @@ public struct WeeklyTimeTableView: View { | |||||||||||||||
| .frame(height: 1.0) | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
| .accessibilityLabel(accessLabel) | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
| } | ||||||||||||||||
|
|
||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,9 @@ | |
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "1.000", | ||
| "blue" : "0x76", | ||
| "green" : "0x76", | ||
| "red" : "0x76" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
|
|
@@ -23,9 +23,9 @@ | |
| "color-space" : "srgb", | ||
| "components" : { | ||
| "alpha" : "1.000", | ||
| "blue" : "0x94", | ||
| "green" : "0x94", | ||
| "red" : "0x94" | ||
| } | ||
| }, | ||
| "idiom" : "universal" | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#available(iOS 26.0, *)확인은 존재하지 않는 iOS 버전을 대상으로 하고 있어 혼란을 줄 수 있습니다.glassEffect는 visionOS에서 사용 가능하므로,#if os(visionOS)와 같은 컴파일러 지시문을 사용하거나, 특정 iOS 기능을 확인하는 것이라면 실제 버전을 사용해야 합니다. 예를 들어iOS 17.0이나visionOS 1.0을 확인하는 것이 더 명확할 것 같습니다. 이 코드가 의도한 바가 무엇인지 확인하고 수정하는 것을 권장합니다.