small fixes

anilibria · May 5, 2020 · aa86fd1 · aa86fd1
1 parent 32742d7
commit aa86fd1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/app-tv/src/main/AndroidManifest.xml b/app-tv/src/main/AndroidManifest.xml
@@ -61,7 +61,6 @@
         <provider android:name=".contentprovider.suggestions.SuggestionsContentProvider"
             android:authorities="ru.radiationx.anilibria.contentprovider.suggestions"
             android:exported="true"
-            android:initOrder="900"
             tools:ignore="ExportedContentProvider" />
 
     </application>

diff --git a/app-tv/src/main/java/ru/radiationx/anilibria/common/CardsDataConverter.kt b/app-tv/src/main/java/ru/radiationx/anilibria/common/CardsDataConverter.kt
@@ -16,7 +16,8 @@ class CardsDataConverter(
             id,
             title.orEmpty(),
             "${seasons.firstOrNull()} год • ${genres.firstOrNull()
-                ?.capitalize()} • Серии: ${series} • Обновлен ${Date(torrentUpdate * 1000L).relativeDate(context).decapitalize()}",
+                ?.capitalize()} • Серии: ${series?.trim() ?: "Не доступно"} • Обновлен ${Date(torrentUpdate * 1000L).relativeDate(context)
+                .decapitalize()}",
             poster.orEmpty(),
             LibriaCard.Type.RELEASE
         ).apply {

diff --git a/app-tv/src/main/java/ru/radiationx/anilibria/common/DetailDataConverter.kt b/app-tv/src/main/java/ru/radiationx/anilibria/common/DetailDataConverter.kt
@@ -23,14 +23,15 @@ class DetailDataConverter(
                 genres.firstOrNull()?.capitalize()?.trim(),
                 "${seasons.firstOrNull()} год",
                 types.firstOrNull()?.trim(),
-                "Серии: ${series?.trim()}"
+                "Серии: ${series?.trim() ?: "Не доступно"}"
             ).joinToString(" • "),
             Html.fromHtml(description.orEmpty()).toString().trim().trim('"')/*.replace('\n', ' ')*/,
             getAnnounce(),
             poster.orEmpty(),
             NumberFormat.getNumberInstance().format(favoriteInfo.rating),
             (releaseItem as? ReleaseFull)?.episodes?.any { it.urlFullHd != null } ?: false,
             favoriteInfo.isAdded,
+            (releaseItem as? ReleaseFull)?.episodes?.isNotEmpty() ?: false,
             (releaseItem as? ReleaseFull)?.episodes?.any { it.isViewed } ?: false,
             false && (releaseItem as? ReleaseFull)?.moonwalkLink != null
         )

diff --git a/app-tv/src/main/java/ru/radiationx/anilibria/common/LibriaDetails.kt b/app-tv/src/main/java/ru/radiationx/anilibria/common/LibriaDetails.kt
@@ -13,6 +13,7 @@ data class LibriaDetails(
     val favoriteCount: String,
     val hasFullHd: Boolean,
     val isFavorite: Boolean,
+    val hasEpisodes: Boolean,
     val hasViewed: Boolean,
     val hasWebPlayer: Boolean
 )

diff --git a/app-tv/src/main/java/ru/radiationx/anilibria/screen/details/DetailHeaderViewModel.kt b/app-tv/src/main/java/ru/radiationx/anilibria/screen/details/DetailHeaderViewModel.kt
@@ -90,11 +90,12 @@ class DetailHeaderViewModel(
 
     fun onPlayClick() {
         val release = currentRelease as? ReleaseFull ?: return
-        if (release.episodes.size > 1) {
+        if (release.episodes.isEmpty()) return
+        if (release.episodes.size == 1) {
+            router.navigateTo(PlayerScreen(releaseId))
+        } else {
             val episodeId = releaseInteractor.getEpisodes(releaseId).maxBy { it.lastAccess }?.id ?: -1
             guidedRouter.open(PlayerEpisodesGuidedScreen(releaseId, episodeId))
-        } else {
-            router.navigateTo(PlayerScreen(releaseId))
         }
     }
 

diff --git a/app-tv/src/main/java/ru/radiationx/anilibria/ui/presenter/ReleaseDetailsPresenter.kt b/app-tv/src/main/java/ru/radiationx/anilibria/ui/presenter/ReleaseDetailsPresenter.kt
@@ -138,6 +138,7 @@ class LibriaReleaseViewHolder(
         )
         rowReleaseHQMarker.isVisible = details.hasFullHd
 
+        rowReleaseActionPlay.isVisible = details.hasEpisodes
         rowReleaseActionContinue.isVisible = details.hasViewed
         rowReleaseActionPlayWeb.isVisible = details.hasWebPlayer
         rowReleaseActionFavorite.text = if (details.isFavorite) {