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

Feature: educational videos #54

Merged
merged 84 commits into from
Jul 8, 2024
Merged

Feature: educational videos #54

merged 84 commits into from
Jul 8, 2024

Commits on Jun 22, 2024

  1. added OnboardingScreenPreview 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    7f200a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. added app screen navigation event 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    e41e638 View commit details
    Browse the repository at this point in the history

  2. added Route to App Screen and Video Detail 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f6d3058 View commit details
    Browse the repository at this point in the history

  3. updated onConsented Target 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    07c946b View commit details
    Browse the repository at this point in the history

  4. changed to elevated card 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    dd45165 View commit details
    Browse the repository at this point in the history

  5. added gitignore 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    39eeb0e View commit details
    Browse the repository at this point in the history

  6. added education module 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    c7e89a0 View commit details
    Browse the repository at this point in the history

  7. added NavigationItem 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    3d3d232 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into feature/educational-videos 

    # Conflicts:
#	settings.gradle.kts
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    07185c3 View commit details
    Browse the repository at this point in the history

  9. added engage education repo and mapper 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    63747f3 View commit details
    Browse the repository at this point in the history

  10. added app screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a5e2f21 View commit details
    Browse the repository at this point in the history

  11. updated main activity 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    edfbdb4 View commit details
    Browse the repository at this point in the history

  12. added education to build.gradle.kts 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d8489fb View commit details
    Browse the repository at this point in the history

  13. added home drawable 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    07a3a0a View commit details
    Browse the repository at this point in the history

  14. app ui state 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1a4dca7 View commit details
    Browse the repository at this point in the history

  15. updated app screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    87982aa View commit details
    Browse the repository at this point in the history

  16. updated MainActivityViewModel 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    bff7499 View commit details
    Browse the repository at this point in the history

  17. tested MainActivityViewModel 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    19fa7b5 View commit details
    Browse the repository at this point in the history

  18. added top app bar 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    e4c7b78 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. added video screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    79335a5 View commit details
    Browse the repository at this point in the history

  2. added education screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    705c0ff View commit details
    Browse the repository at this point in the history

  3. added dependencies 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    8614fcc View commit details
    Browse the repository at this point in the history

  4. changed background color 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    3b852fb View commit details
    Browse the repository at this point in the history

  5. tested video 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    41bd71e View commit details
    Browse the repository at this point in the history

  6. tested education view model 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    5dac3f6 View commit details
    Browse the repository at this point in the history

  7. added test identifiers to education screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    51901e1 View commit details
    Browse the repository at this point in the history

  8. added modifier to ExpandableSection 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    2729ba9 View commit details
    Browse the repository at this point in the history

  9. added EducationScreenSimulator 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    d2852b8 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. removed suppression 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    b15275e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feature/educational-videos 

    # Conflicts:
