Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BER-26: [Resources Tab]: Create College Info View #318

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

BER-26: [Resources Tab]: Create College Info View #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
796d46d
finished college info view
sahanabhar Nov 19, 2024
598bbd0
resources college info view updated
sahanabhar Nov 20, 2024
e8f88a9
finished sub topic view
sahanabhar Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions berkeley-mobile.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@
13EA64CA2399CE5B00FD8E13 /* SearchItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13EA64C92399CE5B00FD8E13 /* SearchItem.swift */; };
13EA64CD2399CEDA00FD8E13 /* Gym.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13EA64CC2399CEDA00FD8E13 /* Gym.swift */; };
13EA64D02399D50C00FD8E13 /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13EA64CF2399D50C00FD8E13 /* DataManager.swift */; };
266EDB452CCAF36C00E8412B /* ResourcesCollegeInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 266EDB442CCAF36C00E8412B /* ResourcesCollegeInfoView.swift */; };
266EDB472CCAFE5600E8412B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 266EDB462CCAFE5600E8412B /* GoogleService-Info.plist */; };
266EDB492CCAFE5B00E8412B /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 266EDB482CCAFE5B00E8412B /* Secrets.swift */; };
267EA8832CEC1ACE0059622D /* ResourcesSubTopicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267EA8822CEC1ACE0059622D /* ResourcesSubTopicView.swift */; };
29061D41241C450E002BC9D9 /* HasLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29061D40241C450E002BC9D9 /* HasLocation.swift */; };
2913595724B136BE00DE9AD6 /* CollapsibleCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2913595624B136BE00DE9AD6 /* CollapsibleCardView.swift */; };
2913595924B13DF200DE9AD6 /* OpenTimesCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2913595824B13DF200DE9AD6 /* OpenTimesCardView.swift */; };
Expand Down Expand Up @@ -157,8 +161,6 @@
55DCF79B237243D4001B01B8 /* MaterialTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55DCF79A237243D4001B01B8 /* MaterialTextField.swift */; };
55DCF79D237243F5001B01B8 /* RippleLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55DCF79C237243F5001B01B8 /* RippleLayer.swift */; };
55DCF7A123724835001B01B8 /* MaterialButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55DCF7A023724835001B01B8 /* MaterialButton.swift */; };
E80ECC2F2AFB02B2004604BA /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = E80ECC2E2AFB02B2004604BA /* GoogleService-Info.plist */; };
E80ECC312AFB02BA004604BA /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = E80ECC302AFB02BA004604BA /* Secrets.swift */; };
E81767582B9A516200599254 /* MapMarkersDropdownView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E81767572B9A516200599254 /* MapMarkersDropdownView.swift */; };
E83C6CEB2B71D8C20085E277 /* ResourcesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E83C6CEA2B71D8C20085E277 /* ResourcesView.swift */; };
E83C6CED2B71DF190085E277 /* SafariWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E83C6CEC2B71DF190085E277 /* SafariWebView.swift */; };
Expand Down Expand Up @@ -251,6 +253,10 @@
13EA64C92399CE5B00FD8E13 /* SearchItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchItem.swift; sourceTree = "<group>"; };
13EA64CC2399CEDA00FD8E13 /* Gym.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Gym.swift; sourceTree = "<group>"; };
13EA64CF2399D50C00FD8E13 /* DataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataManager.swift; sourceTree = "<group>"; };
266EDB442CCAF36C00E8412B /* ResourcesCollegeInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesCollegeInfoView.swift; sourceTree = "<group>"; };
266EDB462CCAFE5600E8412B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../GoogleService-Info.plist"; sourceTree = "<group>"; };
266EDB482CCAFE5B00E8412B /* Secrets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Secrets.swift; path = ../../Secrets.swift; sourceTree = "<group>"; };
267EA8822CEC1ACE0059622D /* ResourcesSubTopicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesSubTopicView.swift; sourceTree = "<group>"; };
29061D40241C450E002BC9D9 /* HasLocation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasLocation.swift; sourceTree = "<group>"; };
2913595624B136BE00DE9AD6 /* CollapsibleCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleCardView.swift; sourceTree = "<group>"; };
2913595824B13DF200DE9AD6 /* OpenTimesCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenTimesCardView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -330,8 +336,6 @@
55DCF79C237243F5001B01B8 /* RippleLayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RippleLayer.swift; sourceTree = "<group>"; };
55DCF7A023724835001B01B8 /* MaterialButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaterialButton.swift; sourceTree = "<group>"; };
61D128E68A4FC209FFCDE60F /* Pods-berkeley-mobile.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-berkeley-mobile.release.xcconfig"; path = "Target Support Files/Pods-berkeley-mobile/Pods-berkeley-mobile.release.xcconfig"; sourceTree = "<group>"; };
E80ECC2E2AFB02B2004604BA /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
E80ECC302AFB02BA004604BA /* Secrets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = "<group>"; };
E81767572B9A516200599254 /* MapMarkersDropdownView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapMarkersDropdownView.swift; sourceTree = "<group>"; };
E83C6CEA2B71D8C20085E277 /* ResourcesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResourcesView.swift; sourceTree = "<group>"; };
E83C6CEC2B71DF190085E277 /* SafariWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SafariWebView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -796,8 +800,8 @@
306A54F223613E3D00D59A7F /* Assets.xcassets */,
306A54F423613E3D00D59A7F /* LaunchScreen.storyboard */,
306A54F723613E3D00D59A7F /* Info.plist */,
E80ECC2E2AFB02B2004604BA /* GoogleService-Info.plist */,
E80ECC302AFB02BA004604BA /* Secrets.swift */,
266EDB462CCAFE5600E8412B /* GoogleService-Info.plist */,
266EDB482CCAFE5B00E8412B /* Secrets.swift */,
);
path = "berkeley-mobile";
sourceTree = "<group>";
Expand Down Expand Up @@ -882,6 +886,8 @@
E83C6CEA2B71D8C20085E277 /* ResourcesView.swift */,
E83C6CEC2B71DF190085E277 /* SafariWebView.swift */,
E8BC7B642B96CB7F002BF46D /* ResourcesViewModel.swift */,
266EDB442CCAF36C00E8412B /* ResourcesCollegeInfoView.swift */,
267EA8822CEC1ACE0059622D /* ResourcesSubTopicView.swift */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -951,7 +957,7 @@
306A54F323613E3D00D59A7F /* Assets.xcassets in Resources */,
01D269962544D86C000377B4 /* Apercu Bold Italic.otf in Resources */,
01D269942544D86C000377B4 /* Apercu Italic.otf in Resources */,
E80ECC2F2AFB02B2004604BA /* GoogleService-Info.plist in Resources */,
266EDB472CCAFE5600E8412B /* GoogleService-Info.plist in Resources */,
01D269992544D86C000377B4 /* Apercu Medium Italic.otf in Resources */,
01D269932544D86C000377B4 /* Apercu Light.otf in Resources */,
01D2699A2544D86C000377B4 /* Apercu Medium.otf in Resources */,
Expand Down Expand Up @@ -1010,7 +1016,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E80ECC312AFB02BA004604BA /* Secrets.swift in Sources */,
01FA50F324E8BA5400DCC490 /* LocationDetailView.swift in Sources */,
306A550023614C0000D59A7F /* MainContainerViewController.swift in Sources */,
29F11EC72516C150007DCFD7 /* BarView.swift in Sources */,
Expand Down Expand Up @@ -1097,6 +1102,7 @@
01D2699D2544E005000377B4 /* AcademicCalendarViewController.swift in Sources */,
1336A31C241C400800949F32 /* GymClass.swift in Sources */,
559A7B6B2373DCBA004EA501 /* SearchResultsView.swift in Sources */,
266EDB452CCAF36C00E8412B /* ResourcesCollegeInfoView.swift in Sources */,
13EA64C82399CE0800FD8E13 /* GymDataSource.swift in Sources */,
298EE26A25BB6C33002BAF0F /* Colors+StudyPact.swift in Sources */,
016A56D8251C930D00531A12 /* AppDelegate+Migration.swift in Sources */,
Expand Down Expand Up @@ -1129,11 +1135,13 @@
E83D87942AB3CD1E00C4113C /* FeedbackFormView.swift in Sources */,
01D11B8E2504453B00BDF660 /* ScrollingStackView.swift in Sources */,
29387E9924BBBC9300070BCE /* BarEntry+DataEntry.swift in Sources */,
266EDB492CCAFE5B00E8412B /* Secrets.swift in Sources */,
306A54EC23613E3A00D59A7F /* SceneDelegate.swift in Sources */,
E8B2738D2BD5C83F0009831A /* SafetyView.swift in Sources */,
01CDBBF125CA6F58006B93BD /* RequestError.swift in Sources */,
01FA50F124E8B33100DCC490 /* LocationManager.swift in Sources */,
017C0B26251018BA00BFA80A /* Colors+MapMarker.swift in Sources */,
267EA8832CEC1ACE0059622D /* ResourcesSubTopicView.swift in Sources */,
29570D4C2569D8F20086741B /* CalendarView.swift in Sources */,
29345E2724A7E76300859A88 /* OverviewCardView.swift in Sources */,
01D11B902504560700BDF660 /* GymDetailViewController.swift in Sources */,
Expand Down
21 changes: 21 additions & 0 deletions berkeley-mobile/Assets.xcassets/Gilman Hall.imageset/Contents.json
View file
Open in desktop
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
}
}
Binary file added berkeley-mobile/Assets.xcassets/Gilman Hall.imageset/Gilman Hall.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions berkeley-mobile/Assets.xcassets/Gilman Map.imageset/Contents.json
View file
Open in desktop
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
}
}
Binary file added berkeley-mobile/Assets.xcassets/Gilman Map.imageset/Gilman Map.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
66 changes: 66 additions & 0 deletions berkeley-mobile/Resources/ResourcesCollegeInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
//
// ResourcesCollegeInfoView.swift
// berkeley-mobile
//
// Created by Sahana Bharadwaj on 10/24/24.
// Copyright © 2024 ASUC OCTO. All rights reserved.
//

