Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added comments disabled functionallity #6483

Merged
merged 3 commits into from
Jul 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ dependencies {
// name and the commit hash with the commit hash of the (pushed) commit you want to test
// This works thanks to JitPack: https://jitpack.io/
implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:v0.21.6'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:c38a06e8dcd9c206a52b622704b138b78d633274'

/** Checkstyle **/
checkstyle "com.puppycrawl.tools:checkstyle:${checkstyleVersion}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand All @@ -24,6 +25,8 @@
public class CommentsFragment extends BaseListInfoFragment<CommentsInfo> {
private final CompositeDisposable disposables = new CompositeDisposable();

private TextView emptyStateDesc;

public static CommentsFragment getInstance(final int serviceId, final String url,
final String name) {
final CommentsFragment instance = new CommentsFragment();
Expand All @@ -35,6 +38,13 @@ public CommentsFragment() {
super(UserAction.REQUESTED_COMMENTS);
}

@Override
protected void initViews(final View rootView, final Bundle savedInstanceState) {
super.initViews(rootView, savedInstanceState);

emptyStateDesc = rootView.findViewById(R.id.empty_state_desc);
}

/*//////////////////////////////////////////////////////////////////////////
// LifeCycle
//////////////////////////////////////////////////////////////////////////*/
Expand Down Expand Up @@ -73,6 +83,12 @@ protected Single<CommentsInfo> loadResult(final boolean forceLoad) {
@Override
public void handleResult(@NonNull final CommentsInfo result) {
super.handleResult(result);

emptyStateDesc.setText(
result.isCommentsDisabled()
? R.string.comments_are_disabled
: R.string.no_comments);

ViewUtils.slideUp(requireView(), 120, 150, 0.06f);
disposables.clear();
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/fragment_comments.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@
<string name="show_comments_summary">Ausschalten, um Kommentare auszublenden</string>
<string name="autoplay_title">Automatische Wiedergabe</string>
<string name="no_comments">Keine Kommentare</string>
<string name="comments_are_disabled">Kommentare sind deaktiviert</string>
<string name="error_unable_to_load_comments">Kommentare konnten nicht geladen werden</string>
<string name="close">Schließen</string>
<string name="enable_playback_resume_title">Wiedergabe fortsetzen</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,7 @@
<item quantity="other">%s videos</item>
</plurals>
<string name="no_comments">No comments</string>
<string name="comments_are_disabled">Comments are disabled</string>
<!-- Missions -->
<string name="start">Start</string>
<string name="pause">Pause</string>
Expand Down