#	gradle/libs.versions.toml
    @Basler182
    Basler182 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    49097ac View commit details
    Browse the repository at this point in the history

  3. updated AppScreen Navigation Test 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    02fd3d1 View commit details
    Browse the repository at this point in the history

  4. updated AppScreen Navigation Test 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    3bd22df View commit details
    Browse the repository at this point in the history

  5. optimized play icon 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    ad0f9c4 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d122916 View commit details
    Browse the repository at this point in the history

  2. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    02ba156 View commit details
    Browse the repository at this point in the history

  3. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    15eb63e View commit details
    Browse the repository at this point in the history

  4. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    64ee18f View commit details
    Browse the repository at this point in the history

  5. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    98495aa View commit details
    Browse the repository at this point in the history

  6. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    9b01d8a View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'main' into feature/educational-videos

    @Basler182
    Basler182 authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    17b46dd View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. added Ratios 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    2b04295 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/educational-videos' of https://github.com/Stanf… 

    …ordSpezi/SpeziKt into feature/educational-videos
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    bf7316d View commit details
    Browse the repository at this point in the history

  3. pass whole video to video detail screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a9a6b8f View commit details
    Browse the repository at this point in the history

  4. pass whole video to video detail screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    07532ff View commit details
    Browse the repository at this point in the history

  5. added serialisation for navigation 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    37f73c2 View commit details
    Browse the repository at this point in the history

  6. pass entire video 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    c41d902 View commit details
    Browse the repository at this point in the history

  7. added Borders 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a6ba022 View commit details
    Browse the repository at this point in the history

  8. changed ratio of video preview to 16:9 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    706dca4 View commit details
    Browse the repository at this point in the history

  9. updated EducationUiState 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a8acd6f View commit details
    Browse the repository at this point in the history

  10. extracted EducationRoutes 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    12782fb View commit details
    Browse the repository at this point in the history

  11. removed VideoDetails Route from App 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    8269738 View commit details
    Browse the repository at this point in the history

  12. added saveStateHandle in ViewModel 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    a1f8c38 View commit details
    Browse the repository at this point in the history

  13. updated VideoViewModelTest and EducationViewModelTest 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    39094d4 View commit details
    Browse the repository at this point in the history

  14. fix detekt format 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    0897c7d View commit details
    Browse the repository at this point in the history

  15. update video screen test to video 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    4e142d6 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. tested video screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    947d9a9 View commit details
    Browse the repository at this point in the history

  2. tested EducationScreen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    8823a5b View commit details
    Browse the repository at this point in the history

  3. moved pop back stack into navigator module 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    4900df8 View commit details
    Browse the repository at this point in the history

  4. updated BottomBarItem to enum 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    73ee180 View commit details
    Browse the repository at this point in the history

  5. removed not used Elevations 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    486ca21 View commit details
    Browse the repository at this point in the history

  6. removed not needed dependencies 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    090caee View commit details
    Browse the repository at this point in the history

  7. reused AppTopAppBar 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    16df4dc View commit details
    Browse the repository at this point in the history

  8. extracted image height to const 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    252e590 View commit details
    Browse the repository at this point in the history

  9. added missing params 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    26a2184 View commit details
    Browse the repository at this point in the history

  10. changed to lazy.items from indexed 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    4392476 View commit details
    Browse the repository at this point in the history

  11. extracted ExpandIcon 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7573a43 View commit details
    Browse the repository at this point in the history

  12. moved popbackstack into setup 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    31a83b1 View commit details
    Browse the repository at this point in the history

  13. moved language into mapper 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    79269cb View commit details
    Browse the repository at this point in the history

  14. removed entities with invalid nulls 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    4075f9d View commit details
    Browse the repository at this point in the history

  15. removed entities with invalid nulls 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    b2333a4 View commit details
    Browse the repository at this point in the history

  16. tested app screen 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    c93efe4 View commit details
    Browse the repository at this point in the history

  17. adjusted borders, elevations, ratios, shapes and sizes 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    26d7233 View commit details
    Browse the repository at this point in the history

  18. adjusted borders, elevations, ratios, shapes and sizes 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7f6189a View commit details
    Browse the repository at this point in the history

  19. adjusted education screen test 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    45ef95e View commit details
    Browse the repository at this point in the history

  20. removed unused update block 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    3efcc64 View commit details
    Browse the repository at this point in the history

  21. trigger expand in view model 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7b57be1 View commit details
    Browse the repository at this point in the history

  22. renamed expandable video section 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    9772073 View commit details
    Browse the repository at this point in the history

  23. introduced uistate generic interface 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    51cc9a1 View commit details
    Browse the repository at this point in the history

  24. handle video listener in view model 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7435a96 View commit details
    Browse the repository at this point in the history

  25. tested top app bar 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    519ebcf View commit details
    Browse the repository at this point in the history

  26. adjust app screen add additional test modifiers 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    c6e24e7 View commit details
    Browse the repository at this point in the history

  27. added and tested thumbnail url in video model 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    b6072a1 View commit details
    Browse the repository at this point in the history

  28. fix detekt 

    Signed-off-by: Basler182 <[email protected]>
    @Basler182
    Basler182 committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    3a3cc12 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. fix detekt issues

    @eldcn
    eldcn committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    27f6e14 View commit details
    Browse the repository at this point in the history