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.

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

Jet fit #183

Open
wants to merge 77 commits into
base: main
Choose a base branch
from
Open

Jet fit #183

wants to merge 77 commits into from

Commits on Feb 28, 2024

  1. happy init commit

    iBareq committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    fd7b0dd View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Feature/structure (#2)

    * add gradle files
    
    * add structure
    
    * fix issue in build
    
    * add di package
    yassenRamadan1 authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    048cace View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. Feature/custom components (#3)

    * add custom components
    
    * add experimental annotation
    
    * add some icons and internet permission
    AndrewAboalhana authored Mar 6, 2024
    Configuration menu
    Copy the full SHA
    a7358ad View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Configuration menu
    Copy the full SHA
    391d8c7 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Configuration menu
    Copy the full SHA
    d839249 View commit details
    Browse the repository at this point in the history
  2. add icons

    Abdurrahman-Salah-ad-Din committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    b6e3023 View commit details
    Browse the repository at this point in the history
  3. add entities

    Abdurrahman-Salah-ad-Din committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    7eee165 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    185cb90 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    23c49ae View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b3ab1b5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a1fc08d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f77fc57 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bdfbc27 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2024

  1. Feature/home (#5)

    * add inverseSurface and inverseOnSurface colors
    
    * add Shapes design system
    
    * add getSessions to JetFitRepository with implement
    
    * add withShadow modifier
    
    * add sessions card
    
    * add sessions to home screen
    
    * add entity & update repository
    
    * create home categories
    
    * add entity
    
    * create recommended card
    
    * improve color background to sessions card
    
    * add get trainings recommended to JetFitRepository
    
    * improve TrainingsRecommended and get data from repo
    
    * update dimensions
    
    * update recommended card
    
    * apply aspectRatio with image to set full
    
    * improve implement design
    
    ---------
    
    Co-authored-by: Ahmed Fikry <[email protected]>
    AmeerAmjed and ahmedfikry24 authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    885ba94 View commit details
    Browse the repository at this point in the history
  2. feature/navigation-drawer (#9)

    * add navigation drawer
    
    * fix color of navigation drawer and color icon
    
    * merge home and fix conflict
    
    ---------
    
    Co-authored-by: amnah.a <[email protected]>
    Asiasama710 and amnah44 authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    0be2a8e View commit details
    Browse the repository at this point in the history
  3. Feature/audio player and video player (#11)

    * add viewModel for VideoPlayerScreen
    
    * add VideoPlayerScreen
    
    * add VideoPlayerState
    
    * add VideoPlayerControlsIcon
    
    * finish VideoPlayerState and rememberVideoPlayerState
    
    * add VideoPlayerControllerText compose function
    
    * add subtitles icon
    
    * finish VideoPlayerControlsIcon composable function
    
    * finish VideoPlayerDurationText composable function
    
    * make hideSeconds from 3 seconds to 4 seconds
    
    * update VideoPlayerDurationText composable function
    
    * update VideoPlayerDurationText composable function
    
    * finish VideoPlayerTitle composable function
    
    * update VideoPlayerDurationText
    
    * finish VideoPlayerOverlay
    
    * add KeyEvents
    
    * finish VideoPlayerControllerIndicator
    
    * finish VideoPlayerSeeker
    
    * update VideoPlayerSeeker
    
    * add preview function to VideoPlayerSeeker
    
    * finish VideoPlayerFrame
    
    * add exo player dependencies
    
    * finish VideoPlayerScreen
    
    * add Workout entity class
    
    * finish getWorkoutById in JetFitImpl
    
    * finish VideoPlayerUiState
    
    * finish VideoPlayerViewModel
    
    * update KeyEvents modifiers
    
    * add subtitles to Workout
    
    * finish subtitles
    
    * finish VideoPlayerControlsIcon
    
    * finish VideoPlayerScreen
    
    * make pause/resume can be show/hide
    
    * fix show/hide controls issue
    
    * add VideoPlayerScreen to Screens
    
    * add AudioPlayerScreen and viewModel
    
    * add icons
    
    * make one package player for video player and audio player
    
    * add AudioPlayerUiState
    
    * add Song entity
    
    * finish repository and viewModel with fake data for AudioPlayerScreen
    
    * add AudioPlayerScreen to Screens
    
    * refactor VideoPlayerTitle to make it reusable compose function for both video and audio and rename to PlayerTitle
    
    * add exoPlayer for playing audio
    
    * add PlayerControlsIcon to make it reusable compose function for both video and audio
    
    * finish AudioPlayerControls
    
    * add AudioPlayerDurationText
    
    * fix icons issue
    
    * finish AudioPlayerScreen
    
    * add animations to image
    
    * fix navigation issue and conflict
    
    ---------
    
    Co-authored-by: amnah.a <[email protected]>
    kamelkiko and amnah44 authored Mar 16, 2024
    Configuration menu
    Copy the full SHA
    ec2adec View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Merge remote-tracking branch 'origin/JetFit' into feature/training-en…

    …tities
    
    # Conflicts:
    #	JetFit/app/src/main/java/com/google/jetfit/data/entities/Workout.kt
    #	JetFit/app/src/main/java/com/google/jetfit/data/repositories/JetFitImpl.kt
    #	JetFit/app/src/main/java/com/google/jetfit/data/repositories/JetFitRepository.kt
    #	JetFit/gradle/libs.versions.toml
    Abdurrahman-Salah-ad-Din committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    d714f84 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. Configuration menu
    Copy the full SHA
    4526688 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    943a9cb View commit details
    Browse the repository at this point in the history
  3. update data

    Abdurrahman-Salah-ad-Din committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    c017ae0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    93028fa View commit details
    Browse the repository at this point in the history
  5. move files

    Abdurrahman-Salah-ad-Din committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    3116c06 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4350983 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5643083 View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'origin/feature/training-entities' into …

    …feature/training-entities
    
    # Conflicts:
    #	JetFit/app/src/main/java/com/google/jetfit/components/ImageWithRadialGradient.kt
    Abdurrahman-Salah-ad-Din committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    5f00afb View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Configuration menu
    Copy the full SHA
    08b4260 View commit details
    Browse the repository at this point in the history
  2. Sort and Filter (#13)

    * create side menu
    
    * create filter and sort side menu
    
    * remove Unnecessary rout from base graph
    
    * fix color of background
    
    * handel sort and filter side menu
    
    * implement get Instructors
    
    * add inversePrimary color
    
    * fix theme color
    Asiasama710 authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    9a8bd22 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    61348b9 View commit details
    Browse the repository at this point in the history
  4. Feature/profile selector (#14)

    * add get user profiles to JetFitRepository
    
    * implement screen
    
    * handel onBackPressed & onClickProfileSelected
    
    * add shadow to avatar profile selected
    
    * improve shadow card Sessions with use shadowBox
    
    ---------
    
    Co-authored-by: amnah.a <[email protected]>
    AmeerAmjed and amnah44 authored Mar 22, 2024
    Configuration menu
    Copy the full SHA
    7f7f36c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Configuration menu
    Copy the full SHA
    0646d78 View commit details
    Browse the repository at this point in the history
  2. rename file

    Abdurrahman-Salah-ad-Din committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    cf50863 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fba560a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    158ecab View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'origin/JetFit' into feature/training-en…

    …tities
    
    # Conflicts:
    #	JetFit/app/src/main/java/com/google/jetfit/data/repositories/JetFitImpl.kt
    #	JetFit/app/src/main/java/com/google/jetfit/data/repositories/JetFitRepository.kt
    #	JetFit/app/src/main/java/com/google/jetfit/presentation/App.kt
    #	JetFit/app/src/main/java/com/google/jetfit/presentation/screens/Screens.kt
    Abdurrahman-Salah-ad-Din committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    9b93f3c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d513eeb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0c07cd1 View commit details
    Browse the repository at this point in the history
  8. update data

    Abdurrahman-Salah-ad-Din committed Mar 23, 2024
    Configuration menu
    Copy the full SHA
    325d6a4 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Configuration menu
    Copy the full SHA
    56abccf View commit details
    Browse the repository at this point in the history
  2. Feature/favourites (#12)

    * add libraries and dummy fav-workouts data
    
    * prepare dummy data list to be viewed
    
    * add the favorites screen into the navigation
    
    * implement custom card design
    
    * load fake data into the repository
    
    * implement FavoritesViewModel
    
    * implement FavoritesScreen design
    
    * add fav screen to the navigation graph
    
    * implement screen dialog functionality
    
    * implement custom button component
    
    * implement fav screen interaction
    
    * optimize imports
    
    * adjust padding position
    
    * add color
    
    * separate the popup dialog + add the pop up shadow
    hassanwasfy authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    582522d View commit details
    Browse the repository at this point in the history
  3. More option screen (#7)

    * fix dependency issues
    
    * add gradle files
    
    * add structure
    
    * add benchmark
    
    * fix issue in build
    
    * add custom components
    
    * add experimental annotation
    
    * add some icons and internet permission
    
    * add needed configuration
    
    * finish more options screen design
    
    * resolve dependency issues
    
    * add theme & colors and base components
    
    * refactor button design
    
    * change scale of back button
    
    * extract strings to string file
    
    * retrieve static data from repository
    
    * add screen sentences to string file
    
    * handel back system button click and navigation
    
    * fix spacing errors
    
    * resolve conflicts from jetFit
    
    ---------
    
    Co-authored-by: yassenRamadan1 <[email protected]>
    Co-authored-by: Andrew abo alhana <[email protected]>
    Co-authored-by: amnah.a <[email protected]>
    4 people authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    48a49a6 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Merge branch 'JetFit' into feature/training-entities

    # Conflicts:
    #	JetFit/app/src/main/java/com/google/jetfit/data/repositories/JetFitImpl.kt
    #	JetFit/app/src/main/java/com/google/jetfit/presentation/App.kt
    ahmedfikry24 committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    a194fd8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    758206a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    55dcc2a View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Configuration menu
    Copy the full SHA
    84988b7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    566282a View commit details
    Browse the repository at this point in the history
  3. commit until review

    ahmedfikry24 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    ef109c8 View commit details
    Browse the repository at this point in the history
  4. update repo

    ahmedfikry24 committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    9b7bf88 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    933d6ce View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Configuration menu
    Copy the full SHA
    0ca6175 View commit details
    Browse the repository at this point in the history
  2. refactor screen logic

    ahmedfikry24 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    2e48338 View commit details
    Browse the repository at this point in the history
  3. rename gradiant image

    ahmedfikry24 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    8fa79dc View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    27017dc View commit details
    Browse the repository at this point in the history
  5. rename file

    Abdurrahman-Salah-ad-Din committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    abd9381 View commit details
    Browse the repository at this point in the history
  6. update dimensions

    ahmedfikry24 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    8d8ab19 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    e18b0a4 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Feature/refactor interaction (#15)

    * refactor interaction in ProfileSelectorScreen
    
    * refactor interaction in FavoritesScreen
    
    * move implement click in HomeScreen to screen
    AmeerAmjed authored May 24, 2024
    Configuration menu
    Copy the full SHA
    f9d1930 View commit details
    Browse the repository at this point in the history
  2. Feature/settings UI (#16)

    * fix navigation issue and conflict
    
    * add sub setting items
    
    * merge jetFit on setting ui branch to solve conflicts
    
    ---------
    
    Co-authored-by: amnah.a <[email protected]>
    AndrewAboalhana and amnah44 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    55dfdd0 View commit details
    Browse the repository at this point in the history
  3. Fix/remove const_theme scheme (#17)

    * remove the condition of theme
    
    * remove imports and unusable class
    amnah44 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    b129dbe View commit details
    Browse the repository at this point in the history
  4. Subscription Screen (#6)

    * fix dependency issues
    
    * add gradle files
    
    * add structure
    
    * add benchmark
    
    * fix issue in build
    
    * add custom components
    
    * add experimental annotation
    
    * add some icons and internet permission
    
    * add needed configuration
    
    * finish more options screen design
    
    * resolve dependency issues
    
    * finish subscription screen design
    
    * add theme & colors and base components
    
    * fix design issues
    
    * extract string to string file resource
    
    * change unselected radio color
    
    * merge JetFit
    
    * retrieve static data from repository
    
    * handel back system navigation
    
    * add sentences to string file
    
    * fix spacing errors
    
    * fix ui issues
    
    * remove conflict import
    
    ---------
    
    Co-authored-by: yassenRamadan1 <[email protected]>
    Co-authored-by: Andrew abo alhana <[email protected]>
    Co-authored-by: amnah.a <[email protected]>
    4 people authored May 24, 2024
    Configuration menu
    Copy the full SHA
    f0c6f31 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2865d76 View commit details
    Browse the repository at this point in the history
  6. Feature/benchmark (#18)

    * add startup benchmark
    
    * add emulator to baseline profile -_-
    
    * add base profile cases to benchmark
    yassenRamadan1 authored May 24, 2024
    Configuration menu
    Copy the full SHA
    8cf1df5 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. add more data same ui

    AmeerAmjed committed May 27, 2024
    Configuration menu
    Copy the full SHA
    0f7cbe9 View commit details
    Browse the repository at this point in the history
  2. set size to CustomCard

    AmeerAmjed committed May 27, 2024
    Configuration menu
    Copy the full SHA
    fd47649 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bea82f8 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Configuration menu
    Copy the full SHA
    7f7916c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3279dc4 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Configuration menu
    Copy the full SHA
    a5a0a1e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    76ddbc6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2636fd7 View commit details
    Browse the repository at this point in the history
  4. change source image figma upload to github repo and replace use examp…

    …le.com with real image using in series
    AmeerAmjed committed May 30, 2024
    Configuration menu
    Copy the full SHA
    8903e06 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge pull request #21 from TheChance101/feature/image-sourcse

    Change source images
    yassenRamadan1 authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    c58ebe6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #20 from TheChance101/feature/training

    Feature/training
    yassenRamadan1 authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    2cb97e8 View commit details
    Browse the repository at this point in the history
  3. Feature/separate repository (#22)

    * separate series, training, workout repo
    
    * separate repositories from on repo into multiple repositories and remove the old repo
    
    * fix conflict of training screen
    
    * get images from github with refactor the size of popup
    
    ---------
    
    Co-authored-by: AndrewAboalhana <[email protected]>
    amnah44 and AndrewAboalhana authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    d2c5759 View commit details
    Browse the repository at this point in the history
  4. Feature/complete navigaition (#23)

    * complete navigation from training screen
    
    * fix items
    yassenRamadan1 authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    4643092 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    eb6e919 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    42fd2c7 View commit details
    Browse the repository at this point in the history
  7. Create README.md

    iBareq authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    61a39fd View commit details
    Browse the repository at this point in the history