Skip to content

Commit

Permalink
Final UI changes to scrollable view (#70)
Browse files Browse the repository at this point in the history
# *Name of the PR*

## ♻️ Current situation & Problem
*Link any open issues or pull requests (PRs) related to this PR. Please
ensure that all non-trivial PRs are first tracked and discussed in an
existing GitHub issue or discussion.*


## ⚙️ Release Notes 
*Fixed minor scrollable ui changes


## 📚 Documentation
*Please ensure that you properly document any additions in conformance
to [Spezi Documentation
Guide](https://github.com/StanfordSpezi/.github/blob/main/DOCUMENTATIONGUIDE.md).*
*You can use this section to describe your solution, but we encourage
contributors to document your reasoning and changes using in-line
documentation.*


## ✅ Testing
*Please ensure that the PR meets the testing requirements set by CodeCov
and that new functionality is appropriately tested.*
*This section describes important information about the tests and why
some elements might not be testable.*


## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md):
- [ ] I agree to follow the [Code of
Conduct](https://github.com/CS342/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/CS342/.github/blob/main/CONTRIBUTING.md).
  • Loading branch information
apgupta3303 authored Mar 11, 2024
1 parent 105eaf1 commit 67abe87
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
9 changes: 9 additions & 0 deletions Intake/Allergy Records/ReactionPDF.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,15 @@ struct ReactionPDF: View {
}
}
.navigationTitle("\(data.allergyData[index].allergy) Reactions")
.navigationBarItems(leading: Button(action: {
self.showingReaction = false
}) {
HStack {
Image(systemName: "chevron.left")
.accessibilityHidden(true)
Text("Back")
}
})
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions Intake/Resources/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@
},
"Auto-fill Intake Form" : {

},
"Back" : {

},
"Calculation" : {

Expand Down
12 changes: 7 additions & 5 deletions Intake/ScrollablePDF.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ struct ScrollablePDF: View {
Section(header: HeaderTitle(title: "Surgical History", nextView: NavigationViews.surgical)) {
List(data.surgeries, id: \.id) { item in
HStack {
Text(item.surgeryName)
.foregroundColor(.secondary)
Text(item.surgeryName)
Spacer()
Text(item.date)
.foregroundColor(.secondary)
}
}
}
Expand All @@ -97,11 +99,11 @@ struct ScrollablePDF: View {
Section(header: HeaderTitle(title: "Medications", nextView: NavigationViews.medication)) {
ForEach(Array(medicationData), id: \.self) { medicationInstance in
List {
VStack(alignment: .leading, spacing: 0) {
HStack {
Text(medicationInstance.type.localizedDescription)
.font(.headline)
Spacer()
Text("\(medicationInstance.dosage.localizedDescription) - \(medicationInstance.schedule.frequency.description)")
.font(.subheadline)
.foregroundColor(.secondary)
}
}
}
Expand Down

0 comments on commit 67abe87

Please sign in to comment.