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

Commit ed182bd

Browse files
philippzagaraugustwstein14slash12twihno
authored
v4.1 (#517)
* Fix/widget and movie bugs (#511) * change tabbar items of Widgets & Grades to "outline" * change studyroom widget icon * bugfix: show events on same day -> filter past events out before building dict * Improve MovieCard Design * Update Version Number * Make Widgets only available on phone * Fix/token permissions UI (#512) * Adding a new warning if not all permissions are granted. * Spacers and Localizables * bugfix: fix tower image (#509) Closes #508 * Design/login (#513) * Move Calendar Picker to bottom * Rename Widget Tabbaritem * Make LecturesView icons outline * LectureView: reduce Lecture Info Text sizes * Remove Calendar EventsView * Fix Movie Title Image gray bar * - fix TUM logo white pixelation - calendar picker back to top * Redesign some stuff for the Login Process * Remove old tum logo_white images * A few Login Design changes * Add Need Help Button to Check Permissions View * Remove red x from Check Token Button * Add personal NavigationTitle to Widget View * Today Btn press in Calendar forwards to day view * Adjust Login Design to iPad * Localize Mensa Garching traffic * Remove icon from Semester List Group Header on Grades & Lectures * Adjust Grades Info Design to Lectures (-> icon outline, text larger) * LectureDetails: Add contact btn to lecturer info * Change Lecturer Search Icon * Widget View: await name to display navigationTitle * Add Spacer to Widget Detail sheet top * Change color check token permission view text * Open Widget View when logging in * Generate personalized Widget Navigation Title * Reorder Code Widget Screen * Adjust Profile "GET IN CONTACT" Btns to Webview setting * Move NavTitle loading into recommender loading * remove request location always use * A few Login - Token Design changes Co-authored-by: August Wittgenstein <[email protected]> Co-authored-by: August Wittgenstein <[email protected]> Co-authored-by: 14slash12 <[email protected]> Co-authored-by: Thomas Schuster <[email protected]>
1 parent ef0224c commit ed182bd

File tree

31 files changed

+360
-329
lines changed

31 files changed

+360
-329
lines changed

‎Campus-iOS.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@
226226
36BBE7342798B04D0018FD3F /* NewsSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36BBE7332798B04D0018FD3F /* NewsSource.swift */; };
227227
36C70FB128538A190097416E /* PanelContentCafeteriasListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C70FB028538A190097416E /* PanelContentCafeteriasListView.swift */; };
228228
36C70FB32854D2AB0097416E /* PanelContentStudyGroupsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36C70FB22854D2AB0097416E /* PanelContentStudyGroupsListView.swift */; };
229-
36E964A32774932B0055777F /* CalendarToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E964A22774932B0055777F /* CalendarToolbar.swift */; };
230229
36E964A5277493D90055777F /* CalendarViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E964A4277493D90055777F /* CalendarViewModel.swift */; };
231230
36E964A7277498540055777F /* CalendarContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 36E964A6277498540055777F /* CalendarContentView.swift */; };
232231
36E964AA277498B60055777F /* KVKCalendar in Frameworks */ = {isa = PBXBuildFile; productRef = 36E964A9277498B60055777F /* KVKCalendar */; };
@@ -498,7 +497,6 @@
498497
36BBE7332798B04D0018FD3F /* NewsSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewsSource.swift; sourceTree = "<group>"; };
499498
36C70FB028538A190097416E /* PanelContentCafeteriasListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelContentCafeteriasListView.swift; sourceTree = "<group>"; };
500499
36C70FB22854D2AB0097416E /* PanelContentStudyGroupsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PanelContentStudyGroupsListView.swift; sourceTree = "<group>"; };
501-
36E964A22774932B0055777F /* CalendarToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarToolbar.swift; sourceTree = "<group>"; };
502500
36E964A4277493D90055777F /* CalendarViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewModel.swift; sourceTree = "<group>"; };
503501
36E964A6277498540055777F /* CalendarContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarContentView.swift; sourceTree = "<group>"; };
504502
36E964AB277499860055777F /* CalendarDisplayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDisplayView.swift; sourceTree = "<group>"; };
@@ -1468,7 +1466,6 @@
14681466
36E9649F277492B70055777F /* Views */ = {
14691467
isa = PBXGroup;
14701468
children = (
1471-
36E964A22774932B0055777F /* CalendarToolbar.swift */,
14721469
36E964A6277498540055777F /* CalendarContentView.swift */,
14731470
36E964AB277499860055777F /* CalendarDisplayView.swift */,
14741471
36AD5CF327B8C83500DAE143 /* CalendarSingleEventView.swift */,
@@ -1722,7 +1719,6 @@
17221719
36BB6F7027B1197400F224AB /* Profile.swift in Sources */,
17231720
08D0703A28776DD6004140B1 /* TextWidgetView.swift in Sources */,
17241721
08FAFD15287DC484006A0E27 /* CalendarWidgetView.swift in Sources */,
1725-
36E964A32774932B0055777F /* CalendarToolbar.swift in Sources */,
17261722
3654F3762851710E008AD5DC /* RoomFinderViewModel.swift in Sources */,
17271723
36108BC427A3046B007DC62D /* LectureDetailsDetailedInfoRowView.swift in Sources */,
17281724
36108C1C27A307FA007DC62D /* GradesView.swift in Sources */,
@@ -2106,7 +2102,7 @@
21062102
"$(inherited)",
21072103
"@executable_path/Frameworks",
21082104
);
2109-
MARKETING_VERSION = 4.0;
2105+
MARKETING_VERSION = 4.1;
21102106
PRODUCT_BUNDLE_IDENTIFIER = de.tum.tca;
21112107
PRODUCT_NAME = "$(TARGET_NAME)";
21122108
SUPPORTS_MACCATALYST = YES;
@@ -2149,7 +2145,7 @@
21492145
"$(inherited)",
21502146
"@executable_path/Frameworks",
21512147
);
2152-
MARKETING_VERSION = 4.0;
2148+
MARKETING_VERSION = 4.1;
21532149
PRODUCT_BUNDLE_IDENTIFIER = de.tum.tca;
21542150
PRODUCT_NAME = "$(TARGET_NAME)";
21552151
SUPPORTS_MACCATALYST = YES;

