forked from jellyfin/jellyfin-androidtv
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add skip options, the same as the web version (#8)
* Publish 10.10 to Discord, release 10.9 * first version, contain bugs, and unclean code * Publish 10.10 to Discord, release 10.9 * No mod should be needed in 10.10 * Avoid confusion with official build * Update README.md to clarify 10.9 target * clean up some code, and some more stuff * clean up some code, and some more stuff * clean up some code, adding 3 new icons, moving to enum... * random stuff * random stuff * random stuff * TODO LIST: -add labels * Add labels and optimize kotlin calls --------- Make the code more manageable Fix dependency injection for prefs Co-Authored-By: TwistedUmbrellaX <[email protected]>
- Loading branch information
1 parent
e64e488
commit c0a185d
Showing
9 changed files
with
152 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/SelectSkipAction.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package org.jellyfin.androidtv.ui.playback.overlay.action | ||
|
|
||
| import android.content.Context | ||
| import android.view.Gravity | ||
| import android.view.View | ||
| import android.widget.PopupMenu | ||
| import org.jellyfin.androidtv.preference.UserPreferences | ||
| import org.jellyfin.androidtv.ui.playback.PlaybackController | ||
| import org.jellyfin.androidtv.ui.playback.overlay.CustomPlaybackTransportControlGlue | ||
| import org.jellyfin.androidtv.ui.playback.overlay.VideoPlayerAdapter | ||
| import org.jellyfin.androidtv.ui.playback.segments.SegmentMode | ||
|
|
||
| class SelectSkipAction( | ||
| context: Context, | ||
| customPlaybackTransportControlGlue: CustomPlaybackTransportControlGlue, | ||
| userPreferences: UserPreferences | ||
| ) : CustomAction(context, customPlaybackTransportControlGlue) { | ||
| private val preferences = userPreferences | ||
| private val customPlaybackTransportControlGlue1 = customPlaybackTransportControlGlue | ||
|
|
||
| init { | ||
| initializeWithIcon(preferences[UserPreferences.skipMode].icon()) | ||
| } | ||
|
|
||
| override fun handleClickAction( | ||
| playbackController: PlaybackController, | ||
| videoPlayerAdapter: VideoPlayerAdapter, | ||
| context: Context, | ||
| view: View, | ||
| ) { | ||
| videoPlayerAdapter.leanbackOverlayFragment.setFading(false) | ||
| PopupMenu(context, view, Gravity.END).apply { | ||
| SegmentMode.entries.forEach { | ||
| menu.add(0, it.ordinal, it.ordinal, context.getString(it.label())).apply { | ||
| isChecked = preferences[UserPreferences.skipMode] == it | ||
| } | ||
| } | ||
| menu.setGroupCheckable(0, true, true) | ||
|
|
||
| setOnDismissListener { | ||
| videoPlayerAdapter.leanbackOverlayFragment.setFading(true) | ||
| } | ||
|
|
||
| setOnMenuItemClickListener { item -> | ||
| preferences[UserPreferences.skipMode] = SegmentMode.entries[item.itemId] | ||
|
|
||
| initializeWithIcon(preferences[UserPreferences.skipMode].icon()) | ||
| customPlaybackTransportControlGlue1.notifyActionChanged(this@SelectSkipAction) | ||
| true | ||
| } | ||
| }.show() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
app/src/main/java/org/jellyfin/androidtv/ui/playback/segments/SegmentSkipModes.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.jellyfin.androidtv.ui.playback.segments | ||
|
|
||
| import org.jellyfin.androidtv.R | ||
|
|
||
| enum class SegmentMode { | ||
| SHOW_SKIP_BUTTON { | ||
| override fun icon(): Int = R.drawable.ic_select_skip_show_button | ||
| override fun label(): Int = R.string.lbl_show_skip_button | ||
| }, | ||
| AUTO_SKIP { | ||
| override fun icon(): Int = R.drawable.ic_select_skip_auto_skip | ||
| override fun label(): Int = R.string.lbl_auto_skip | ||
| }, | ||
| HIDE_SKIP_BUTTON { | ||
| override fun icon(): Int = R.drawable.ic_select_skip_hide_button | ||
| override fun label(): Int = R.string.lbl_hide_skip_button | ||
| }; | ||
|
|
||
| abstract fun icon(): Int | ||
| abstract fun label(): Int | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M 20.34 11.52 C 18.72 10.61 15.45 8.79 13.83 7.89 L 22 4.25 L 21.15 7.95 L 20.34 11.52 Z M 18.86 5.65 C 13.97 -1.57 2.57 2.73 2 11.52 L 4.01 11.52 C 4.8 3.88 13.38 1.14 16.98 6.49 L 18.86 5.66 Z" /> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M 9.17 12.88 L 8.13 16.06 L 6.77 16.06 L 10.22 5.95 L 11.78 5.95 L 15.23 16.06 L 13.84 16.06 L 12.76 12.88 L 9.18 12.88 Z M 12.49 11.85 L 11.5 8.94 C 11.28 8.28 11.12 7.68 10.98 7.1 L 10.94 7.1 C 10.81 7.7 10.64 8.31 10.44 8.93 L 9.45 11.85 L 12.49 11.85 Z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M 20.38 11.49 C 20.79 9.68 21.63 6.03 22.04 4.22 L 13.87 7.86 C 15.5 8.76 18.76 10.58 20.38 11.49 Z M 18.9 5.62 L 17.02 6.45 C 15.38 4.02 12.99 3.2 10.49 3.82 L 9.41 2.38 C 9.41 2.38 14.8 0.37 18.9 5.62 Z M 7.81 4.95 C 5.86 6.22 4.37 8.49 4.06 11.48 L 2.05 11.48 C 2.28 7.98 4.26 5.25 6.79 3.56 C 7.09 3.36 9.22 4.03 7.82 4.94 Z M 5.27 1.57 L 6.08 1 L 18.13 17.02 L 17.32 17.59 L 5.27 1.57 Z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M 20.34 11.52 C 18.72 10.61 15.45 8.79 13.83 7.89 L 22 4.25 L 21.15 7.95 L 20.34 11.52 Z M 18.86 5.65 C 13.97 -1.57 2.57 2.73 2 11.52 L 4.01 11.52 C 4.8 3.88 13.38 1.14 16.98 6.49 L 18.86 5.66 Z" /> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M 12.05 9.79 L 9 7.5 L 9 16.5 L 12.05 14.21 L 15 12 L 12.05 9.79 Z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters