Skip to content

Commit

Permalink
Charlottelaw/jdi 14 tab navigation (#12)
Browse files Browse the repository at this point in the history
* navigation

* got rid of unused files

* CodyGarciaa/Legal-Rights-Prea-Pages (#13)

* set up legal rights skeleton, can go to video page with nothing there yet tho

* added video and testing player

* more testing with video, lowk not getting .mp4 to work

* legal rights page scrollable

* added caption buttons, lowk still to add more to it

* closed caption buttons are toggleable and XOR

* finished pr

* resolved philip's problems lol

* 5 create resources sub pages (#15)

* seek help to resource list

* seek help to resource list

* fixed some things

* removed unused import

---------

Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>

* 8-healing-resource-pages (#19)

* [feat] resources rendered and scrolling by buttons

* good work arfa, minor adjustments

---------

Co-authored-by: philipye314 <[email protected]>

* [bug fix] removed extra type file

* navigation

* got rid of unused files

* [fix] 🐐🐐🐐

* [fix] did screen props

* deleted unused files

---------

Co-authored-by: philipye314 <[email protected]>
Co-authored-by: CodyGarciaa <[email protected]>
Co-authored-by: angelinetu <[email protected]>
Co-authored-by: Philip Ye <[email protected]>
Co-authored-by: philipye314 <[email protected]>
Co-authored-by: Arfa Momin <[email protected]>
  • Loading branch information
7 people committed Oct 26, 2024
1 parent ba3b19c commit 80a54e2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 0 deletions.
16 changes: 16 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
"react": "18.2.0",
"react-native": "^0.74.5",
"react-native-paper": "^5.12.5",
<<<<<<< HEAD
"react-native-media-controls": "^2.3.0",
=======
>>>>>>> aafcee1 (Charlottelaw/jdi 14 tab navigation (#12))
"react-native-safe-area-context": "4.10.5",
"react-native-screens": "3.31.1",
"react-native-slider": "^0.11.0",
Expand Down

0 comments on commit 80a54e2

Please sign in to comment.