‎Campus-iOS/App.swift‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct CampusApp: App {
3434
NavigationView {
3535
LoginView(model: model)
3636
.onAppear {
37-
selectedTab = 2
37+
selectedTab = 0
3838
}
3939
}
4040
.navigationViewStyle(.stack)
@@ -82,19 +82,21 @@ struct CampusApp: App {
8282
view.navigationViewStyle(.stack)
8383
})
8484

85-
NavigationView {
86-
WidgetScreen(model: model)
87-
//.navigationTitle("My Widgets")
88-
.toolbar {
89-
ToolbarItemGroup(placement: .navigationBarTrailing) {
90-
ProfileToolbar(model: model)
85+
if UIDevice.current.userInterfaceIdiom == .phone {
86+
NavigationView {
87+
WidgetScreen(model: model)
88+
89+
.toolbar {
90+
ToolbarItemGroup(placement: .navigationBarTrailing) {
91+
ProfileToolbar(model: model)
92+
}
9193
}
92-
}
93-
}
94-
.navigationViewStyle(.stack)
95-
.tag(0)
96-
.tabItem {
97-
Label("My Widgets", systemImage: "rectangle.3.group")
94+
}
95+
.navigationViewStyle(.stack)
96+
.tag(0)
97+
.tabItem {
98+
Label("Home", systemImage: "rectangle.3.group").environment(\.symbolVariants, .none)
99+
}
98100
}
99101

100102
NavigationView {
@@ -108,7 +110,7 @@ struct CampusApp: App {
108110
}
109111
.tag(2)
110112
.tabItem {
111-
Label("Grades", systemImage: "checkmark.shield")
113+
Label("Grades", systemImage: "checkmark.shield").environment(\.symbolVariants, .none)
112114
}
113115
.if(UIDevice.current.userInterfaceIdiom == .pad, transformT: { view in
114116
view.navigationViewStyle(.stack)

‎Campus-iOS/Assets.xcassets/logo-white.imageset/Contents.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "TUMLogo_oZ_Vollfl_negativ_RGB.png",
4+
"filename" : "TUM2.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},

‎Campus-iOS/Assets.xcassets/logo-white.imageset/TUM2.png‎

15.7 KB
Loading

‎Campus-iOS/Assets.xcassets/logo-white.imageset/TUMLogo_oZ_Vollfl_negativ_RGB.png‎

-490 Bytes
Binary file not shown.

‎Campus-iOS/Assets.xcassets/set-permissions.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "set-permissions.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎Campus-iOS/Assets.xcassets/set-permissions.imageset/set-permissions.png‎

86.6 KB
Loading

‎Campus-iOS/Assets.xcassets/tower.imageset/image4-94.png‎

-209 KB
Loading

‎Campus-iOS/CalendarComponent/ViewModel/CalendarViewModel.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ class CalendarViewModel: ObservableObject {
5555

5656
var eventsByDate: [Date? : [CalendarEvent]] {
5757
let sortedEvents = events.sorted { $0.startDate ?? Date() < $1.startDate ?? Date() }
58-
let dictionary = Dictionary(grouping: sortedEvents, by: { $0.startDate?.removeTimeStamp })
58+
let filteredEvents = sortedEvents.filter { Date() <= $0.startDate ?? Date() }
59+
let dictionary = Dictionary(grouping: filteredEvents, by: { $0.startDate?.removeTimeStamp })
5960
return dictionary
6061
}
6162
}

‎Campus-iOS/CalendarComponent/Views/CalendarContentView.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,12 @@ struct CalendarContentView: View {
7171
}
7272
.toolbar {
7373
ToolbarItemGroup(placement: .navigationBarLeading) {
74-
CalendarToolbar(viewModel: self.viewModel, selectedEventID: self.$selectedEventID, isTodayPressed: self.$isTodayPressed)
74+
Button(action: {
75+
self.isTodayPressed = true
76+
selectedType = .day
77+
}) {
78+
Text("Today")
79+
}
7580
}
7681
ToolbarItem(placement: .principal) {
7782
Picker("Calendar Type", selection: $selectedType) {
@@ -88,6 +93,7 @@ struct CalendarContentView: View {
8893
}
8994
}
9095
}
96+
.opacity(1.0)
9197
.pickerStyle(.segmented)
9298
.onAppear {
9399
UISegmentedControl.appearance().backgroundColor = UIColor.systemBlue.withAlphaComponent(0.2)

0 commit comments

Comments
 (0)