diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt index a2875647..2953c84f 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SubscriptionGroupFragment.kt @@ -290,8 +290,8 @@ class SubscriptionGroupFragment : MainFragment() { image.setImageView(_imageGroup); } else { - _imageGroupBackground.setImageResource(0); - _imageGroup.setImageResource(0); + _imageGroupBackground.setImageDrawable(null); + _imageGroup.setImageDrawable(null); } updateMeta(); reloadCreators(group); diff --git a/app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt b/app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt index e82cd0da..42ff55f4 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateDownloads.kt @@ -383,7 +383,7 @@ class StateDownloads { } private fun validateDownload(videoState: VideoDownload) { if(_downloading.hasItem { it.videoEither.url == videoState.videoEither.url }) - throw IllegalStateException("Video [${videoState.name}] is already queued for dowload"); + throw IllegalStateException("Video [${videoState.name}] is already queued for download"); val existing = getCachedVideo(videoState.id); if(existing != null) { diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistView.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistView.kt index c9cb8b73..2f70996f 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/PlaylistView.kt @@ -126,7 +126,7 @@ open class PlaylistView : LinearLayout { } else { currentPlaylist = null; - _imageThumbnail.setImageResource(0); + _imageThumbnail.setImageDrawable(null); } } diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewLockedView.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewLockedView.kt index 79934f52..ab52aa51 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewLockedView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewLockedView.kt @@ -76,8 +76,8 @@ class PreviewLockedView : LinearLayout { _textLockedUrl.text = content.unlockUrl ?: ""; } else { - _imageChannelThumbnail.setImageResource(0); - _imageVideoThumbnail.setImageResource(0); + _imageChannelThumbnail.setImageDrawable(null); + _imageVideoThumbnail.setImageDrawable(null); _textLockedDescription.text = ""; _textLockedUrl.text = ""; } diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt index 75d332e5..bcabda4f 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/feedtypes/PreviewVideoView.kt @@ -233,7 +233,7 @@ open class PreviewVideoView : LinearLayout { } else { currentVideo = null; - _imageVideo.setImageResource(0); + _imageVideo.setImageDrawable(null); _containerDuration.visibility = GONE; _containerLive.visibility = GONE; _timeBar?.visibility = GONE; diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt index dac711c9..ca6e6906 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupBarViewHolder.kt @@ -47,7 +47,7 @@ class SubscriptionGroupBarViewHolder(private val _viewGroup: ViewGroup) : AnyAda if(img != null) { img.setImageView(_image) } else { - _image.setImageResource(0); + _image.setImageDrawable(null); if(value is SubscriptionGroup.Add) _image.setBackgroundColor(Color.DKGRAY); diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupListViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupListViewHolder.kt index 4f601d26..6496fa83 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupListViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/SubscriptionGroupListViewHolder.kt @@ -88,7 +88,7 @@ class SubscriptionGroupListViewHolder(private val _viewGroup: ViewGroup) : AnyAd if(img != null) img.setImageView(_image) else { - _image.setImageResource(0); + _image.setImageDrawable(null); if(value is SubscriptionGroup.Add) _image.setBackgroundColor(Color.DKGRAY); diff --git a/app/src/main/java/com/futo/platformplayer/views/platform/PlatformIndicator.kt b/app/src/main/java/com/futo/platformplayer/views/platform/PlatformIndicator.kt index b8c1f0eb..2ac4c2ee 100644 --- a/app/src/main/java/com/futo/platformplayer/views/platform/PlatformIndicator.kt +++ b/app/src/main/java/com/futo/platformplayer/views/platform/PlatformIndicator.kt @@ -9,28 +9,28 @@ class PlatformIndicator : androidx.appcompat.widget.AppCompatImageView { } fun clearPlatform() { - setImageResource(0); + setImageDrawable(null); } fun setPlatformFromClientID(platformType : String?) { if(platformType == null) - setImageResource(0); + setImageDrawable(null); else { val result = StatePlatform.instance.getPlatformIcon(platformType); if (result != null) result.setImageView(this); else - setImageResource(0); + setImageDrawable(null); } } fun setPlatformFromClientName(name: String?) { if(name == null) - setImageResource(0); + setImageDrawable(null); else { val result = StatePlatform.instance.getPlatformIconByName(name); if (result != null) result.setImageView(this); else - setImageResource(0); + setImageDrawable(null); } } } \ No newline at end of file diff --git a/app/src/main/res/layout/view_bottom_menu_button.xml b/app/src/main/res/layout/view_bottom_menu_button.xml index 8e90cc95..2523b270 100644 --- a/app/src/main/res/layout/view_bottom_menu_button.xml +++ b/app/src/main/res/layout/view_bottom_menu_button.xml @@ -1,6 +1,6 @@