import SwiftUI


struct ResourcesCollegeInfoView: View {
var body: some View {
VStack(alignment: .leading, spacing: 20) {
imageDetailedTextView
addressPlacemarkView
timeDayView
Spacer()
}
.font(Font(BMFont.regular(14)))
.padding()
}

private var imageDetailedTextView: some View {
HStack {
Image("Gilman Hall")
.resizable()
.scaledToFit()

Text("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
}
}

private var addressPlacemarkView: some View {
HStack {
Image("Placemark")
Text("121 Gilman Hall, Berkeley")
}
}

private var timeDayView: some View {
HStack(spacing: 16) {
Text("Monday – Friday")

Spacer()

VStack(alignment: .trailing) {
Text("8:30 AM - 12:00 PM")
Text("1:00 PM - 5:00 PM")
}
.font(.subheadline)

Button(action: {}) {
Text("Open")
.foregroundColor(.white)
.padding(EdgeInsets(top: 6, leading: 12, bottom: 6, trailing: 12))
.background(.blue)
.clipShape(Capsule())
}
}
}
}

#Preview {
ResourcesCollegeInfoView()
}
71 changes: 71 additions & 0 deletions berkeley-mobile/Resources/ResourcesSubTopicView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
//
// 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(alignment: .leading) {
Color.orange
.frame(height: 10)
undergraduateProgramsView
}
.background(Color(uiColor: BMColor.cardBackground))
.clipShape(RoundedRectangle(cornerRadius: 10))
.frame(width: 300)
.compositingGroup()
.shadow(color: .gray.opacity(0.25), radius: 10, x: 0, y: 0)

