diff --git a/app/build.gradle b/app/build.gradle index d800025..de296d7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,8 +41,6 @@ dependencies { implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.2' - implementation 'androidx.navigation:navigation-fragment:2.3.0' - implementation 'androidx.navigation:navigation-ui:2.3.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' implementation 'androidx.security:security-crypto:1.1.0-alpha02' diff --git a/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt b/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt index 58a8289..6d3420b 100644 --- a/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt +++ b/app/src/main/java/org/mosad/teapod/ui/MediaFragment.kt @@ -2,7 +2,6 @@ package org.mosad.teapod.ui import android.graphics.Color import android.graphics.drawable.ColorDrawable -import android.graphics.drawable.Drawable import android.os.Bundle import android.util.Log import androidx.fragment.app.Fragment @@ -44,30 +43,20 @@ class MediaFragment(private val media: Media, private val tmdb: TMDBResponse) : */ private fun initGUI() { // generic gui + val backdropUrl = if (tmdb.backdropUrl.isNotEmpty()) tmdb.backdropUrl else media.posterLink + val posterUrl = if (tmdb.posterUrl.isNotEmpty()) tmdb.posterUrl else media.posterLink + + Glide.with(requireContext()).load(backdropUrl) + .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY))) + .apply(RequestOptions.bitmapTransform(BlurTransformation(25, 3))) + .into(image_backdrop) + + Glide.with(requireContext()).load(posterUrl) + .into(image_poster) + text_title.text = media.title - - if (tmdb.posterUrl.isNotEmpty()) { - Glide.with(requireContext()).load(tmdb.backdropUrl) - .apply(RequestOptions.placeholderOf(ColorDrawable(Color.DKGRAY))) - .apply(RequestOptions.bitmapTransform(BlurTransformation(25, 3))) - .into(image_backdrop) - } else { - Glide.with(requireContext()).load(ColorDrawable(Color.DKGRAY)).into(image_poster) - } - - if (tmdb.posterUrl.isNotEmpty()) { - Glide.with(requireContext()).load(tmdb.posterUrl) - .into(image_poster) - } else { - Glide.with(requireContext()).load(media.posterLink) - .into(image_poster) - } - - text_overview.text = if (tmdb.overview.isNotEmpty()) { - tmdb.overview - } else { - media.shortDesc - } + // TODO add year, fsk + text_overview.text = if (tmdb.overview.isNotEmpty()) tmdb.overview else media.shortDesc // specific gui if (media.type == MediaType.TVSHOW) { @@ -94,7 +83,7 @@ class MediaFragment(private val media: Media, private val tmdb: TMDBResponse) : // set onItemClick only in adapter is initialized if (this::adapterRecEpisodes.isInitialized) { - adapterRecEpisodes.onItemClick = { item, position -> + adapterRecEpisodes.onItemClick = { _, position -> playStream(media.episodes[position].streamUrl) } } diff --git a/app/src/main/res/layout/fragment_media.xml b/app/src/main/res/layout/fragment_media.xml index d6459c3..e7e3387 100644 --- a/app/src/main/res/layout/fragment_media.xml +++ b/app/src/main/res/layout/fragment_media.xml @@ -25,9 +25,10 @@ android:id="@+id/image_backdrop" android:layout_width="match_parent" android:layout_height="wrap_content" - android:adjustViewBounds="true" + android:adjustViewBounds="false" android:maxHeight="231dp" - android:minHeight="220dp" /> + android:minHeight="220dp" + android:scaleType="centerCrop" />