Code

Fitness#588

Code

Merged

meiron03 merged 39 commits intomainpennlabs/penn-mobile-android:mainfrom fitnesspennlabs/penn-mobile-android:fitnessCopy head branch name to clipboardOct 20, 2023

+1,894-164

Commits

Commits on Apr 13, 2023

• Add fitness (currently replaces PCA) with bar chart for room usage.

  meiron03

  committed
  8423916

  Copy full SHA for 8423916

Commits on Apr 14, 2023

• Use aggregate data for bar chart and add rescaling.

  meiron03

  committed
  a0fa1f4

  Copy full SHA for a0fa1f4

Commits on Sep 15, 2023

• Fix time stuff.

  meiron03

  committed
  6c6af19

  Copy full SHA for 6c6af19

Commits on Sep 17, 2023

• Merge branch 'main' into fitness

  Show description for c29c67f
  meiron03

  committed
  c29c67f

  Copy full SHA for c29c67f

• Merge fitness with updated main branch for new bottom bar and newer materials version.

  meiron03

  committed
  083fd0f

  Copy full SHA for 083fd0f

• Merge branch 'main' into fitness

  meiron03

  committed
  b622263

  Copy full SHA for b622263

• Add capacity circle and last updated.

  meiron03

  committed
  c63a6f9

  Copy full SHA for c63a6f9

• Sort rooms by name and update room pictures.

  meiron03

  committed
  a137c5a

  Copy full SHA for a137c5a

Commits on Sep 23, 2023

• Added functionality for favorites (not yet connected to backend). Also updated UI for the fitness room list items.

  meiron03

  committed
  d1df8f3

  Copy full SHA for d1df8f3

• connected preferences to backend.

  meiron03

  committed
  b39afb1

  Copy full SHA for b39afb1

Commits on Sep 24, 2023

• minor code cleanup

  meiron03

  committed
  ca22bb3

  Copy full SHA for ca22bb3

Commits on Oct 16, 2023

• Fixed news card "Read Article" button (#574)

  

  JSnipes29

  authored and

  meiron03

  committed
  97d9608

  Copy full SHA for 97d9608

• Fixed home icon to fill. Improves dark mode nav bar. (#575)

  

  JSnipes29

  authored and

  meiron03

  committed
  91373df

  Copy full SHA for 91373df

• Improve GSR tab text (#576)

  

  JSnipes29

  authored and

  meiron03

  committed
  de4252e

  Copy full SHA for de4252e

• add vedha

  

  vavali08

  authored and

  meiron03

  committed
  1c2407c

  Copy full SHA for 1c2407c

• update fix merge

  

  vavali08

  authored and

  meiron03

  committed
  a0fe45c

  Copy full SHA for a0fe45c

• fix merge conflict

  

  vavali08

  authored and

  meiron03

  committed
  cf157b7

  Copy full SHA for cf157b7

• rebase

  

  trinif

  authored and

  meiron03

  committed
  c63407c

  Copy full SHA for c63407c

• Added Trini to about page.

  

  trinif

  authored and

  meiron03

  committed
  51a6c57

  Copy full SHA for 51a6c57

• Update .gitignore (#579)

  Show description for 88b8098
  

  rchhaya

  authored and

  meiron03

  committed
  88b8098

  Copy full SHA for 88b8098

• update about page f2023 (#583)

  

  rchhaya

  authored and

  meiron03

  committed
  7127e1a

  Copy full SHA for 7127e1a

• Fixed bug with dining settings

  

  JSnipes29

  authored and

  meiron03

  committed
  47a38c1

  Copy full SHA for 47a38c1

• Moved Feedback button to links page on More

  

  trinif

  authored and

  meiron03

  committed
  39d6002

  Copy full SHA for 39d6002

• fixed gitignore for feedback

  

  trinif

  authored and

  meiron03

  committed
  6a9a96d

  Copy full SHA for 6a9a96d

• Fix big bug

  

  JSnipes29

  authored and

  meiron03

  committed
  76a3b69

  Copy full SHA for 76a3b69

• Add synchronous calls for accessing bearer token

  

  JSnipes29

  authored and

  meiron03

  committed
  44b3ee3

  Copy full SHA for 44b3ee3

• wrap all relevant network calls so they are guaranteed

  Show description for eb89ada
  meiron03

  committed
  eb89ada

  Copy full SHA for eb89ada

• only replace the login fragment if we're not currently on the login fragment.

  Show description for 9751332
  meiron03

  committed
  9751332

  Copy full SHA for 9751332

• get rid of testing code oops.

  meiron03

  committed
  80e9681

  Copy full SHA for 80e9681

• Fix visual bug after booking gsr

  

  JSnipes29

  authored and

  meiron03

  committed
  de7de68

  Copy full SHA for de7de68

• Fix weird login issue

  

  JSnipes29

  authored and

  meiron03

  committed
  39b23a3

  Copy full SHA for 39b23a3

• Fix issue with GSR booking timeout and added waiting UI

  

  JSnipes29

  authored and

  meiron03

  committed
  74742ec

  Copy full SHA for 74742ec

• Remove user data when logging out

  

  JSnipes29

  authored and

  meiron03

  committed
  c9e2233

  Copy full SHA for c9e2233

• Fix getAccessToken() race condition.

  meiron03

  committed
  4254b93

  Copy full SHA for 4254b93

• fix gsr loading on expired bearer token.

  meiron03

  committed
  754cc8d

  Copy full SHA for 754cc8d

Commits on Oct 17, 2023

• Merge remote-tracking branch 'origin/main'

  Show description for 169ee04
  meiron03

  committed
  169ee04

  Copy full SHA for 169ee04

• More:

  Show description for bcea48a
  meiron03

  committed
  bcea48a

  Copy full SHA for bcea48a

• Update AboutFragment.kt

  meiron03

  authored
  75f9c2d

  Copy full SHA for 75f9c2d

• get rid of unused import MainPagerAdapter.kt

  meiron03

  authored
  088d009

  Copy full SHA for 088d009