One textview is enough for disabled comments

Ref: #6483 (comment)
TeamNewPipe · Jun 20, 2021 · cf8a141 · cf8a141
1 parent a0677e6
commit cf8a141
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java
@@ -25,7 +25,7 @@
 public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
     private final CompositeDisposable disposables = new CompositeDisposable();
 
-    private TextView commentsDisabledView;
+    private TextView emptyStateDesc;
 
     public static CommentsFragment getInstance(final int serviceId, final String url,
                                                final String name) {
@@ -42,7 +42,7 @@ public CommentsFragment() {
     protected void initViews(final View rootView, final Bundle savedInstanceState) {
         super.initViews(rootView, savedInstanceState);
 
-        commentsDisabledView = rootView.findViewById(R.id.comments_disabled);
+        emptyStateDesc = rootView.findViewById(R.id.empty_state_desc);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -84,8 +84,10 @@ protected Single<CommentsInfo> loadResult(final boolean forceLoad) {
     public void handleResult(@NonNull final CommentsInfo result) {
         super.handleResult(result);
 
-        commentsDisabledView.setVisibility(
-                result.isCommentsDisabled() ? View.VISIBLE : View.GONE);
+        emptyStateDesc.setText(
+                result.isCommentsDisabled()
+                        ? R.string.comments_are_disabled
+                        : R.string.no_comments);
 
         ViewUtils.slideUp(requireView(), 120, 150, 0.06f);
         disposables.clear();

diff --git a/app/src/main/res/layout/fragment_comments.xml b/app/src/main/res/layout/fragment_comments.xml
@@ -41,6 +41,7 @@
             tools:ignore="HardcodedText,UnusedAttribute" />
 
         <TextView
+            android:id="@+id/empty_state_desc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -49,17 +50,6 @@
 
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/comments_disabled"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/empty_state_view"
-        android:layout_centerHorizontal="true"
-        android:text="@string/comments_are_disabled"
-        android:textSize="20sp"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
     <!--ERROR PANEL-->
     <include
         android:id="@+id/error_panel"