BER-26: [Resources Tab]: Create College Info View #318
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Gilman Hall.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "Gilman Map.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // | ||
| // ResourcesCollegeInfoView.swift | ||
| // berkeley-mobile | ||
| // | ||
| // Created by Sahana Bharadwaj on 10/24/24. | ||
| // Copyright © 2024 ASUC OCTO. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ResourcesCollegeInfoView: View { | ||
| var body: some View { | ||
| VStack(spacing: 20) { | ||
| VStack { | ||
| HStack { | ||
| Image("Gilman Hall") | ||
| .resizable() | ||
| .scaledToFit() | ||
| .padding(.leading) | ||
| Text("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.") | ||
| .font(Font.custom("BMFont", size:14)) | ||
| .padding(.trailing) | ||
| Spacer() | ||
| } | ||
| } | ||
sahanabhar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| HStack { | ||
| Image("Placemark") | ||
| .padding(.leading) | ||
| Text("121 Gilman Hall, Berkeley") | ||
| .font(Font.custom("BMFont", size:16)) | ||
| Spacer() | ||
| } | ||
|
|
||
| HStack(spacing: 16) { | ||
| Text("Monday – Friday") | ||
| .font(Font.custom("BMFont", size:14)) | ||
| .padding(.leading) | ||
| Spacer() | ||
| VStack(alignment: .trailing) { | ||
| Text("8:30 AM - 12:00 PM").font(Font.custom("BMFont", size:14)) | ||
| Text("1:00 PM - 5:00 PM").font(Font.custom("BMFont", size:14)) | ||
|
There was a problem hiding this comment. For view modifiers, please put them on a new line, indented. |
||
| } | ||
| .font(.subheadline) | ||
| Button(action: {}) { | ||
| Text("Open") | ||
| .font(Font.custom("BMFont", size:14)) | ||
| .foregroundColor(.white) | ||
| .padding(.vertical, 6) | ||
| .padding(.horizontal, 12) | ||
| .background(.blue) | ||
| .clipShape(Capsule()) | ||
| } | ||
|
|
||
| } | ||
| .padding(.horizontal) | ||
|
|
||
| HStack { | ||
| Image("Gilman Map") | ||
| .resizable() | ||
| .scaledToFit() | ||
| .padding(.all) | ||
| } | ||
|
|
||
| HStack { | ||
| Text("Undergraduate Graduate") | ||
| .font(Font.custom("BMFont", size:16)) | ||
| .padding(.leading) | ||
| Spacer() | ||
| } | ||
| Spacer() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct ResourcesCollegeInfoView_Preview: PreviewProvider { | ||
| static var previews: some View { | ||
| ResourcesCollegeInfoView() | ||
| } | ||
| } | ||
sahanabhar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // | ||
| // ResourcesSubTopicView.swift | ||
| // berkeley-mobile | ||
| // | ||
| // Created by Sahana Bharadwaj on 11/18/24. | ||
| // Copyright © 2024 ASUC OCTO. All rights reserved. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ResourcesSubTopicView: View { | ||
| var body: some View { | ||
| VStack { | ||
| HStack { | ||
| Text("Undergraduate Programs") | ||
| .font(Font.custom("BMFont", size:20)) | ||
| Text("Chemistry, B.S.", | ||
| "Chemical Engineering, B.S." | ||
| "Chemical Biology, B.S." | ||
| "Chemistry, B.A.") | ||
| .font(Font.custom("BMFont", size:20)) | ||
sahanabhar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct ResourcesSubTopicView_Preview: PreviewProvider { | ||
| static var previews: some View { | ||
| ResourcesSubTopicView() | ||
| } | ||
| } | ||
sahanabhar marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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.
Remove duplicate
import SwiftUIPlease leave two lines from the import statement to the
struct