Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Minor design changes #461

Merged
merged 7 commits into from
Jul 14, 2022
Merged

Minor design changes #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e4540b
DectureDetailsView UI changes
AW-tum Jul 13, 2022
b5ffd5e
Redesigned Map Searchbar delete & dismiss
AW-tum Jul 13, 2022
d1f06b9
Improve Lecture List Design
AW-tum Jul 13, 2022
995f441
improve Lecture Detail View Design
AW-tum Jul 13, 2022
0d7e555
Improve Calendar Headerstyle
AW-tum Jul 13, 2022
a39851a
Improved Collapsible Design
AW-tum Jul 13, 2022
24032f9
Add animation to map search field cancel button
AW-tum Jul 14, 2022
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
1 change: 1 addition & 0 deletions Campus-iOS/CalendarComponent/Entity/TumCalendarStyle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ struct TumCalendarStyle {
style.headerScroll.titleDateAlignment = .center
style.headerScroll.heightHeaderWeek = 70
style.headerScroll.titleDateFont = .boldSystemFont(ofSize: 16)
style.headerScroll.fontNameDay = .systemFont(ofSize: 14)
} else {
style.timeline.widthEventViewer = 0
style.headerScroll.fontNameDay = .systemFont(ofSize: 20)
Expand Down
6 changes: 4 additions & 2 deletions Campus-iOS/HelperViews/Collapsible.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ struct Collapsible<Content: View>: View {
self.title()
Spacer()
Image(systemName: "chevron.right")
.font(.subheadline)
.foregroundColor(Color(UIColor.lightGray))
.rotationEffect(Angle.degrees(self.collapsed ? 0 : 90))
}
.padding()
.background(Color.white.opacity(0.01))
.padding(5)
.background(Color.clear)
}
)
.if(applyPadding, transformT: { view in
Expand Down
11 changes: 5 additions & 6 deletions Campus-iOS/LectureComponent/Views/LectureView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ struct LectureView: View {
var body: some View {
VStack(alignment: .leading, spacing: 8) {
Text(lecture.title)
.fontWeight(.bold)
.bold()
.font(.title3)

Spacer()
.frame(height: 2)

VStack(alignment: .leading, spacing: 8) {
HStack(spacing: 16) {
Expand All @@ -26,7 +25,7 @@ struct LectureView: View {
.frame(width: 12, height: 12)
.foregroundColor(Color("tumBlue"))
Text(lecture.eventType)
.font(.system(size: 12))
.font(.subheadline)
.foregroundColor(colorScheme == .dark ? .init(UIColor.lightGray) : .init(UIColor.darkGray))
Spacer()
}
Expand All @@ -37,7 +36,7 @@ struct LectureView: View {
.frame(width: 12, height: 12)
.foregroundColor(Color("tumBlue"))
Text(lecture.duration + " SWS")
.font(.system(size: 12))
.font(.subheadline)
.foregroundColor(colorScheme == .dark ? .init(UIColor.lightGray) : .init(UIColor.darkGray))
Spacer()
}
Expand All @@ -49,7 +48,7 @@ struct LectureView: View {
.frame(width: 12, height: 12)
.foregroundColor(Color("tumBlue"))
Text(lecture.speaker)
.font(.system(size: 12))
.font(.subheadline)
.foregroundColor(colorScheme == .dark ? .init(UIColor.lightGray) : .init(UIColor.darkGray))
.fixedSize(horizontal: false, vertical: true)
}.foregroundColor(.init(.darkGray))
Expand Down
5 changes: 2 additions & 3 deletions Campus-iOS/LectureComponent/Views/LecturesDetailView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ struct LecturesDetailView: View {
VStack(alignment: .leading) {
LectureDetailsTitleView(lectureDetails: lectureDetails)

Spacer()
.frame(height: 30)

ScrollView {
VStack(alignment: .leading, spacing: 20) {

Expand All @@ -31,6 +28,8 @@ struct LecturesDetailView: View {
LectureDetailsDetailedInfoView(lectureDetails: lectureDetails)

LectureDetailsLinkView(lectureDetails: lectureDetails)

Spacer()
}
}
}
Expand Down
1 change: 1 addition & 0 deletions Campus-iOS/MapComponent/View/PanelContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ struct PanelContentView: View {
}) {
Image(systemName: "location")
.font(.title2)
.foregroundColor(Color(UIColor.tumBlue))
}

Spacer()
Expand Down
25 changes: 7 additions & 18 deletions Campus-iOS/MapComponent/View/PanelSearchBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,20 @@ struct PanelSearchBarView: View {
.padding(7)
.background(Color(.systemGray6))
.cornerRadius(8)
.overlay {
HStack {
Spacer()
if !self.searchString.isEmpty {
Button(action: {
self.searchString = ""
lockPanel = false
}) {
Image(systemName: "xmark.circle.fill")
.foregroundColor(Color(UIColor.opaqueSeparator))
}
.padding(.trailing, 8)
}
}
}

if isEditing {
Button(action: {
isEditing = false
lockPanel = false
searchString = ""

UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)

withAnimation(.easeInOut(duration: 5)) {
UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
}
}) {
Text("Cancel")
Image(systemName: "xmark.circle")
.font(.title2)
.foregroundColor(Color(UIColor.tumBlue))
}
.padding(.trailing, 10)
.transition(.move(edge: .trailing))
Expand Down