[go: nahoru, domu]

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

Conversation

iBareq
Copy link
@iBareq iBareq commented Jun 19, 2024

This PR includes a complete implementation of the JetFit app for TV, following the design provided by Google. The design details can be found at the following link: JetFit TV Design

iBareq and others added 30 commits February 28, 2024 22:41
* add gradle files

* add structure

* fix issue in build

* add di package
* add custom components

* add experimental annotation

* add some icons and internet permission
* 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 <ahmedfikryelshimi24@gmail.com>
* add navigation drawer

* fix color of navigation drawer and color icon

* merge home and fix conflict

---------

Co-authored-by: amnah.a <amnah44ali@gmail.com>
* 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 <amnah44ali@gmail.com>
…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
…feature/training-entities

# Conflicts:
#	JetFit/app/src/main/java/com/google/jetfit/components/ImageWithRadialGradient.kt
* 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
* 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 <amnah44ali@gmail.com>
ahmedfikry24 and others added 28 commits March 28, 2024 03:25
* refactor interaction in ProfileSelectorScreen

* refactor interaction in FavoritesScreen

* move implement click in HomeScreen to screen
* fix navigation issue and conflict

* add sub setting items

* merge jetFit on setting ui branch to solve conflicts

---------

Co-authored-by: amnah.a <amnah44ali@gmail.com>
* remove the condition of theme

* remove imports and unusable class
* 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 <118762446+yassenRamadan1@users.noreply.github.com>
Co-authored-by: Andrew abo alhana <hana_hany6@yahoo.com>
Co-authored-by: amnah.a <amnah44ali@gmail.com>
* add startup benchmark

* add emulator to baseline profile -_-

* add base profile cases to benchmark
* 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 <hana_hany6@yahoo.com>
* complete navigation from training screen

* fix items
Copy link
google-cla bot commented Jun 19, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.