Add new experimental picture viewer #1829

nielsvanvelzen · 2022-07-09T21:08:19Z

I started work on this around 2 months ago but didn't completely finish it yet. It already uses a feature flag which is disabled in releases so it won't hurt to merge it. I've made a new column in my board (https://github.com/jellyfin/jellyfin-androidtv/projects/15#column-19021853) that shows the remaining tasks.

The biggest feature is that it doesn't depend on the media manager anymore so it's sort of a part of the playback rewrite (#1057).

Changes

Add preference to enable new picture viewer
- Like the playback rewrite; only shows in development builds
Add KeyHandler DSL to write readable key press handlers
Add new picture viewer
- Supports portrait mode
- Sort of supports touch
- Supports slideshows
- Shows controls to make it easy to start slideshows and navigate forward/backward

Issues

app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt

+			parentId = itemResponse.albumId,
+			includeItemTypes = setOf(BaseItemKind.PHOTO),
+			fields = setOf(ItemFields.PRIMARY_IMAGE_ASPECT_RATIO),
+			sortBy = listOf(ItemFields.SORT_NAME.name), // TODO: Order should be consistent with the stdgridview the user comes from, which allows to change the order


app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt

+			.condition { !binding.actions.isVisible }
+			.body { pictureViewerViewModel.showPrevious() }
+
+		keyDown(KeyEvent.KEYCODE_MEDIA_SKIP_BACKWARD, KeyEvent.KEYCODE_MEDIA_PREVIOUS)


app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt

+			.condition { !binding.actions.isVisible }
+			.body { pictureViewerViewModel.showNext() }
+
+		keyDown(KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_NEXT)


app/src/main/res/layout/fragment_picture_viewer.xml

+        app:layout_constraintStart_toStartOf="parent"
+        tools:visibility="visible">
+
+        <ImageButton


app/src/main/res/layout/fragment_picture_viewer.xml

+            android:layout_width="12dp"
+            android:layout_height="wrap_content" />
+
+        <ImageButton


app/src/main/res/layout/fragment_picture_viewer.xml

+            android:layout_width="12dp"
+            android:layout_height="wrap_content" />
+
+        <ImageButton


app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt

app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt

thornbill

I'm not sure how perfect you are striving to get this for the first implementation, but I noticed a few issues:

There seems to be an issue when changing photos (either manually or via the slideshow) with gifs. The image will change briefly then go back to displaying the previous image.
In large photo libraries it seems like the current "position" is getting lost somehow. For example, I started playback on photo 301, click next, and a previous photo is displayed instead of photo 302.

It would probably be a good idea to show the photo name at least when the controls are visible (this would also help diagnose issue 2 further since I have many copies of the same photo in that album).

It might be good to show the "playback" controls by default to help with discoverability and hide them after a short time. I also didn't find pushing "up" to show the controls intuitive... I'm more accustomed to services using the "down" button to display them. That is more of a personal preference probably and there is some inconsistency among other services on that.

nielsvanvelzen · 2022-07-22T19:58:46Z

There seems to be an issue when changing photos (either manually or via the slideshow) with gifs. The image will change briefly then go back to displaying the previous image.

I haven't experienced this issue but I'd say it's out of scope for this initial PR.

In large photo libraries it seems like the current "position" is getting lost somehow. For example, I started playback on photo 301, click next, and a previous photo is displayed instead of photo 302.

I'll need to create a bigger album (biggest is about 40 items right now) to test this but I've already made an task for lazy loading which might fix this issue.

It would probably be a good idea to show the photo name at least when the controls are visible (this would also help diagnose issue 2 further since I have many copies of the same photo in that album).

Agreed, this was one of the things I wanted to add but not in this initial PR. This one too is already a task on the big list, it's not a feature in the current viewer either (except if you count that browse thingy that you can open while viewing).

It might be good to show the "playback" controls by default to help with discoverability and hide them after a short time. I also didn't find pushing "up" to show the controls intuitive... I'm more accustomed to services using the "down" button to display them. That is more of a personal preference probably and there is some inconsistency among other services on that.

Added support for KEYCODE_DPAD_DOWN to open the controls, I think opening the controls makes sense when the timer to auto-close it is added. I've updated the task to describe this behavior.

app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt

+			parentId = itemResponse.parentId,
+			includeItemTypes = setOf(BaseItemKind.PHOTO),
+			fields = setOf(ItemFields.PRIMARY_IMAGE_ASPECT_RATIO),
+			sortBy = listOf(ItemFields.SORT_NAME.name), // TODO: Order should be consistent with the stdgridview the user comes from, which allows to change the order


github-advanced-security bot found potential problems Jul 9, 2022

View reviewed changes

jellyfin-bot added the merge conflict Conflicts prevent merging label Jul 11, 2022

nielsvanvelzen force-pushed the picture-viewer branch from bbae035 to 4d2e0b2 Compare July 11, 2022 20:24

jellyfin-bot removed the merge conflict Conflicts prevent merging label Jul 11, 2022

nielsvanvelzen linked an issue Jul 12, 2022 that may be closed by this pull request

Photo Slideshow #697

Closed

thornbill reviewed Jul 14, 2022

View reviewed changes

app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt Outdated Show resolved Hide resolved

thornbill reviewed Jul 14, 2022

View reviewed changes

app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt Outdated Show resolved Hide resolved

thornbill reviewed Jul 14, 2022

View reviewed changes

nielsvanvelzen added the next-release Pull request related to a future release which is not being worked on yet label Jul 18, 2022

jellyfin-bot added the merge conflict Conflicts prevent merging label Jul 22, 2022

nielsvanvelzen added 3 commits July 23, 2022 09:32

Add KeyHandler

a99c671

Add PictureViewerFragment to replace PhotoPlayerActivity

59d8097

Address review feedback

8a9c94b

nielsvanvelzen force-pushed the picture-viewer branch from d8da6cb to 8a9c94b Compare July 23, 2022 07:32

jellyfin-bot removed the merge conflict Conflicts prevent merging label Jul 23, 2022

github-advanced-security bot found potential problems Jul 23, 2022

View reviewed changes

nielsvanvelzen added this to the v0.15.0 milestone Jul 29, 2022

nielsvanvelzen removed the next-release Pull request related to a future release which is not being worked on yet label Jul 29, 2022

nielsvanvelzen requested a review from thornbill August 4, 2022 20:06

nielsvanvelzen added the enhancement New feature or request label Aug 11, 2022

nielsvanvelzen merged commit fa94dba into jellyfin:master Aug 11, 2022

nielsvanvelzen deleted the picture-viewer branch August 11, 2022 18:56

nielsvanvelzen added the release-highlight Pull request might be suitable for mentioning in the release blog post label Oct 29, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add new experimental picture viewer #1829

Add new experimental picture viewer #1829

nielsvanvelzen commented Jul 9, 2022 •

edited

Loading

thornbill left a comment

nielsvanvelzen commented Jul 22, 2022

Add new experimental picture viewer #1829

Add new experimental picture viewer #1829

Conversation

nielsvanvelzen commented Jul 9, 2022 • edited Loading

thornbill left a comment

Choose a reason for hiding this comment

nielsvanvelzen commented Jul 22, 2022

nielsvanvelzen commented Jul 9, 2022 •

edited

Loading