From 14df7c8d431d275a42990f398e34d863ca321793 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Fri, 20 Oct 2023 00:27:25 +0200 Subject: [PATCH] Missing negative sub hide, youtube null exception catch, autobackup password field type fix --- .../fragment/mainactivity/main/PostDetailFragment.kt | 2 +- .../fragment/mainactivity/main/VideoDetailView.kt | 4 ++-- .../views/adapters/viewholders/CreatorViewHolder.kt | 2 +- app/src/main/res/layout/dialog_automatic_backup.xml | 1 + app/src/main/res/layout/dialog_automatic_backup_restore.xml | 1 + app/src/unstable/assets/sources/youtube | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt index d7e6e89f..88dfbf2f 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/PostDetailFragment.kt @@ -601,7 +601,7 @@ class PostDetailFragment : MainFragment { val subscribers = value?.author?.subscribers; if(subscribers != null && subscribers > 0) { _channelMeta.visibility = View.VISIBLE; - _channelMeta.text = value.author.subscribers!!.toHumanNumber() + " subscribers"; + _channelMeta.text = if((value.author?.subscribers ?: 0) > 0) value.author.subscribers!!.toHumanNumber() + " subscribers" else ""; } else { _channelMeta.visibility = View.GONE; _channelMeta.text = ""; diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index a83da8aa..11869f35 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -873,7 +873,7 @@ class VideoDetailView : ConstraintLayout { _channelName.text = video.author.name; _playWhenReady = true; if(video.author.subscribers != null) { - _channelMeta.text = video.author.subscribers!!.toHumanNumber() + " subscribers"; + _channelMeta.text = if((video.author.subscribers ?: 0) > 0) video.author.subscribers!!.toHumanNumber() + " subscribers" else ""; (_channelName.layoutParams as MarginLayoutParams).setMargins(0, (DP_5 * -1).toInt(), 0, 0); } else { _channelMeta.text = ""; @@ -982,7 +982,7 @@ class VideoDetailView : ConstraintLayout { _title.text = video.name; _channelName.text = video.author.name; if(video.author.subscribers != null) { - _channelMeta.text = video.author.subscribers!!.toHumanNumber() + " subscribers"; + _channelMeta.text = if((video.author.subscribers ?: 0) > 0) video.author.subscribers!!.toHumanNumber() + " subscribers" else ""; (_channelName.layoutParams as MarginLayoutParams).setMargins(0, (DP_5 * -1).toInt(), 0, 0); } else { _channelMeta.text = ""; diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/CreatorViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/CreatorViewHolder.kt index fe96d55c..5ec43e03 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/CreatorViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/viewholders/CreatorViewHolder.kt @@ -50,7 +50,7 @@ class CreatorViewHolder(private val _viewGroup: ViewGroup, private val _tiny: Bo if(authorLink.subscribers == null || (authorLink.subscribers ?: 0) <= 0L) _textMetadata.visibility = View.GONE; else { - _textMetadata.text = authorLink.subscribers!!.toHumanNumber() + " subscribers"; + _textMetadata.text = if(authorLink?.subscribers ?: 0 > 0) authorLink.subscribers!!.toHumanNumber() + " subscribers" else ""; _textMetadata.visibility = View.VISIBLE; } _buttonSubscribe.setSubscribeChannel(authorLink.url); diff --git a/app/src/main/res/layout/dialog_automatic_backup.xml b/app/src/main/res/layout/dialog_automatic_backup.xml index fe36139f..6de65b3b 100644 --- a/app/src/main/res/layout/dialog_automatic_backup.xml +++ b/app/src/main/res/layout/dialog_automatic_backup.xml @@ -69,6 +69,7 @@ android:layout_marginRight="30dp" android:layout_height="wrap_content" android:singleLine="true" + android:inputType="textPassword" android:hint="Backup Password" /> diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 29665c24..d05a9591 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 29665c24a1f645b17ee92d25018dc96b558235fe +Subproject commit d05a959174bcceb616c9f42043466e9e1258f519