From c19350fa365177a3c76add0b8cd9dac4280001a4 Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester <32322857+jarnedemeulemeester@users.noreply.github.com> Date: Mon, 22 Aug 2022 23:56:03 +0200 Subject: [PATCH] Small layout improvements (#145) * Remove unused code * Ellipsize primary and secondary name in home_episode_item * Fix play icon color --- .../jellyfin/fragments/DownloadSeriesFragment.kt | 4 +--- .../dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt | 10 +++------- app/src/main/res/drawable/ic_play.xml | 3 ++- .../main/res/layout-television/home_episode_item.xml | 2 ++ app/src/main/res/layout/home_episode_item.xml | 2 ++ 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/DownloadSeriesFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/DownloadSeriesFragment.kt index c5267254..9b9b8225 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/fragments/DownloadSeriesFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/DownloadSeriesFragment.kt @@ -54,7 +54,7 @@ class DownloadSeriesFragment : Fragment() { viewModel.uiState.collect { uiState -> when (uiState) { is DownloadSeriesViewModel.UiState.Normal -> bindUiStateNormal(uiState) - is DownloadSeriesViewModel.UiState.Loading -> bindUiStateLoading(uiState) + is DownloadSeriesViewModel.UiState.Loading -> Unit is DownloadSeriesViewModel.UiState.Error -> bindUiStateError(uiState) } } @@ -79,8 +79,6 @@ class DownloadSeriesFragment : Fragment() { binding.errorLayout.errorPanel.isVisible = false } - private fun bindUiStateLoading(uiState: DownloadSeriesViewModel.UiState.Loading) {} - private fun bindUiStateError(uiState: DownloadSeriesViewModel.UiState.Error) { errorDialog = ErrorDialogFragment(uiState.error) binding.episodesRecyclerView.isVisible = false diff --git a/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt index 1fd8b9e6..3584c21e 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/tv/ui/MediaDetailFragment.kt @@ -67,8 +67,8 @@ internal class MediaDetailFragment : Fragment() { Timber.d("$uiState") when (uiState) { is MediaInfoViewModel.UiState.Normal -> bindUiStateNormal(uiState) - is MediaInfoViewModel.UiState.Loading -> bindUiStateLoading() - is MediaInfoViewModel.UiState.Error -> bindUiStateError(uiState) + is MediaInfoViewModel.UiState.Loading -> Unit + is MediaInfoViewModel.UiState.Error -> Unit } } } @@ -81,7 +81,7 @@ internal class MediaDetailFragment : Fragment() { binding.seasonsRow.gridView.adapter = seasonsAdapter binding.seasonsRow.gridView.verticalSpacing = 25 - val castAdapter = PersonListAdapter { person -> + val castAdapter = PersonListAdapter { Toast.makeText(requireContext(), "Not yet implemented", Toast.LENGTH_SHORT).show() } @@ -221,10 +221,6 @@ internal class MediaDetailFragment : Fragment() { } } - private fun bindUiStateLoading() {} - - private fun bindUiStateError(uiState: MediaInfoViewModel.UiState.Error) {} - private fun bindPlayerItems(items: PlayerItems) { navigateToPlayerActivity(items.items.toTypedArray()) binding.playButton.setImageDrawable( diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml index 17da1f55..0bf84f11 100644 --- a/app/src/main/res/drawable/ic_play.xml +++ b/app/src/main/res/drawable/ic_play.xml @@ -2,7 +2,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?attr/colorControlNormal">