change display when there is a ContentNotSupportedException in channe…

…l fragment
TeamNewPipe · Apr 8, 2020 · 7012fba · 7012fba
1 parent a91d197
commit 7012fba
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -136,7 +136,7 @@ dependencies {
         exclude module: 'support-annotations'
     })
 
-    implementation 'com.github.B0pol:NewPipeExtractor:9a7c6b7ab00c0f5b8337232fc66d3d9b538c229f'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:a5155fb'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 

diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
@@ -6,6 +6,7 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -86,6 +87,8 @@ public class ChannelFragment extends BaseListInfoFragment<ChannelInfo> {
     private LinearLayout headerBackgroundButton;
     private MenuItem menuRssButton;
     private TextView contentNotSupportedTextView;
+    private TextView kaomojiTextView;
+    private TextView noVideosTextView;
 
     public static ChannelFragment getInstance(final int serviceId, final String url,
                                               final String name) {
@@ -125,6 +128,8 @@ public View onCreateView(@NonNull final LayoutInflater inflater,
     public void onViewCreated(final View rootView, final Bundle savedInstanceState) {
         super.onViewCreated(rootView, savedInstanceState);
         contentNotSupportedTextView = rootView.findViewById(R.id.error_content_not_supported);
+        kaomojiTextView = rootView.findViewById(R.id.channel_kaomoji);
+        noVideosTextView = rootView.findViewById(R.id.channel_no_videos);
     }
 
     @Override
@@ -435,7 +440,7 @@ public void handleResult(@NonNull final ChannelInfo result) {
             while (it.hasNext()) {
                 Throwable throwable = it.next();
                 if (throwable instanceof ContentNotSupportedException) {
-                    contentNotSupportedTextView.setVisibility(View.VISIBLE);
+                    updateNoVideoDisplay();
                     it.remove();
                 }
             }
@@ -463,6 +468,13 @@ public void handleResult(@NonNull final ChannelInfo result) {
                 .playOnBackgroundPlayer(activity, getPlayQueue(), false));
     }
 
+    private void updateNoVideoDisplay() {
+        contentNotSupportedTextView.setVisibility(View.VISIBLE);
+        kaomojiTextView.setText("(︶︹︺)");
+        kaomojiTextView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 45f);
+        noVideosTextView.setVisibility(View.GONE);
+    }
+
     private PlayQueue getPlayQueue() {
         return getPlayQueue(0);
     }

diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
@@ -32,6 +32,7 @@
         tools:visibility="visible">
 
         <TextView
+            android:id="@+id/channel_kaomoji"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -42,6 +43,7 @@
             tools:ignore="HardcodedText,UnusedAttribute"/>
 
         <TextView
+            android:id="@+id/channel_no_videos"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"