mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
bug fix + white filler button
This commit is contained in:
parent
03d50a943a
commit
4fcf396591
8 changed files with 23 additions and 24 deletions
|
@ -159,9 +159,11 @@ class EpisodeAdapter(
|
||||||
fun bind(card: ResultEpisode) {
|
fun bind(card: ResultEpisode) {
|
||||||
localCard = card
|
localCard = card
|
||||||
|
|
||||||
binding.episodeLinHolder.layoutParams.apply {
|
val setWidth = if(isTvSettings()) ViewGroup.LayoutParams.WRAP_CONTENT else ViewGroup.LayoutParams.MATCH_PARENT
|
||||||
width = if(isTvSettings()) ViewGroup.LayoutParams.WRAP_CONTENT else ViewGroup.LayoutParams.MATCH_PARENT
|
|
||||||
}
|
binding.episodeLinHolder.layoutParams.width = setWidth
|
||||||
|
binding.episodeHolderLarge.layoutParams.width = setWidth
|
||||||
|
binding.episodeHolder.layoutParams.width = setWidth
|
||||||
|
|
||||||
val isTrueTv = isTrueTvSettings()
|
val isTrueTv = isTrueTvSettings()
|
||||||
|
|
||||||
|
|
|
@ -53,11 +53,9 @@ import com.lagradost.cloudstream3.ui.player.CSPlayerEvent
|
||||||
import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
|
import com.lagradost.cloudstream3.ui.quicksearch.QuickSearchFragment
|
||||||
import com.lagradost.cloudstream3.ui.search.SearchAdapter
|
import com.lagradost.cloudstream3.ui.search.SearchAdapter
|
||||||
import com.lagradost.cloudstream3.ui.search.SearchHelper
|
import com.lagradost.cloudstream3.ui.search.SearchHelper
|
||||||
import com.lagradost.cloudstream3.ui.settings.SettingsFragment
|
|
||||||
import com.lagradost.cloudstream3.utils.AppUtils.html
|
import com.lagradost.cloudstream3.utils.AppUtils.html
|
||||||
import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
|
import com.lagradost.cloudstream3.utils.AppUtils.isCastApiAvailable
|
||||||
import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
|
import com.lagradost.cloudstream3.utils.AppUtils.openBrowser
|
||||||
import com.lagradost.cloudstream3.utils.Coroutines.main
|
|
||||||
import com.lagradost.cloudstream3.utils.ExtractorLink
|
import com.lagradost.cloudstream3.utils.ExtractorLink
|
||||||
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
|
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialog
|
||||||
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
|
import com.lagradost.cloudstream3.utils.SingleSelectionHelper.showBottomDialogInstant
|
||||||
|
@ -70,13 +68,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.populateChips
|
||||||
import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
|
import com.lagradost.cloudstream3.utils.UIHelper.popupMenuNoIconsAndNoStringRes
|
||||||
import com.lagradost.cloudstream3.utils.UIHelper.setImage
|
import com.lagradost.cloudstream3.utils.UIHelper.setImage
|
||||||
import com.lagradost.cloudstream3.utils.VideoDownloadHelper
|
import com.lagradost.cloudstream3.utils.VideoDownloadHelper
|
||||||
import kotlinx.android.synthetic.main.download_button.result_download_movie
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.download_button
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.result_episode_loading
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.result_episodes
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.result_play_movie
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result_tv.temporary_no_focus
|
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
|
|
||||||
|
|
||||||
open class ResultFragmentPhone : ResultFragment(),
|
open class ResultFragmentPhone : ResultFragment(),
|
||||||
|
|
|
@ -2,7 +2,6 @@ package com.lagradost.cloudstream3.ui.result
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Dialog
|
import android.app.Dialog
|
||||||
import android.content.res.ColorStateList
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
@ -22,13 +21,11 @@ import com.lagradost.cloudstream3.mvvm.Resource
|
||||||
import com.lagradost.cloudstream3.mvvm.observe
|
import com.lagradost.cloudstream3.mvvm.observe
|
||||||
import com.lagradost.cloudstream3.mvvm.observeNullable
|
import com.lagradost.cloudstream3.mvvm.observeNullable
|
||||||
import com.lagradost.cloudstream3.ui.WatchType
|
import com.lagradost.cloudstream3.ui.WatchType
|
||||||
import com.lagradost.cloudstream3.ui.download.DOWNLOAD_ACTION_DOWNLOAD
|
|
||||||
import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
|
import com.lagradost.cloudstream3.ui.download.DownloadButtonSetup
|
||||||
import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
|
import com.lagradost.cloudstream3.ui.player.ExtractorLinkGenerator
|
||||||
import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
|
import com.lagradost.cloudstream3.ui.player.GeneratorPlayer
|
||||||
import com.lagradost.cloudstream3.ui.search.SearchAdapter
|
import com.lagradost.cloudstream3.ui.search.SearchAdapter
|
||||||
import com.lagradost.cloudstream3.ui.search.SearchHelper
|
import com.lagradost.cloudstream3.ui.search.SearchHelper
|
||||||
import com.lagradost.cloudstream3.ui.settings.SettingsFragment
|
|
||||||
import com.lagradost.cloudstream3.utils.AppUtils.html
|
import com.lagradost.cloudstream3.utils.AppUtils.html
|
||||||
import com.lagradost.cloudstream3.utils.Coroutines.main
|
import com.lagradost.cloudstream3.utils.Coroutines.main
|
||||||
import com.lagradost.cloudstream3.utils.ExtractorLink
|
import com.lagradost.cloudstream3.utils.ExtractorLink
|
||||||
|
@ -39,11 +36,6 @@ import com.lagradost.cloudstream3.utils.UIHelper.dismissSafe
|
||||||
import com.lagradost.cloudstream3.utils.UIHelper.navigate
|
import com.lagradost.cloudstream3.utils.UIHelper.navigate
|
||||||
import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
|
import com.lagradost.cloudstream3.utils.UIHelper.popCurrentPage
|
||||||
import com.lagradost.cloudstream3.utils.UIHelper.setImage
|
import com.lagradost.cloudstream3.utils.UIHelper.setImage
|
||||||
import com.lagradost.cloudstream3.utils.VideoDownloadHelper
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.download_button
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.result_episodes
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result.result_play_movie
|
|
||||||
import kotlinx.android.synthetic.main.fragment_result_tv.temporary_no_focus
|
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
|
|
||||||
class ResultFragmentTv : ResultFragment() {
|
class ResultFragmentTv : ResultFragment() {
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
<!--marquee_forever-->
|
<!--marquee_forever-->
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/episode_filler"
|
android:id="@+id/episode_filler"
|
||||||
style="@style/SmallBlackButton"
|
style="@style/SmallWhiteButton"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:text="@string/filler" />
|
android:text="@string/filler" />
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
app:cardCornerRadius="@dimen/rounded_image_radius">
|
app:cardCornerRadius="@dimen/rounded_image_radius">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:id="@+id/episode_holder"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
||||||
|
@ -77,7 +78,7 @@
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:id="@+id/episode_filler"
|
android:id="@+id/episode_filler"
|
||||||
style="@style/SmallBlackButton"
|
style="@style/SmallWhiteButton"
|
||||||
android:layout_gravity="start"
|
android:layout_gravity="start"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:text="@string/filler" />
|
android:text="@string/filler" />
|
||||||
|
|
|
@ -73,7 +73,7 @@
|
||||||
|
|
||||||
<com.google.android.material.button.MaterialButton
|
<com.google.android.material.button.MaterialButton
|
||||||
android:layout_gravity="start"
|
android:layout_gravity="start"
|
||||||
style="@style/SmallBlackButton"
|
style="@style/SmallWhiteButton"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
android:text="@string/filler"
|
android:text="@string/filler"
|
||||||
android:id="@+id/episode_filler" />
|
android:id="@+id/episode_filler" />
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
tools:visibility="visible"
|
tools:visibility="visible"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
style="@style/SmallBlackButton"
|
style="@style/SmallWhiteButton"
|
||||||
android:text="@string/filler"
|
android:text="@string/filler"
|
||||||
android:id="@+id/episode_filler" />
|
android:id="@+id/episode_filler" />
|
||||||
|
|
||||||
|
|
|
@ -606,6 +606,19 @@
|
||||||
<item name="android:minWidth">0dp</item>
|
<item name="android:minWidth">0dp</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
<style name="SmallWhiteButton" parent="WhiteButton">
|
||||||
|
<item name="android:layout_height">24dp</item>
|
||||||
|
<item name="android:layout_width">wrap_content</item>
|
||||||
|
<item name="android:textSize">12sp</item>
|
||||||
|
<item name="android:layout_marginStart">0dp</item>
|
||||||
|
<item name="android:layout_marginEnd">0dp</item>
|
||||||
|
<item name="android:stateListAnimator">@null</item>
|
||||||
|
<item name="iconPadding">0dp</item>
|
||||||
|
<item name="android:paddingTop">0dp</item>
|
||||||
|
<item name="android:paddingBottom">0dp</item>
|
||||||
|
<item name="android:minWidth">0dp</item>
|
||||||
|
</style>
|
||||||
|
|
||||||
<style name="RoundedSelectableButtonIcon" parent="RoundedSelectableButton">
|
<style name="RoundedSelectableButtonIcon" parent="RoundedSelectableButton">
|
||||||
<item name="minWidth">0dp</item>
|
<item name="minWidth">0dp</item>
|
||||||
<item name="iconTint">?attr/textColor</item>
|
<item name="iconTint">?attr/textColor</item>
|
||||||
|
|
Loading…
Reference in a new issue