-
Notifications
You must be signed in to change notification settings - Fork 336
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
base: main
Are you sure you want to change the base?
Jet fit #183
Commits on Feb 28, 2024
-
Configuration menu - View commit details
-
Copy full SHA for fd7b0dd - Browse repository at this point
Copy the full SHA fd7b0ddView commit details
Commits on Mar 4, 2024
-
* add gradle files * add structure * fix issue in build * add di package
Configuration menu - View commit details
-
Copy full SHA for 048cace - Browse repository at this point
Copy the full SHA 048caceView commit details
Commits on Mar 6, 2024
-
Feature/custom components (#3)
* add custom components * add experimental annotation * add some icons and internet permission
Configuration menu - View commit details
-
Copy full SHA for a7358ad - Browse repository at this point
Copy the full SHA a7358adView commit details
Commits on Mar 9, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 391d8c7 - Browse repository at this point
Copy the full SHA 391d8c7View commit details
Commits on Mar 15, 2024
-
Configuration menu - View commit details
-
Copy full SHA for d839249 - Browse repository at this point
Copy the full SHA d839249View commit details -
Configuration menu - View commit details
-
Copy full SHA for b6e3023 - Browse repository at this point
Copy the full SHA b6e3023View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7eee165 - Browse repository at this point
Copy the full SHA 7eee165View commit details -
Configuration menu - View commit details
-
Copy full SHA for 185cb90 - Browse repository at this point
Copy the full SHA 185cb90View commit details -
Configuration menu - View commit details
-
Copy full SHA for 23c49ae - Browse repository at this point
Copy the full SHA 23c49aeView commit details -
Configuration menu - View commit details
-
Copy full SHA for b3ab1b5 - Browse repository at this point
Copy the full SHA b3ab1b5View commit details -
Configuration menu - View commit details
-
Copy full SHA for a1fc08d - Browse repository at this point
Copy the full SHA a1fc08dView commit details -
Configuration menu - View commit details
-
Copy full SHA for f77fc57 - Browse repository at this point
Copy the full SHA f77fc57View commit details -
Configuration menu - View commit details
-
Copy full SHA for bdfbc27 - Browse repository at this point
Copy the full SHA bdfbc27View commit details
Commits on Mar 16, 2024
-
* 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]>
Configuration menu - View commit details
-
Copy full SHA for 885ba94 - Browse repository at this point
Copy the full SHA 885ba94View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for 0be2a8e - Browse repository at this point
Copy the full SHA 0be2a8eView commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for ec2adec - Browse repository at this point
Copy the full SHA ec2adecView commit details
Commits on Mar 17, 2024
-
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
Configuration menu - View commit details
-
Copy full SHA for d714f84 - Browse repository at this point
Copy the full SHA d714f84View commit details
Commits on Mar 18, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 4526688 - Browse repository at this point
Copy the full SHA 4526688View commit details -
Configuration menu - View commit details
-
Copy full SHA for 943a9cb - Browse repository at this point
Copy the full SHA 943a9cbView commit details -
Configuration menu - View commit details
-
Copy full SHA for c017ae0 - Browse repository at this point
Copy the full SHA c017ae0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 93028fa - Browse repository at this point
Copy the full SHA 93028faView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3116c06 - Browse repository at this point
Copy the full SHA 3116c06View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4350983 - Browse repository at this point
Copy the full SHA 4350983View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5643083 - Browse repository at this point
Copy the full SHA 5643083View commit details -
Merge remote-tracking branch 'origin/feature/training-entities' into …
…feature/training-entities # Conflicts: # JetFit/app/src/main/java/com/google/jetfit/components/ImageWithRadialGradient.kt
Configuration menu - View commit details
-
Copy full SHA for 5f00afb - Browse repository at this point
Copy the full SHA 5f00afbView commit details
Commits on Mar 22, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 08b4260 - Browse repository at this point
Copy the full SHA 08b4260View commit details -
* 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
Configuration menu - View commit details
-
Copy full SHA for 9a8bd22 - Browse repository at this point
Copy the full SHA 9a8bd22View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61348b9 - Browse repository at this point
Copy the full SHA 61348b9View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for 7f7f36c - Browse repository at this point
Copy the full SHA 7f7f36cView commit details
Commits on Mar 23, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 0646d78 - Browse repository at this point
Copy the full SHA 0646d78View commit details -
Configuration menu - View commit details
-
Copy full SHA for cf50863 - Browse repository at this point
Copy the full SHA cf50863View commit details -
Configuration menu - View commit details
-
Copy full SHA for fba560a - Browse repository at this point
Copy the full SHA fba560aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 158ecab - Browse repository at this point
Copy the full SHA 158ecabView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 9b93f3c - Browse repository at this point
Copy the full SHA 9b93f3cView commit details -
Configuration menu - View commit details
-
Copy full SHA for d513eeb - Browse repository at this point
Copy the full SHA d513eebView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0c07cd1 - Browse repository at this point
Copy the full SHA 0c07cd1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 325d6a4 - Browse repository at this point
Copy the full SHA 325d6a4View commit details
Commits on Mar 25, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 56abccf - Browse repository at this point
Copy the full SHA 56abccfView commit details -
* 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
Configuration menu - View commit details
-
Copy full SHA for 582522d - Browse repository at this point
Copy the full SHA 582522dView commit details -
* 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]>
Configuration menu - View commit details
-
Copy full SHA for 48a49a6 - Browse repository at this point
Copy the full SHA 48a49a6View commit details
Commits on Mar 26, 2024
-
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
Configuration menu - View commit details
-
Copy full SHA for a194fd8 - Browse repository at this point
Copy the full SHA a194fd8View commit details -
Merge remote-tracking branch 'origin/feature/training-entities' into …
…feature/training-entities
Configuration menu - View commit details
-
Copy full SHA for 758206a - Browse repository at this point
Copy the full SHA 758206aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 55dcc2a - Browse repository at this point
Copy the full SHA 55dcc2aView commit details
Commits on Mar 27, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 84988b7 - Browse repository at this point
Copy the full SHA 84988b7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 566282a - Browse repository at this point
Copy the full SHA 566282aView commit details -
Configuration menu - View commit details
-
Copy full SHA for ef109c8 - Browse repository at this point
Copy the full SHA ef109c8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9b7bf88 - Browse repository at this point
Copy the full SHA 9b7bf88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 933d6ce - Browse repository at this point
Copy the full SHA 933d6ceView commit details
Commits on Mar 28, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 0ca6175 - Browse repository at this point
Copy the full SHA 0ca6175View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2e48338 - Browse repository at this point
Copy the full SHA 2e48338View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8fa79dc - Browse repository at this point
Copy the full SHA 8fa79dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 27017dc - Browse repository at this point
Copy the full SHA 27017dcView commit details -
Configuration menu - View commit details
-
Copy full SHA for abd9381 - Browse repository at this point
Copy the full SHA abd9381View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8d8ab19 - Browse repository at this point
Copy the full SHA 8d8ab19View commit details
Commits on May 10, 2024
-
Merge pull request #8 from TheChance101/feature/training-entities
Training Entities
Configuration menu - View commit details
-
Copy full SHA for e18b0a4 - Browse repository at this point
Copy the full SHA e18b0a4View commit details
Commits on May 24, 2024
-
Feature/refactor interaction (#15)
* refactor interaction in ProfileSelectorScreen * refactor interaction in FavoritesScreen * move implement click in HomeScreen to screen
Configuration menu - View commit details
-
Copy full SHA for f9d1930 - Browse repository at this point
Copy the full SHA f9d1930View commit details -
* 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]>
Configuration menu - View commit details
-
Copy full SHA for 55dfdd0 - Browse repository at this point
Copy the full SHA 55dfdd0View commit details -
Fix/remove const_theme scheme (#17)
* remove the condition of theme * remove imports and unusable class
Configuration menu - View commit details
-
Copy full SHA for b129dbe - Browse repository at this point
Copy the full SHA b129dbeView commit details -
* 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]>
Configuration menu - View commit details
-
Copy full SHA for f0c6f31 - Browse repository at this point
Copy the full SHA f0c6f31View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2865d76 - Browse repository at this point
Copy the full SHA 2865d76View commit details -
* add startup benchmark * add emulator to baseline profile -_- * add base profile cases to benchmark
Configuration menu - View commit details
-
Copy full SHA for 8cf1df5 - Browse repository at this point
Copy the full SHA 8cf1df5View commit details
Commits on May 27, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 0f7cbe9 - Browse repository at this point
Copy the full SHA 0f7cbe9View commit details -
Configuration menu - View commit details
-
Copy full SHA for fd47649 - Browse repository at this point
Copy the full SHA fd47649View commit details -
Configuration menu - View commit details
-
Copy full SHA for bea82f8 - Browse repository at this point
Copy the full SHA bea82f8View commit details
Commits on May 29, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 7f7916c - Browse repository at this point
Copy the full SHA 7f7916cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3279dc4 - Browse repository at this point
Copy the full SHA 3279dc4View commit details
Commits on May 30, 2024
-
change source image figma upload to github repo and replace use examp…
…le.com with real image
Configuration menu - View commit details
-
Copy full SHA for a5a0a1e - Browse repository at this point
Copy the full SHA a5a0a1eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 76ddbc6 - Browse repository at this point
Copy the full SHA 76ddbc6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2636fd7 - Browse repository at this point
Copy the full SHA 2636fd7View commit details -
change source image figma upload to github repo and replace use examp…
…le.com with real image using in series
Configuration menu - View commit details
-
Copy full SHA for 8903e06 - Browse repository at this point
Copy the full SHA 8903e06View commit details
Commits on Jun 19, 2024
-
Merge pull request #21 from TheChance101/feature/image-sourcse
Change source images
Configuration menu - View commit details
-
Copy full SHA for c58ebe6 - Browse repository at this point
Copy the full SHA c58ebe6View commit details -
Merge pull request #20 from TheChance101/feature/training
Feature/training
Configuration menu - View commit details
-
Copy full SHA for 2cb97e8 - Browse repository at this point
Copy the full SHA 2cb97e8View commit details -
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]>
Configuration menu - View commit details
-
Copy full SHA for d2c5759 - Browse repository at this point
Copy the full SHA d2c5759View commit details -
Feature/complete navigaition (#23)
* complete navigation from training screen * fix items
Configuration menu - View commit details
-
Copy full SHA for 4643092 - Browse repository at this point
Copy the full SHA 4643092View commit details -
Configuration menu - View commit details
-
Copy full SHA for eb6e919 - Browse repository at this point
Copy the full SHA eb6e919View commit details -
Configuration menu - View commit details
-
Copy full SHA for 42fd2c7 - Browse repository at this point
Copy the full SHA 42fd2c7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61a39fd - Browse repository at this point
Copy the full SHA 61a39fdView commit details