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

Beautify show detail page #62

Closed

Conversation

u3frajaeian
Copy link
Contributor

Add two sections in the show detail page to represent similar, casts

@moallemi
Copy link
Owner

Dear @u3frajaeian,
Thanks for your contribution. would you please update your branch with dev?

@moallemi
Copy link
Owner

And we do do not need play button or navigating to player from shows detail page. You can remove it. (Episodes should have play button not Show details)

@u3frajaeian
Copy link
Contributor Author

Dear @u3frajaeian, Thanks for your contribution. would you please update your branch with dev?

Hi it's already updated

@u3frajaeian
Copy link
Contributor Author

And we do do not need play button or navigating to player from shows detail page. You can remove it. (Episodes should have play button not Show details)

Hi, I think we must have an intro for the series, and this button should play something like a trailer or intro.

@moallemi
Copy link
Owner

Dear @u3frajaeian, Thanks for your contribution. would you please update your branch with dev?

Hi it's already updated

But the conflicts are not resolved yet.

CleanShot 2024-05-20 at 08 00 50@2x

Hi, I think we must have an intro for the series, and this button should play something like a trailer or intro.

Yes, we could consider having a "Trailers" button, But Using a play icon without accompanying text for different functionalities can be confusing. The button's label should clearly indicate its purpose so that users can easily understand its function. Also that is outside the scope of this issue. and if we want to add that button, it should navigate to another screen since Shows and movies usually have more than one trailers.

@u3frajaeian
Copy link
Contributor Author

Dear @u3frajaeian, Thanks for your contribution. would you please update your branch with dev?

Hi it's already updated

But the conflicts are not resolved yet.

CleanShot 2024-05-20 at 08 00 50@2x

Hi, I think we must have an intro for the series, and this button should play something like a trailer or intro.

Yes, we could consider having a "Trailers" button, But Using a play icon without accompanying text for different functionalities can be confusing. The button's label should clearly indicate its purpose so that users can easily understand its function. Also that is outside the scope of this issue. and if we want to add that button, it should navigate to another screen since Shows and movies usually have more than one trailers.

Dear Reza, It appears that everything is already updated. After fetching the updated branches and attempting to merge remote/dev with my branch, I received a message stating: "Already up to date."

@u3frajaeian
Copy link
Contributor Author

Dear @u3frajaeian, Thanks for your contribution. would you please update your branch with dev?

Hi it's already updated

But the conflicts are not resolved yet.

CleanShot 2024-05-20 at 08 00 50@2x

Hi, I think we must have an intro for the series, and this button should play something like a trailer or intro.

Yes, we could consider having a "Trailers" button, But Using a play icon without accompanying text for different functionalities can be confusing. The button's label should clearly indicate its purpose so that users can easily understand its function. Also that is outside the scope of this issue. and if we want to add that button, it should navigate to another screen since Shows and movies usually have more than one trailers.

Yes, you are right. I completely misunderstood the function of this button. I assumed the play button was responsible for showing trailers because Filmtime isn't a streaming application. However, based on your description, I will remove it.

@moallemi
Copy link
Owner

Dear Reza, It appears that everything is already updated. After fetching the updated branches and attempting to merge remote/dev with my branch, I received a message stating: "Already up to date."

Hi @u3frajaeian, The message indicates that the branch is updated because it is being compared with your dev branch on your repository. When you create a PR against the original repository you forked from, you must sync your branch with the latest changes before creating the PR. Currently, there are many conflicts, as shown in the screenshot I sent you earlier.

To have a better overview of what I am telling, take a look at this screenshot:

Solution

I suggest you follow one of the options from this document and sync your repo.

Copy link
Owner

@moallemi moallemi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dear @u3frajaeian,

Thank you for your contribution. It appears that syncing your repository with moallemi/Film-Time did not go smoothly, resulting in some of our changes being reverted.

Considering the significant effort and time you've put into this PR, I will manually merge it this time. However, for future contributions, please ensure your PR is synced with the latest version of this repository to avoid such conflicts.

Best regards,

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have this file in movie-detail module

import io.filmtime.data.model.VideoDetail

data class ShowDetailState(
val isLoading: Boolean = false,
val videoDetail: VideoDetail? = null,
val message: String? = null,
val streamInfo: StreamInfo? = null,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

show does not need streamInfo since the show itself is not playable.

},
)
}
}
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can reuse VideoSectionRow

@@ -10,6 +10,10 @@ import io.filmtime.core.ui.common.DestinationRoute

fun NavGraphBuilder.showDetailScreen(
rootRoute: DestinationRoute,
onStreamReady: (DestinationRoute, streamUrl: String) -> Unit,
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do not need streamReady for shows

Comment on lines +277 to +284
Text(
modifier = Modifier.padding(horizontal = 16.dp),
style = TextStyle(
fontWeight = FontWeight.Bold,
fontSize = 16.sp,
color = Color.Black,
),
text = "Similar",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that you have trouble with fixing merge conflicts. Because using VideoSectionRow is the new approach we used for displaying similar items. Please do not revert the changes to previous state.

moallemi pushed a commit that referenced this pull request Jun 7, 2024
@moallemi moallemi closed this Jun 7, 2024
@moallemi moallemi mentioned this pull request Jun 7, 2024
2 tasks
This pull request was closed.
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.

2 participants