From 8a9c94b06f42aa8dd356d83670e16e43fd64a122 Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Fri, 22 Jul 2022 21:58:42 +0200 Subject: [PATCH] Address review feedback --- .../jellyfin/androidtv/ui/picture/PictureViewerFragment.kt | 7 +++++-- .../androidtv/ui/picture/PictureViewerViewModel.kt | 2 +- .../ui/preference/screen/DeveloperPreferencesScreen.kt | 2 +- app/src/main/res/values/strings.xml | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt b/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt index 22273e30c4..5ed0f779cf 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerFragment.kt @@ -30,7 +30,7 @@ class PictureViewerFragment : Fragment(), View.OnKeyListener { /** * The download API is used by jellyfin-web when loading images. Unfortunately with our * current code it doesn't work for the app. Larger files (gifs, large photos etc.) can - * cause the app to go out of memory. This is mostly catched by Glide but it ends up + * cause the app to go out of memory. This is mostly caught by Glide but it ends up * never displaying the picture in those cases. * * This toggle is left in the code in case we migrate to a different image processor that @@ -87,7 +87,10 @@ class PictureViewerFragment : Fragment(), View.OnKeyListener { keyDown(KeyEvent.KEYCODE_MEDIA_SKIP_FORWARD, KeyEvent.KEYCODE_MEDIA_NEXT) .body { pictureViewerViewModel.showNext() } - keyDown(KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_DPAD_CENTER) + keyDown( + KeyEvent.KEYCODE_DPAD_UP, KeyEvent.KEYCODE_DPAD_DOWN, + KeyEvent.KEYCODE_ENTER, KeyEvent.KEYCODE_DPAD_CENTER, + ) .condition { !binding.actions.isVisible } .body { showActions() } diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt b/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt index f159c50242..056456417d 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/picture/PictureViewerViewModel.kt @@ -32,7 +32,7 @@ class PictureViewerViewModel(private val api: ApiClient) : ViewModel() { _currentItem.value = itemResponse val albumResponse by api.itemsApi.getItemsByUserId( - parentId = itemResponse.albumId, + 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 diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt b/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt index a7cd2fe72b..46bb14c82d 100644 --- a/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt +++ b/app/src/main/java/org/jellyfin/androidtv/ui/preference/screen/DeveloperPreferencesScreen.kt @@ -33,7 +33,7 @@ class DeveloperPreferencesScreen : OptionsFragment() { } checkbox { - title = "Enable new picture viewer" + title = getString(R.string.enable_picture_viewer_title) setContent(R.string.enable_playback_module_description) bind(userPreferences, UserPreferences.pictureViewerRewriteEnabled) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05ef03516e..b04a995f21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -498,4 +498,5 @@ Logs will not be included in crash reports Oops! Something went wrong, a crash report was send to your Jellyfin server. The setup of this server has not been completed. Open Jellyfin in a web browser to finish setup before signing in. + Enable new picture viewer