-
-
Notifications
You must be signed in to change notification settings - Fork 469
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
Add Subtitle Color Customization Features #1900
Conversation
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Fixed
Show fixed
Hide fixed
I'll review this soon (after 0.14 is released) but you can already start on the linter issues. There's 4 issues that are marked as error. Those need to be fixed to keep compatibility with older platforms (I think you can just use ContextCompat/ResourcesCompat in those places) |
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/dsl/OptionsColorList.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.
There were still some comments unresolved. I've marked them as such again. I'll do a full re-review after they are solved. |
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Fixed
Show fixed
Hide fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Found 14 potential problems in the proposed changes. Check the Files changed tab for more details.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you squash all commits and rebase on top of master?
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorListPreference.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
Outdated
Show resolved
Hide resolved
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Android Lint found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
Outdated
Show resolved
Hide resolved
06a4ca9
to
2ead7aa
Compare
app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt
Show resolved
Hide resolved
3cb2638
to
1f081ec
Compare
pick 13699f6 Initial commit squash 7e8af2d Modify RichListDialog to display subtitle colors squash 19fcb15 Modify RichListOption to display subtitle colors Modify RichListDialog to display subtitle colors Modify RichListOption to display subtitle colors Add Subtitle options to preferences list Added dark grey option and match master commit as much as possible Fix line length Fix line length Fix API Level to Support 21 Lint Error 1 Fix API Level to Support 21 Lint Error 1 Fix API Level to Support 21 Lint Error 1 Fix API Level to Support 21 Lint Error 2 Update app/src/main/res/values/strings.xml Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Requested resolutions implemented part 1 Update app/src/main/java/org/jellyfin/androidtv/ui/preference/dsl/OptionsColorList.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Requested resolutions implemented part 2, restore RichListDialogFragment.kt and add ColorPickerDialogFragment and ColorListPreference Requested resolutions implemented part 3, restore distributionkey Rebased PlaybackPreferencesScreen.kt Update app/src/main/java/org/jellyfin/androidtv/preference/UserPreferences.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/preference/dsl/OptionsColorList.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Resolve line length and magic number issues, using different background for the brighter colors Update app/src/main/java/org/jellyfin/androidtv/ui/shared/StrokeTextView.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Resolve magic numbers attempt Resolve line length issue Remove unnecessary antialias Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Move subtitle setting preference to where the rest of the settings are located Resolve formatting issue in PlaybackPreferenceScreen Update PlaybackPreferencesScreen.kt Fixing formatting Move subtitle setting preference to where the rest of the settings are located Resolve formatting issue in PlaybackPreferenceScreen Resolve import of userpreferences in StrokeTextView.kt Removed unnecessary functions and data attributes from ColorPickerDialogFragment.k Update app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Update app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/PlaybackPreferencesScreen.kt Co-authored-by: Niels van Velzen <nielsvanvelzen@users.noreply.github.com> Resolve magic numbers on lighter colors Resolve positioning of subtitles and importing of preferences Correct positioning of subtitlesTextColor in UserPreferences.kt Lower Increment Resolve preference issue Resolve UserPreferences import
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your contribution and your time! I've made some final adjustments so we can merge the PR.
This adds more display and subtitle customization options to the preferences list, needed to see which subtitle color you are selecting, and modifies the subtitle text renderer to display the text with the set options, as this is my first ever Android application and my first Java program in 10 years, I hopefully did not make any mistakes, I have tried to match the source code as much as possible to make the merge easier.
If possible I would request the pull request approver please check the resource attributes I have used to ensure they are correct especially the R.color.button_default_normal_text value
Changes