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

Jump to bottom

Fitness #588

Merged
merged 39 commits into from
Oct 20, 2023
Merged

Fitness #588

merged 39 commits into from
Oct 20, 2023

Conversation

meiron03
Copy link
Member

Remaining issues:

  • No way to return from fitness fragment (unless they have a back button)
  • I think all of the features in the "more" section suffer from this issue if you want to try to fix it @JSnipes29

meiron03 and others added 30 commits April 13, 2023 12:33
@meiron03
Add fitness (currently replaces PCA) with bar chart for room usage.
8423916
@meiron03
Use aggregate data for bar chart and add rescaling.
a0fa1f4
@meiron03
Fix time stuff.
6c6af19
@meiron03
Merge branch 'main' into fitness
c29c67f 
# Conflicts:
#	PennMobile/build.gradle
#	PennMobile/src/main/java/com/pennapps/labs/pennmobile/MainActivity.kt
@meiron03
Merge fitness with updated main branch for new bottom bar and newer m…
083fd0f 
…aterials version.
@meiron03
Merge branch 'main' into fitness
b622263
@meiron03
Add capacity circle and last updated.
c63a6f9
@meiron03
Sort rooms by name and update room pictures.
a137c5a
@meiron03
Added functionality for favorites (not yet connected to backend). Als…
d1df8f3 
…o updated UI for the fitness room list items.
@meiron03
connected preferences to backend.
b39afb1
@meiron03
minor code cleanup
ca22bb3
@JSnipes29 @meiron03
Fixed news card "Read Article" button (#574)
97d9608
@JSnipes29 @meiron03
Fixed home icon to fill. Improves dark mode nav bar. (#575)
91373df
@JSnipes29 @meiron03
Improve GSR tab text (#576)
de4252e
@vavali08 @meiron03
add vedha
1c2407c
@vavali08 @meiron03
update fix merge
a0fe45c
@vavali08 @meiron03
fix merge conflict
cf157b7
@trinif @meiron03
rebase
c63407c
@trinif @meiron03
Added Trini to about page.
51a6c57
@rchhaya @meiron03
Update .gitignore (#579)
88b8098 
remove gradle/wrapper
@rchhaya @meiron03
update about page f2023 (#583)
7127e1a
@JSnipes29 @meiron03
Fixed bug with dining settings
47a38c1
@trinif @meiron03
Moved Feedback button to links page on More
39d6002
@trinif @meiron03
fixed gitignore for feedback
6a9a96d
@JSnipes29 @meiron03
Fix big bug
76a3b69
@JSnipes29 @meiron03
Add synchronous calls for accessing bearer token
44b3ee3
@meiron03
wrap all relevant network calls so they are guaranteed
eb89ada 
to try refreshing the token.
@meiron03
only replace the login fragment if we're not currently on the login f…
9751332 
…ragment.

Also, if we get error 400 on refreshing access token, redirect to login screen.
@meiron03
get rid of testing code oops.
80e9681
@JSnipes29 @meiron03
Fix visual bug after booking gsr
de7de68
JSnipes29 and others added 7 commits October 16, 2023 19:29
@JSnipes29 @meiron03
Fix weird login issue
39b23a3
@JSnipes29 @meiron03
Fix issue with GSR booking timeout and added waiting UI
74742ec
@JSnipes29 @meiron03
Remove user data when logging out
c9e2233
@meiron03
Fix getAccessToken() race condition.
4254b93
@meiron03
fix gsr loading on expired bearer token.
754cc8d
@meiron03
Merge remote-tracking branch 'origin/main'
169ee04 
# Conflicts:
#	PennMobile/src/main/java/com/pennapps/labs/pennmobile/AboutFragment.kt
@meiron03
More:
bcea48a 
- Change icons to match iOS (I couldn't find a suitable fitness icon)
Fitness:
- Add Fitness to the more tab.
- Wrap necessary fitness API calls in getAccessToken()
- Fix the internet connection refreshing
@meiron03 meiron03 self-assigned this Oct 17, 2023
@meiron03 meiron03 merged commit 6ee8ce7 into main Oct 20, 2023
6 checks passed
@meiron03 meiron03 deleted the fitness branch December 15, 2023 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@meiron03 meiron03

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@meiron03 @JSnipes29 @vavali08 @trinif @rchhaya