VStack(alignment: .leading) {
Color.orange
.frame(height: 10)
graduateProgramsView
}
.background(Color(uiColor: BMColor.cardBackground))
.clipShape(RoundedRectangle(cornerRadius: 10))
.frame(width: 300)
.compositingGroup()
.shadow(color: .gray.opacity(0.25), radius: 10, x: 0, y: 0)
}

private var undergraduateProgramsView: some View {
VStack(alignment: .leading) {
Text("Undergraduate Programs")
.padding(EdgeInsets(top: 0, leading: 0, bottom: 2, trailing: 0))
.bold()
.underline()
Text("• Chemistry, B.S.")
Text("• Chemical Engineering, B.S.")
Text("• Chemical Biology, B.S.")
Text("• Chemistry, B.A.")
}
.font(Font(BMFont.regular(14)))
.padding()
}

private var graduateProgramsView: some View {
VStack(alignment: .leading) {
Text("Graduate Programs")
.padding(EdgeInsets(top: 0, leading: 0, bottom: 2, trailing: 0))
.bold()
.underline()
Text("• Chemistry, Ph.D")
Text("• Chemical Engineering, Ph.D")
Text("• Chemical Biology Graduate Program")
Text("• Master of Product Development")
Text("• Master of Bioprocess Engineering")
Text("• Master of Molecular Science & Software Engineering")
}
.font(Font(BMFont.regular(14)))
.padding()
}
}

#Preview {
ResourcesSubTopicView()
}