Show video metadata below the decription
This commit is contained in:
parent
ef6d0cc4b1
commit
997267bad1
|
@ -4,14 +4,18 @@ import android.os.Bundle;
|
||||||
import android.view.LayoutInflater;
|
import android.view.LayoutInflater;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.ViewGroup;
|
import android.view.ViewGroup;
|
||||||
|
import android.widget.LinearLayout;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.Nullable;
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.annotation.StringRes;
|
||||||
import androidx.core.text.HtmlCompat;
|
import androidx.core.text.HtmlCompat;
|
||||||
|
|
||||||
import org.schabi.newpipe.BaseFragment;
|
import org.schabi.newpipe.BaseFragment;
|
||||||
|
import org.schabi.newpipe.R;
|
||||||
import org.schabi.newpipe.databinding.FragmentDescriptionBinding;
|
import org.schabi.newpipe.databinding.FragmentDescriptionBinding;
|
||||||
|
import org.schabi.newpipe.databinding.ItemMetadataBinding;
|
||||||
import org.schabi.newpipe.extractor.stream.Description;
|
import org.schabi.newpipe.extractor.stream.Description;
|
||||||
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
import org.schabi.newpipe.extractor.stream.StreamInfo;
|
||||||
import org.schabi.newpipe.util.Localization;
|
import org.schabi.newpipe.util.Localization;
|
||||||
|
@ -21,6 +25,8 @@ import icepick.State;
|
||||||
import io.reactivex.rxjava3.disposables.Disposable;
|
import io.reactivex.rxjava3.disposables.Disposable;
|
||||||
|
|
||||||
import static android.text.TextUtils.isEmpty;
|
import static android.text.TextUtils.isEmpty;
|
||||||
|
import static org.schabi.newpipe.extractor.stream.StreamExtractor.NO_AGE_LIMIT;
|
||||||
|
import static org.schabi.newpipe.extractor.utils.Utils.isBlank;
|
||||||
|
|
||||||
public class DescriptionFragment extends BaseFragment {
|
public class DescriptionFragment extends BaseFragment {
|
||||||
|
|
||||||
|
@ -45,6 +51,7 @@ public class DescriptionFragment extends BaseFragment {
|
||||||
if (streamInfo != null) {
|
if (streamInfo != null) {
|
||||||
setupUploadDate(binding.detailUploadDateView);
|
setupUploadDate(binding.detailUploadDateView);
|
||||||
setupDescription(binding.detailDescriptionView);
|
setupDescription(binding.detailDescriptionView);
|
||||||
|
setupMetadata(inflater, binding.detailMetadataLayout);
|
||||||
}
|
}
|
||||||
return binding.getRoot();
|
return binding.getRoot();
|
||||||
}
|
}
|
||||||
|
@ -70,7 +77,7 @@ public class DescriptionFragment extends BaseFragment {
|
||||||
final Description description = streamInfo.getDescription();
|
final Description description = streamInfo.getDescription();
|
||||||
if (description == null || isEmpty(description.getContent())
|
if (description == null || isEmpty(description.getContent())
|
||||||
|| description == Description.emptyDescription) {
|
|| description == Description.emptyDescription) {
|
||||||
descriptionTextView.setText("");
|
descriptionTextView.setVisibility(View.GONE);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,4 +97,98 @@ public class DescriptionFragment extends BaseFragment {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void setupMetadata(final LayoutInflater inflater,
|
||||||
|
final LinearLayout layout) {
|
||||||
|
addMetadataItem(inflater, layout, false,
|
||||||
|
R.string.metadata_category, streamInfo.getCategory());
|
||||||
|
|
||||||
|
addTagsMetadataItem(inflater, layout);
|
||||||
|
|
||||||
|
addMetadataItem(inflater, layout, false,
|
||||||
|
R.string.metadata_licence, streamInfo.getLicence());
|
||||||
|
|
||||||
|
addPrivacyMetadataItem(inflater, layout);
|
||||||
|
|
||||||
|
if (streamInfo.getAgeLimit() != NO_AGE_LIMIT) {
|
||||||
|
addMetadataItem(inflater, layout, false,
|
||||||
|
R.string.metadata_age_limit, String.valueOf(streamInfo.getAgeLimit()));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (streamInfo.getLanguageInfo() != null) {
|
||||||
|
addMetadataItem(inflater, layout, false,
|
||||||
|
R.string.metadata_language, streamInfo.getLanguageInfo().getDisplayLanguage());
|
||||||
|
}
|
||||||
|
|
||||||
|
addMetadataItem(inflater, layout, true,
|
||||||
|
R.string.metadata_support, streamInfo.getSupportInfo());
|
||||||
|
addMetadataItem(inflater, layout, true,
|
||||||
|
R.string.metadata_host, streamInfo.getHost());
|
||||||
|
addMetadataItem(inflater, layout, true,
|
||||||
|
R.string.metadata_thumbnail_url, streamInfo.getThumbnailUrl());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addMetadataItem(final LayoutInflater inflater,
|
||||||
|
final LinearLayout layout,
|
||||||
|
final boolean linkifyContent,
|
||||||
|
@StringRes final int type,
|
||||||
|
@Nullable final String content) {
|
||||||
|
if (isBlank(content)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final ItemMetadataBinding binding = ItemMetadataBinding.inflate(inflater, layout, false);
|
||||||
|
binding.metadataTypeView.setText(type);
|
||||||
|
|
||||||
|
if (linkifyContent) {
|
||||||
|
TextLinkifier.createLinksFromPlainText(layout.getContext(), content,
|
||||||
|
binding.metadataContentView);
|
||||||
|
} else {
|
||||||
|
binding.metadataContentView.setText(content);
|
||||||
|
}
|
||||||
|
|
||||||
|
layout.addView(binding.getRoot());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addTagsMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
|
||||||
|
if (streamInfo.getTags() != null && !streamInfo.getTags().isEmpty()) {
|
||||||
|
final StringBuilder tags = new StringBuilder();
|
||||||
|
for (int i = 0; i < streamInfo.getTags().size(); ++i) {
|
||||||
|
if (i != 0) {
|
||||||
|
tags.append(", ");
|
||||||
|
}
|
||||||
|
tags.append(streamInfo.getTags().get(i));
|
||||||
|
}
|
||||||
|
|
||||||
|
addMetadataItem(inflater, layout, false, R.string.metadata_tags, tags.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addPrivacyMetadataItem(final LayoutInflater inflater, final LinearLayout layout) {
|
||||||
|
if (streamInfo.getPrivacy() != null) {
|
||||||
|
@StringRes final int contentRes;
|
||||||
|
switch (streamInfo.getPrivacy()) {
|
||||||
|
case PUBLIC:
|
||||||
|
contentRes = R.string.metadata_privacy_public;
|
||||||
|
break;
|
||||||
|
case UNLISTED:
|
||||||
|
contentRes = R.string.metadata_privacy_unlisted;
|
||||||
|
break;
|
||||||
|
case PRIVATE:
|
||||||
|
contentRes = R.string.metadata_privacy_private;
|
||||||
|
break;
|
||||||
|
case INTERNAL:
|
||||||
|
contentRes = R.string.metadata_privacy_internal;
|
||||||
|
break;
|
||||||
|
case OTHER: default:
|
||||||
|
contentRes = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (contentRes != 0) {
|
||||||
|
addMetadataItem(inflater, layout, false,
|
||||||
|
R.string.metadata_privacy, layout.getContext().getString(contentRes));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:orientation="vertical"
|
|
||||||
android:scrollbars="vertical"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:scrollbars="vertical">
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -34,15 +34,27 @@
|
||||||
android:layout_marginStart="16dp"
|
android:layout_marginStart="16dp"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:layout_marginEnd="16dp"
|
android:layout_marginEnd="16dp"
|
||||||
android:layout_marginBottom="16dp"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
android:textSize="@dimen/video_item_detail_description_text_size"
|
android:textSize="@dimen/video_item_detail_description_text_size"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/detail_upload_date_view"
|
app:layout_constraintTop_toBottomOf="@+id/detail_upload_date_view"
|
||||||
app:layout_constraintVertical_bias="0.0"
|
app:layout_constraintVertical_bias="0.0"
|
||||||
tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
|
tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/detail_metadata_layout"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="16dp"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:layout_marginEnd="16dp"
|
||||||
|
android:layout_marginBottom="16dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@+id/detail_description_view" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
</androidx.core.widget.NestedScrollView>
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.Guideline
|
||||||
|
android:id="@+id/guideline"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
app:layout_constraintGuide_percent="0.25" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/metadata_type_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:layout_marginEnd="8dp"
|
||||||
|
android:gravity="end"
|
||||||
|
android:textAllCaps="true"
|
||||||
|
android:textColor="?android:attr/textColorPrimary"
|
||||||
|
android:textStyle="bold"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toStartOf="@+id/guideline"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="Licence" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/metadata_content_view"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginStart="8dp"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="@+id/guideline"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="Description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum." />
|
||||||
|
|
||||||
|
|
||||||
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@ -716,4 +716,17 @@
|
||||||
<string name="night_theme_summary">Select your favorite night theme — %s</string>
|
<string name="night_theme_summary">Select your favorite night theme — %s</string>
|
||||||
<string name="select_night_theme_toast">You can select your favorite night theme below</string>
|
<string name="select_night_theme_toast">You can select your favorite night theme below</string>
|
||||||
<string name="download_has_started">Download has started</string>
|
<string name="download_has_started">Download has started</string>
|
||||||
</resources>
|
<string name="metadata_category">Category</string>
|
||||||
|
<string name="metadata_tags">Tags</string>
|
||||||
|
<string name="metadata_licence">Licence</string>
|
||||||
|
<string name="metadata_privacy">Privacy</string>
|
||||||
|
<string name="metadata_age_limit">Age limit</string>
|
||||||
|
<string name="metadata_language">Language</string>
|
||||||
|
<string name="metadata_support">Support</string>
|
||||||
|
<string name="metadata_host">Host</string>
|
||||||
|
<string name="metadata_thumbnail_url">Thumbnail URL</string>
|
||||||
|
<string name="metadata_privacy_public">Public</string>
|
||||||
|
<string name="metadata_privacy_unlisted">Unlisted</string>
|
||||||
|
<string name="metadata_privacy_private">Private</string>
|
||||||
|
<string name="metadata_privacy_internal">Internal</string>
|
||||||
|
</resources>
|
||||||
|
|
Loading…
Reference in New Issue