Merge branch 'ericLandingPage' into 'main'
Home Page created
See merge request !16 (merged)
(cherry picked from commit 2fbb740a)
47e275a5 Initial nav setup 7782d4b2 Initial commit 01f3c7ad Adding more text bonxes b538fa9e front side view visually complete 76c39686 minor change to back arrow size f03537cd basic study ui 04c77464 remove .idea files fe1e6c30 yay bf5f32fa Merge branch 'ericAddCards' into 'd3-demo' 8e567e74 Merge branch 'zack_study_mode' into 'd3-demo' 9930506c Merge branch 'create_deck' into 'd3-demo' 6b1f3968 Cleaning up a841cbf3 Merge branch 'mbreiva/folder_structure' into 'd3-demo' 52bf78b7 Merge branch 'd3-demo' into 'emilyChooseDeck' 25804cc3 Merge branch 'emilyChooseDeck' into 'd3-demo' 76c98635 Delete local.properties b078548e "Choose study mode" page e87eba9b Merge branch 'zack-study-mode' into 'd3-demo' 16b13d2c flipping card functionality added, state saves values, issues with keyboard... ba34a840 Routing pages 0bb688f7 new card functions 1fb4a95c New deck functions 6315aec7 Merge branch 'ericAddCards' into 'd3-demo' 920d759f Merge branch 'd3-demo' into navigation cb979f02 Adding more connections 11844fc6 Minor fixes 0e6bfde2 Cleaning up b3e127b5 Merge branch 'navigation' into 'd3-demo' c752f46c Finished study page (with confetti animation) 13dd2dfd Add confetti animation library 7ca1037a Merge branch 'finish-study-page' into 'd3-demo' 5e94aae0 Use spaced repetition functions deb6bbb1 Use new classic study functions bf03a062 Import Card c175c577 Updating create deck ui b53bf8b5 updating create deck ui 2 89db59d3 Delete local.properties 8a1cd096 attempting to add a basic basic space repetition for the demo ecc541a6 Merge branch 'spacedRepDhruva' into 'd3-demo' 3aa53df9 Connecting create deck and card pages 8e78538c fixed bug with spaced repetition 3ae7506d Merge branch 'dhruvaDev4' into 'd3-demo' bb00f906 Connecting to finished study page c9e031e3 Updated mock data d5c443f0 fixed nav graph bug with hard coded data dfd066e1 demo branch i hope 2a92cc9b Update MyDecksScreen.kt 41a3edec padding bf12897f Merge remote-tracking branch 'origin/demoBranch' into demoBranch 0bf5da66 Update AndroidManifest.xml 3174c361 Add TTS initialization + engine connection to MainActivity 742bbbe2 Pass TTS functionality to study pages 19694e91 Pass TTS functionality to navigation graph 86a48289 Add TTS functionality to Classic Study 74b2542f Add TTS functionality to Spaced Repetition Study b897488f Add Speech Transcription to Voice Study 9955d380 home page concept visually completed, needs integration with navigation, not... 3f79538c add extra arrow to box buttons