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

Merge/swiftui swiftuidev #510

Merged
merged 13 commits into from
Oct 20, 2022
Merged

Merge/swiftui swiftuidev #510

merged 13 commits into from
Oct 20, 2022

Conversation

AW-tum
Copy link
Collaborator

@AW-tum AW-tum commented Oct 20, 2022

Merge all upgrades from SwiftUI-dev -> SwiftUI

mvitanov and others added 13 commits September 9, 2022 15:18
* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>
* Feature/analytics (#495)

* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Bugfix/482 (#483)

* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

* Update AnalyticsOptInView

* Add API secrets file to .gitignore

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Revert "Feature/analytics (#495)"

This reverts commit f8a4564.

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>
* Change Map Panel bottom position

* Put control of Map Panel into PanelContentView.swift

* increase drag area

* Map Panel: change top drag area bar to original size

* MapPanel: increase Dragarea

* MapPanel: remove DragArea Marker

* MapPanel: remove view lag when selecting search field

* MapPanel: increase Panel DragArea

* Improve Code

* MapPanel: increase DragArea on Studyroom Group View

* improved dragging on different mapPanel views

* MapPanel Dragging: bug fixes

* stop panel from moving when clicking panelList item

* resolve issue: cafeteria annotations not reloading after picker switch
* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Feature/analytics (#497)

* Fix/design fixes (#473)

* MoviesView: Background Text in case no movies are left in a Semester

* Calendar: spacing for headerscroll

* Mapview: fixed spacer height between list & searchbar -> ipad had weird spacing before

* Mapview: fixes in Panel height & positions

* Fix/movie card ipad (#474)

* Profile View:
- adjust App icon change text
- adjust version text to darkmode

* Movie card view: give fixed size to movie cards to adapt to iPad screen

* News Card: weird iPad screen overlap fixed

* Fixing the issue when tapping on a news card of the five latest news where got the wrong WebView when WebView was enabled. It was always using the first link. This was because the .sheet() should only be implemented once and the parameter (i.e. the selectedLink) should be changed. In order to do that the URL has to be made identifable.

* Profile & Person detail views: fix profile image stretch

* Generic Collapsible: Make whole object clickable (before: just text & chevron)

* Fix on Portrait Mode on iPhone

* Calendar: improve header scroll design

* Meal Plan View: adjust "no menus available today" to dark mode

* News Card: improve "show more" card design for iPad

Co-authored-by: David Lin <davidlin1412@yahoo.de>

* Fix/splashscreen (#475)

* Add storyboard to fix Launch Screen stretch

* - remove original splash screen code
- fix launch screen issues on iPad

* fix iPad screen issue

* Fixing the tower logo to not hide the buttons anymore (#476)

* Fixing the tower logo to not hide the buttons anymore

* Fixing the login without TUM ID button on landscape mode for iPad 12.9 inch

* Removing a border for visualization

* Map view: adjust searchbar placeholder to system language

Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>

* info.plist add UINewsstandApp = true

* info.plist: delete remove newsstand icon error

* . (#479)

* Fix Typo Mail (#480)

* Bugfix/482 (#483)

* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

* Feature/analytics (#484)

* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Textanpassungen RK BA

* Update AnalyticsOptInView

* Add API secrets file to .gitignore

* Revert 495 feature/analytics (#496)

* Feature/analytics (#495)

* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Bugfix/482 (#483)

* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

* Update AnalyticsOptInView

* Add API secrets file to .gitignore

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Revert "Feature/analytics (#495)"

This reverts commit f8a4564.

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Implement AnalyticsStrategy using CoreML

* Add filter for relevant data in AnalyticsStrategy

* Disable analytics opt-in and data upload

Co-authored-by: August Wittgenstein <75639931+AW-tum@users.noreply.github.com>
Co-authored-by: David Lin <davidlin1412@yahoo.de>
Co-authored-by: 14slash12 <59373377+14slash12@users.noreply.github.com>
Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>
Co-authored-by: Philipp, Zagar <philipp.zagar@gmail.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Use single associated widget for Campus App views

* Remove analytics opt-in query in profile view

* Enable interactive dismiss for analytics opt-in view

* Arrange widgets dynamically on widget screen

* Adapt widget size to screen size

* Update widget frame design

* Add expandable view modifier for widgets

* Make calendar widget expandable and tappable

* Make grades widget expandable and tappable

* Make tuition widget expandable

* Make cafeteria widget expandable and tappable

* Make study room widget expandable and tappable

* Use map image in widget map background view

* Use spatio-temporal strategy for widget recommendations

* Make expanding widgets more interactive

* Request location permission for widgets

* Make widgets refreshable

* Make rectangle widget size consistent

* Support tbd grades in grades widget

* Make calendar and study room widgets adapt to screen size better

* Make widget screen compatible with iPads

* Fix bug where users cannot dismiss the study room group view on the map

* Fix cafeteria widget: display real menu, display full meal plan on tap

* Use stack navigation style for widget screen

* Only show events with future end date in calendar widget

* Fix Secrets path

* Resolve conflicts

Co-authored-by: August Wittgenstein <75639931+AW-tum@users.noreply.github.com>
Co-authored-by: David Lin <davidlin1412@yahoo.de>
Co-authored-by: 14slash12 <59373377+14slash12@users.noreply.github.com>
Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>
Co-authored-by: Philipp, Zagar <philipp.zagar@gmail.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Feature/analytics (#497)

* Fix/design fixes (#473)

* MoviesView: Background Text in case no movies are left in a Semester

* Calendar: spacing for headerscroll

* Mapview: fixed spacer height between list & searchbar -> ipad had weird spacing before

* Mapview: fixes in Panel height & positions

* Fix/movie card ipad (#474)

* Profile View:
- adjust App icon change text
- adjust version text to darkmode

* Movie card view: give fixed size to movie cards to adapt to iPad screen

* News Card: weird iPad screen overlap fixed

* Fixing the issue when tapping on a news card of the five latest news where got the wrong WebView when WebView was enabled. It was always using the first link. This was because the .sheet() should only be implemented once and the parameter (i.e. the selectedLink) should be changed. In order to do that the URL has to be made identifable.

* Profile & Person detail views: fix profile image stretch

* Generic Collapsible: Make whole object clickable (before: just text & chevron)

* Fix on Portrait Mode on iPhone

* Calendar: improve header scroll design

* Meal Plan View: adjust "no menus available today" to dark mode

* News Card: improve "show more" card design for iPad

Co-authored-by: David Lin <davidlin1412@yahoo.de>

* Fix/splashscreen (#475)

* Add storyboard to fix Launch Screen stretch

* - remove original splash screen code
- fix launch screen issues on iPad

* fix iPad screen issue

* Fixing the tower logo to not hide the buttons anymore (#476)

* Fixing the tower logo to not hide the buttons anymore

* Fixing the login without TUM ID button on landscape mode for iPad 12.9 inch

* Removing a border for visualization

* Map view: adjust searchbar placeholder to system language

Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>

* info.plist add UINewsstandApp = true

* info.plist: delete remove newsstand icon error

* . (#479)

* Fix Typo Mail (#480)

* Bugfix/482 (#483)

* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

* Feature/analytics (#484)

* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Textanpassungen RK BA

* Update AnalyticsOptInView

* Add API secrets file to .gitignore

* Revert 495 feature/analytics (#496)

* Feature/analytics (#495)

* Feature/widget views (#472)

* Add empty widget view

* Add tuition widget

* Add Cafeteria Widget

* Cycle through menu items in cafeteria widget

* Add allergenics label to cafeteria widget

* Add study room widget

* Add widget sizes, improve widget visibility

* Improve design of tuition fee widget

* Implement different size options for CafeteriaWidgetView, remove animations

* Make tuition widget compatible with all sizes, improve its design

* Make study room widget compatible with all sizes, improve its design

* Beautify study room widget

* Beautify tuition widget

* Change study room widget color to white / dark gray

* Change tuition fee widget color to white / dark gray

* Add text widget view

* Use text widget view in study room widget

* Use widget color in widget loading view

* Update project file

* Beautify cafeteria widget

* Remove Color extension

* Fix count of available study rooms in large study room widget

* Add grades widget

* Add profile toolbar to widget screen

* Add calendar widget

* Fix preview

* Add map background to study room widget

* Improve study room widget design

* Improve tuition widget design

* Refactor TuitionWidgetInfoView

* Improve cafeteria widget design

* Improve grade widget design

* Make calendar widget title size consistent with other widgets

* Change symbol for widget screen

* Improve widget frame previews

* Add time based widget recommendations

* Use protocols for widget recommender strategies

* Add location strategy for widget recommendations

* Add spatio-temporal strategy for widget recommendations

* Add support for app usage data storage

* Collect usage data for calendar, grades, cafeteria, study room, and tuition view

* Bugfix/482 (#483)

* Fix iPad stacks breaking iPhone collapsibles in grades and lectures

* Fix weird spacing in lectures list due to nested VStacks

* Fix grades screen showing error upon login

* Fix discrepancy in MenuPickerStyle between ios 15 and 16

* Fix resfresh of authericated information after sign out

Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Add functionality to upload and persist analytics data

* Add analytics opt-in

* Collect data in selected views

* Remove widget screen

* Consider sheet blocking content for grades analytics

* Consider sheet blocking content for calendar analytics

* Listen to events for TCA sheets in AppUsageData

* Hide API address

* WIP - Add AnalyticsStrategy

* Update AnalyticsOptInView

* Add API secrets file to .gitignore

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Revert "Feature/analytics (#495)"

This reverts commit f8a4564.

Co-authored-by: robynkoelle <46612010+robynkoelle@users.noreply.github.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
Co-authored-by: Robyn Kölle <robyn.koelle@tum.de>

* Implement AnalyticsStrategy using CoreML

* Add filter for relevant data in AnalyticsStrategy

* Disable analytics opt-in and data upload

Co-authored-by: August Wittgenstein <75639931+AW-tum@users.noreply.github.com>
Co-authored-by: David Lin <davidlin1412@yahoo.de>
Co-authored-by: 14slash12 <59373377+14slash12@users.noreply.github.com>
Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>
Co-authored-by: Philipp, Zagar <philipp.zagar@gmail.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>

* Use single associated widget for Campus App views

* Remove analytics opt-in query in profile view

* Enable interactive dismiss for analytics opt-in view

* Arrange widgets dynamically on widget screen

* Adapt widget size to screen size

* Update widget frame design

* Add expandable view modifier for widgets

* Make calendar widget expandable and tappable

* Make grades widget expandable and tappable

* Make tuition widget expandable

* Make cafeteria widget expandable and tappable

* Make study room widget expandable and tappable

* Use map image in widget map background view

* Use spatio-temporal strategy for widget recommendations

* Make expanding widgets more interactive

* Request location permission for widgets

* Make widgets refreshable

* Make rectangle widget size consistent

* Support tbd grades in grades widget

* Make calendar and study room widgets adapt to screen size better

* Make widget screen compatible with iPads

* Fix bug where users cannot dismiss the study room group view on the map

* Fix cafeteria widget: display real menu, display full meal plan on tap

* Use stack navigation style for widget screen

* Only show events with future end date in calendar widget

* Fix Secrets path

* Resolve conflicts

* Fix map snapshot bug

* Fix order of displayed menu items in MenuView

* Fix order of dishes in MenuViewModel

* Automatically refresh widgets every minute

* Fix drag gestures on CafeteriaView, StudyRoomGroupView

* Remove simultaneous drag gestures from buttons in PanelContentView, CafeteriaView, StudyRoomGroupView

* Move data collection from GradesScreen to GradesView

Co-authored-by: August Wittgenstein <75639931+AW-tum@users.noreply.github.com>
Co-authored-by: David Lin <davidlin1412@yahoo.de>
Co-authored-by: 14slash12 <59373377+14slash12@users.noreply.github.com>
Co-authored-by: August Wittgenstein <august.wittgenstein@tum.de>
Co-authored-by: Philipp, Zagar <philipp.zagar@gmail.com>
Co-authored-by: Milen Vitanov <milen.vitanov96@gmail.com>
Co-authored-by: Milen Vitanov <m.vitanov@tum.de>
@AW-tum AW-tum merged commit ef0224c into swiftui Oct 20, 2022
@AW-tum AW-tum deleted the merge/swiftui-swiftuidev branch October 20, 2022 20:46
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants